net: raw: do not report ICMP redirects to user space
Subsystems (2)
PATCH 1/1 net: raw: do not report ICMP redirects to user space
From: Duan Jiong <[email protected]>
Redirect isn't an error condition, it should leave the error handler without touching the socket.
Signed-off-by Duan Jiong <[email protected]>
--- net/ipv4/raw.c | 4 +++- net/ipv6/raw.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/raw.c +3 -1
@@ -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.
net/ipv6/raw.c +3 -1
@@ -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)
Signature · 1 line
1.8.3.1
From: Duan Jiong <[email protected]>
Date: Fri, 20 Sep 2013 18:21:25 +0800
Quoted 6 lines
From: Duan Jiong <[email protected]>
Redirect isn't an error condition, it should leave the error handler without touching the socket.
Signed-off-by Duan Jiong <[email protected]>
Applied.