diff options
| author | Duan Jiong <duanj.fnst@cn.fujitsu.com> | 2013-09-20 18:21:25 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-24 10:15:49 -0400 |
| commit | 8d65b1190ddc548b0411477f308d04f4595bac57 (patch) | |
| tree | 5a27064eead0557336a558d3ddf8fc6e26fde048 | |
| parent | 1a462d189280b560bd84af1407e4d848e262b3b3 (diff) | |
| download | linux-stable-8d65b1190ddc548b0411477f308d04f4595bac57.tar.gz linux-stable-8d65b1190ddc548b0411477f308d04f4595bac57.tar.bz2 linux-stable-8d65b1190ddc548b0411477f308d04f4595bac57.zip | |
net: raw: 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/raw.c | 4 | ||||
| -rw-r--r-- | net/ipv6/raw.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index bfec521c717f..193db03540ad 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -218,8 +218,10 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info) if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) ipv4_sk_update_pmtu(skb, sk, info); - else if (type == ICMP_REDIRECT) + else if (type == ICMP_REDIRECT) { ipv4_sk_redirect(skb, sk); + return; + } /* Report error on raw socket, if: 1. User requested ip_recverr. diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 58916bbb1728..a4ed2416399e 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -335,8 +335,10 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb, ip6_sk_update_pmtu(skb, sk, info); harderr = (np->pmtudisc == IPV6_PMTUDISC_DO); } - if (type == NDISC_REDIRECT) + if (type == NDISC_REDIRECT) { ip6_sk_redirect(skb, sk); + return; + } if (np->recverr) { u8 *payload = skb->data; if (!inet->hdrincl) |