diff options
author | Duan Jiong <duanj.fnst@cn.fujitsu.com> | 2013-09-20 12:20:28 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-24 16:15:49 +0200 |
commit | 1a462d189280b560bd84af1407e4d848e262b3b3 (patch) | |
tree | 67d0934fb3e4cad4f9219c7e033d9b0e7856d18b | |
parent | mrp: add periodictimer to allow retries when packets get lost (diff) | |
download | linux-1a462d189280b560bd84af1407e4d848e262b3b3.tar.xz linux-1a462d189280b560bd84af1407e4d848e262b3b3.zip |
net: udp: do not report ICMP redirects to user space
Redirect isn't an error condition, it should leave
the error handler without touching the socket.
Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/udp.c | 2 | ||||
-rw-r--r-- | net/ipv6/udp.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 74d2c95db57f..0ca44df51ee9 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -658,7 +658,7 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable) break; case ICMP_REDIRECT: ipv4_sk_redirect(skb, sk); - break; + goto out; } /* diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index f4058150262b..72b7eaaf3ca0 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -525,8 +525,10 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (type == ICMPV6_PKT_TOOBIG) ip6_sk_update_pmtu(skb, sk, info); - if (type == NDISC_REDIRECT) + if (type == NDISC_REDIRECT) { ip6_sk_redirect(skb, sk); + goto out; + } np = inet6_sk(sk); |