netdev - Re: [PATCHv3 net-next 2/2] Revert "bareudp: Fixed bareudp receive handling"

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: <CAKgT0UcpvC8DJBT=Bi=7jp+Kvb1_XpiFWsNtxDb7ouG1K+8c8Q@mail.gmail.com>
Date:   Tue, 19 Jan 2021 14:21:19 -0800
From:   Alexander Duyck <alexander.duyck@...il.com>
To:     Xin Long <lucien.xin@...il.com>
Cc:     network dev <netdev@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Willem de Bruijn <willemb@...gle.com>,
        Martin Varghese <martin.varghese@...ia.com>
Subject: Re: [PATCHv3 net-next 2/2] Revert "bareudp: Fixed bareudp receive handling"

On Fri, Jan 15, 2021 at 8:35 PM Xin Long <lucien.xin@...il.com> wrote:
>
> As udp_encap_enable() is already called in udp_tunnel_encap_enable()
> since the last patch, and we don't need it any more. So remove it by
> reverting commit 81f954a44567567c7d74a97b1db78fb43afc253d.
>
> v1->v2:
>  - no change.
> v2->v3:
>  - add the missing signoff.
>
> Signed-off-by: Xin Long <lucien.xin@...il.com>

It might make more sense to just roll this into the first patch since
what this is effectively doing is removing a spot that was invoking
the enable without adding the disable.

> ---
>  drivers/net/bareudp.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
> index 0965d13..57dfaf4 100644
> --- a/drivers/net/bareudp.c
> +++ b/drivers/net/bareudp.c
> @@ -240,12 +240,6 @@ static int bareudp_socket_create(struct bareudp_dev *bareudp, __be16 port)
>         tunnel_cfg.encap_destroy = NULL;
>         setup_udp_tunnel_sock(bareudp->net, sock, &tunnel_cfg);
>
> -       /* As the setup_udp_tunnel_sock does not call udp_encap_enable if the
> -        * socket type is v6 an explicit call to udp_encap_enable is needed.
> -        */
> -       if (sock->sk->sk_family == AF_INET6)
> -               udp_encap_enable();
> -
>         rcu_assign_pointer(bareudp->sock, sock);
>         return 0;
>  }
> --
> 2.1.0
>