Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20220607013844.213446-1-jmaxwell37@gmail.com>
References: <20220607013844.213446-1-jmaxwell37@gmail.com>
Cc:     davem@davemloft.net, cjebpub@gmail.com, jmaxwell37@gmail.com
From:   Antoine Tenart <atenart@kernel.org>
To:     Jon Maxwell <jmaxwell37@gmail.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next] net: bpf: fix request_sock leak in filter.c
Message-ID: <165458990767.3884.13816861537144030058@kwain>
Date:   Tue, 07 Jun 2022 10:18:27 +0200
Precedence: bulk

Hi Jon,

This patch is targeted at the networking subsystem, as such (see the
"NETWORKING [GENERAL]" section in MAINTAINERS), you should send it to
netdev@vger.kernel.org and to the networking maintainers (David, Jakub,
Paolo & Eric).

This also fixes an issue and should be targeted at [net] instead of
[net-next]. Because of this you'll also need a Fixes: tag.

Quoting Jon Maxwell (2022-06-07 03:38:44)
> A customer reported a request_socket leak in a Calico cloud environment. =
We=20
> found that a BPF program was doing a socket lookup with takes a refcnt on=
=20
> the socket and that it was finding the request_socket but returning the p=
arent=20
> LISTEN socket via sk_to_full_sk() without decrementing the child request =
socket=20
> 1st, resulting in request_sock slab object leak. This patch retains the=20
> existing behaviour of returning full socks to the caller but it also decr=
ements
> the child request_socket if one is present before doing so to prevent the=
 leak.
>=20
> Thanks to Curtis Taylor for all the help in diagnosing and testing this. =
And=20
> thanks to Antoine Tenart for the reproducer and patch input.
>=20
> Signed-off-by: Jon Maxwell <jmaxwell37@gmail.com>
> Tested-by: Curtis Taylor <cjebpub@gmail.com>
> Co-developed-by: Antoine Tenart <atenart@kernel.org>

You need to put my SoB here when using the above tag. You'll also need
to put your SoB at the end of all the above tags instead of the top.

> @@ -6514,13 +6514,14 @@ __bpf_sk_lookup(struct sk_buff *skb, struct bpf_s=
ock_tuple *tuple, u32 len,
>  {
>         struct sock *sk =3D __bpf_skc_lookup(skb, tuple, len, caller_net,
>                                            ifindex, proto, netns_id, flag=
s);
> +       struct sock *sk1 =3D sk;
> =20
>         if (sk) {
>                 sk =3D sk_to_full_sk(sk);
> -               if (!sk_fullsock(sk)) {
> -                       sock_gen_put(sk);

I'd suggest to add a comment here to explain why sock_gen_put is called
on the original sk.

> +               if (!sk_fullsock(sk1))=20
> +                       sock_gen_put(sk1);
> +               if (!sk_fullsock(sk))
>                         return NULL;
> -               }
>         }
> =20
>         return sk;
> @@ -6551,13 +6552,14 @@ bpf_sk_lookup(struct sk_buff *skb, struct bpf_soc=
k_tuple *tuple, u32 len,
>  {
>         struct sock *sk =3D bpf_skc_lookup(skb, tuple, len, proto, netns_=
id,
>                                          flags);
> +       struct sock *sk1 =3D sk;
> =20
>         if (sk) {
>                 sk =3D sk_to_full_sk(sk);
> -               if (!sk_fullsock(sk)) {
> -                       sock_gen_put(sk);

Ditto.

> +               if (!sk_fullsock(sk1))
> +                       sock_gen_put(sk1);
> +               if (!sk_fullsock(sk))
>                         return NULL;
> -               }
>         }
> =20
>         return sk;

Thanks!
Antoine