Commit 38b25793 authored Jun 02, 2017 by Soheil Hassas Yeganeh Committed by David S. Miller Jun 04, 2017

sock: reset sk_err when the error queue is empty



Prior to f5f99309 (sock: do not set sk_err in
sock_dequeue_err_skb), sk_err was reset to the error of
the skb on the head of the error queue.

Applications, most notably ping, are relying on this
behavior to reset sk_err for ICMP packets.

Set sk_err to the ICMP error when there is an ICMP packet
at the head of the error queue.

Fixes: f5f99309 (sock: do not set sk_err in sock_dequeue_err_skb)
Reported-by: Cyril Hrubis <chrubis@suse.cz>
Tested-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a7c0b8be

net/core/skbuff.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -3754,8 +3754,11 @@ struct sk_buff sock_dequeue_err_skb(struct sock sk)

		spin_lock_irqsave(&q->lock, flags);
		skb = __skb_dequeue(q);
		if (skb && (skb_next = skb_peek(q)))
		if (skb && (skb_next = skb_peek(q))) {
		icmp_next = is_icmp_err_skb(skb_next);
		if (icmp_next)
		sk->sk_err = SKB_EXT_ERR(skb_next)->ee.ee_origin;
		}
		spin_unlock_irqrestore(&q->lock, flags);

		if (is_icmp_err_skb(skb) && !icmp_next)