On Thu, 26 Nov 2020 12:28:36 -0500 Soheil Hassas Yeganeh wrote:
> > From: Willem de Bruijn <will...@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 <ayushran...@google.com>
> > Signed-off-by: Willem de Bruijn <will...@google.com>
>
> Acked-by: Soheil Hassas Yeganeh <soh...@google.com>
Applied, thanks!
