* [PATCH net] sock: set sk_err to ee_errno on dequeue from errq
@ 2020-11-26 15:12 Willem de Bruijn
2020-11-26 17:28 ` Soheil Hassas Yeganeh
0 siblings, 1 reply; 3+ messages in thread
From: Willem de Bruijn @ 2020-11-26 15:12 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, soheil, Willem de Bruijn, Ayush Ranjan
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(-)
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);
--
2.29.2.454.gaff20da3a2-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] sock: set sk_err to ee_errno on dequeue from errq
2020-11-26 15:12 [PATCH net] sock: set sk_err to ee_errno on dequeue from errq Willem de Bruijn
@ 2020-11-26 17:28 ` Soheil Hassas Yeganeh
2020-11-27 19:07 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Soheil Hassas Yeganeh @ 2020-11-26 17:28 UTC (permalink / raw)
To: Willem de Bruijn
Cc: netdev, David Miller, kuba, Willem de Bruijn, Ayush Ranjan
On Thu, Nov 26, 2020 at 10:12 AM Willem de Bruijn
<willemdebruijn.kernel@gmail.com> 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>
Thank you for catching this!
> ---
> net/core/skbuff.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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);
>
> --
> 2.29.2.454.gaff20da3a2-goog
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] sock: set sk_err to ee_errno on dequeue from errq
2020-11-26 17:28 ` Soheil Hassas Yeganeh
@ 2020-11-27 19:07 ` Jakub Kicinski
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2020-11-27 19:07 UTC (permalink / raw)
To: Soheil Hassas Yeganeh
Cc: Willem de Bruijn, netdev, David Miller, Willem de Bruijn, Ayush Ranjan
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-27 19:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-26 15:12 [PATCH net] sock: set sk_err to ee_errno on dequeue from errq Willem de Bruijn
2020-11-26 17:28 ` Soheil Hassas Yeganeh
2020-11-27 19:07 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.