netdev - Re: [PATCH net] sock: set sk_err to ee

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACSApvaWuwMK+PUDsxJ85FMqcoX2yoQOKP3HeBofPPu5qRyg_g@mail.gmail.com>
Date:   Thu, 26 Nov 2020 12:28:36 -0500
From:   Soheil Hassas Yeganeh <soheil@...gle.com>
To:     Willem de Bruijn <willemdebruijn.kernel@...il.com>
Cc:     netdev <netdev@...r.kernel.org>,
        David Miller <davem@...emloft.net>, kuba@...nel.org,
        Willem de Bruijn <willemb@...gle.com>,
        Ayush Ranjan <ayushranjan@...gle.com>
Subject: Re: [PATCH net] sock: set sk_err to ee_errno on dequeue from errq

On Thu, Nov 26, 2020 at 10:12 AM Willem de Bruijn
<willemdebruijn.kernel@...il.com> wrote:
>
> From: Willem de Bruijn <willemb@...gle.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@...gle.com>
> Signed-off-by: Willem de Bruijn <willemb@...gle.com>

Acked-by: Soheil Hassas Yeganeh <soheil@...gle.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
>