sock: set sk_err to ee_errno on dequeue from errq
authorWillem de Bruijn <willemb@google.com>
Thu, 26 Nov 2020 15:12:20 +0000 (10:12 -0500)
committerJakub Kicinski <kuba@kernel.org>
Fri, 27 Nov 2020 19:07:06 +0000 (11:07 -0800)
commit985f7337421a811cb354ca93882f943c8335a6f5
tree7966ae3daac957e317dd8ae83a3155b9297b1e3b
parentd3ab78858f1451351221061a1c365495df196500
sock: set sk_err to ee_errno on dequeue from errq

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>
Link: https://lore.kernel.org/r/20201126151220.2819322-1-willemdebruijn.kernel@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/skbuff.c