diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-08-18 14:05:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-08-18 14:05:44 -0700 |
| commit | cb94c62c252796f42bb83fe40960d12f3ea5a82a (patch) | |
| tree | 926fce041eb9983d37c5322ae5a13619a32087f9 /net | |
| parent | 22783649568a28839c5a362f47da7819ecfcbb9f (diff) | |
| download | op-kernel-dev-cb94c62c252796f42bb83fe40960d12f3ea5a82a.zip op-kernel-dev-cb94c62c252796f42bb83fe40960d12f3ea5a82a.tar.gz | |
[IPV4]: Fix DST leak in icmp_push_reply()
Based upon a bug report and initial patch by
Ollie Wild.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/icmp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 3d78464..badfc58 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -349,12 +349,12 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, { struct sk_buff *skb; - ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param, - icmp_param->data_len+icmp_param->head_len, - icmp_param->head_len, - ipc, rt, MSG_DONTWAIT); - - if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) { + if (ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param, + icmp_param->data_len+icmp_param->head_len, + icmp_param->head_len, + ipc, rt, MSG_DONTWAIT) < 0) + ip_flush_pending_frames(icmp_socket->sk); + else if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) { struct icmphdr *icmph = skb->h.icmph; unsigned int csum = 0; struct sk_buff *skb1; |
