Commit 8d65b119 authored Sep 20, 2013 by Duan Jiong Committed by David S. Miller Sep 24, 2013

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>

parent 1a462d18

net/ipv4/raw.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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)