diff mbox series

[net] sock: set sk_err to ee_errno on dequeue from errq

Message ID 20201126151220.2819322-1-willemdebruijn.kernel@gmail.com
State New
Headers show
Series [net] sock: set sk_err to ee_errno on dequeue from errq | expand

Commit Message

Willem de Bruijn Nov. 26, 2020, 3:12 p.m. UTC 
From: Willem de Bruijn <willemb@google.com>

When setting sk_err, set it to ee_errno, not ee_origin.

Commit f5f99309fa74 ("sock: do not set sk_err in
sock_dequeue_err_skb") disabled updating sk_err on errq dequeue,
which is correct for most error types (origins):

  -       sk->sk_err = err;

Commit 38b257938ac6 ("sock: reset sk_err when the error queue is
empty") reenabled the behavior for IMCP origins, which do require it:

  +       if (icmp_next)
  +               sk->sk_err = SKB_EXT_ERR(skb_next)->ee.ee_origin;

But read from ee_errno.

Fixes: 38b257938ac6 ("sock: reset sk_err when the error queue is empty")
Reported-by: Ayush Ranjan <ayushranjan@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
---
 net/core/skbuff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jakub Kicinski Nov. 27, 2020, 7:07 p.m. UTC | #1 
On Thu, 26 Nov 2020 12:28:36 -0500 Soheil Hassas Yeganeh wrote:
> > From: Willem de Bruijn <willemb@google.com>

> >

> > When setting sk_err, set it to ee_errno, not ee_origin.

> >

> > Commit f5f99309fa74 ("sock: do not set sk_err in

> > sock_dequeue_err_skb") disabled updating sk_err on errq dequeue,

> > which is correct for most error types (origins):

> >

> >   -       sk->sk_err = err;

> >

> > Commit 38b257938ac6 ("sock: reset sk_err when the error queue is

> > empty") reenabled the behavior for IMCP origins, which do require it:

> >

> >   +       if (icmp_next)

> >   +               sk->sk_err = SKB_EXT_ERR(skb_next)->ee.ee_origin;

> >

> > But read from ee_errno.

> >

> > Fixes: 38b257938ac6 ("sock: reset sk_err when the error queue is empty")

> > Reported-by: Ayush Ranjan <ayushranjan@google.com>

> > Signed-off-by: Willem de Bruijn <willemb@google.com>  

> 

> Acked-by: Soheil Hassas Yeganeh <soheil@google.com>


Applied, thanks!
diff mbox series

Patch

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 1ba8f0163744..06c526e0d810 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4549,7 +4549,7 @@  struct sk_buff *sock_dequeue_err_skb(struct sock *sk)
 	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;
+			sk->sk_err = SKB_EXT_ERR(skb_next)->ee.ee_errno;
 	}
 	spin_unlock_irqrestore(&q->lock, flags);