netdev - Re: [PATCH] net/packet: fix missing net

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]

Date:   Fri, 12 May 2017 16:11:08 -0400
From:   Soheil Hassas Yeganeh <soheil@...gle.com>
To:     Douglas Caetano dos Santos <douglascs@...hos.com.br>
Cc:     netdev <netdev@...r.kernel.org>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Daniel Borkmann <daniel@...earbox.net>,
        Willem de Bruijn <willemb@...gle.com>,
        Jarno Rajahalme <jarno@....org>,
        Andrey Konovalov <andreyknvl@...gle.com>,
        Anoob Soman <anoob.soman@...rix.com>,
        Sowmini Varadhan <sowmini.varadhan@...cle.com>,
        Philip Pettersson <philip.pettersson@...il.com>,
        Mike Rapoport <rppt@...ux.vnet.ibm.com>
Subject: Re: [PATCH] net/packet: fix missing net_device reference release

On Fri, May 12, 2017 at 2:19 PM, Douglas Caetano dos Santos
<douglascs@...hos.com.br> wrote:
> When using a TX ring buffer, if an error occurs processing a control
> message (e.g. invalid message), the net_device reference is not
> released.
>
> Fixes c14ac9451c348 ("sock: enable timestamping using control messages")
> Signed-off-by: Douglas Caetano dos Santos <douglascs@...hos.com.br>

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

> ---
>  net/packet/af_packet.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
> index f4001763134d..e3eeed19cc7a 100644
> --- a/net/packet/af_packet.c
> +++ b/net/packet/af_packet.c
> @@ -2658,13 +2658,6 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
>                 dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);
>         }
>
> -       sockc.tsflags = po->sk.sk_tsflags;
> -       if (msg->msg_controllen) {
> -               err = sock_cmsg_send(&po->sk, msg, &sockc);
> -               if (unlikely(err))
> -                       goto out;
> -       }
> -
>         err = -ENXIO;
>         if (unlikely(dev == NULL))
>                 goto out;
> @@ -2672,6 +2665,13 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
>         if (unlikely(!(dev->flags & IFF_UP)))
>                 goto out_put;
>
> +       sockc.tsflags = po->sk.sk_tsflags;
> +       if (msg->msg_controllen) {
> +               err = sock_cmsg_send(&po->sk, msg, &sockc);
> +               if (unlikely(err))
> +                       goto out_put;
> +       }
> +
>         if (po->sk.sk_socket->type == SOCK_RAW)
>                 reserve = dev->hard_header_len;
>         size_max = po->tx_ring.frame_size
> --
> 2.12.2
>

Thank you, for the fix.