Received-SPF: pass (google.com: domain of linux-kernel+bounces-60057-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Fri, 9 Feb 2024 11:59:25 -0500
From: Oliver Crumrine <ozlinuxc@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, 
	andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, 
	kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, sinquersw@gmail.com
Subject: [PATCH v2] net: remove check in __cgroup_bpf_run_filter_skb
Message-ID: <adwssgplvtrgagjw5ftcc5ogpq2nz4pp722wzn3yt2jnql6odf@peiwrqaoyil2>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="adabdr3lq45rmeih"
Content-Disposition: inline


--adabdr3lq45rmeih
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Originally, this patch removed a redundant check in
BPF_CGROUP_RUN_PROG_INET_EGRESS, as the check was already being done in
the function it called, __cgroup_bpf_run_filter_skb. For v2, it was
reccomended that I remove the check from __cgroup_bpf_run_filter_skb,
and add the checks to the other macro that calls that function,
BPF_CGROUP_RUN_PROG_INET_INGRESS.

To sum it up, checking that the socket exists and that it is a full
socket is now part of both macros BPF_CGROUP_RUN_PROG_INET_EGRESS and
BPF_CGROUP_RUN_PROG_INET_INGRESS, and it is no longer part of the
function they call, __cgroup_bpf_run_filter_skb.

Signed-off-by: Oliver Crumrine <ozlinuxc@gmail.com>

v1->v2: Addressed feedback about where check should be removed.

---
 include/linux/bpf-cgroup.h | 7 ++++---
 kernel/bpf/cgroup.c        | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
index a789266feac3..b28dc0ff4218 100644
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
@@ -195,10 +195,11 @@ static inline bool cgroup_bpf_sock_enabled(struct soc=
k *sk,
 #define BPF_CGROUP_RUN_PROG_INET_INGRESS(sk, skb)			      \
 ({									      \
 	int __ret =3D 0;							      \
-	if (cgroup_bpf_enabled(CGROUP_INET_INGRESS) &&			      \
-	    cgroup_bpf_sock_enabled(sk, CGROUP_INET_INGRESS))		      \
+	if (cgroup_bpf_enabled(CGROUP_INET_INGRESS) &&			      \
+	    cgroup_bpf_sock_enabled(sk, CGROUP_INET_INGRESS) && sk &&	      \
+	    sk_fullsock(sk))						      \
 		__ret =3D __cgroup_bpf_run_filter_skb(sk, skb,		      \
-						    CGROUP_INET_INGRESS);     \
+						    CGROUP_INET_INGRESS);     \
 									      \
 	__ret;								      \
 })
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index 491d20038cbe..644bfb39cf9d 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -1364,9 +1364,6 @@ int __cgroup_bpf_run_filter_skb(struct sock *sk,
 	struct cgroup *cgrp;
 	int ret;
=20
-	if (!sk || !sk_fullsock(sk))
-		return 0;
-
 	if (sk->sk_family !=3D AF_INET && sk->sk_family !=3D AF_INET6)
 		return 0;
=20
--=20
2.43.0


--adabdr3lq45rmeih
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE16z70XZtqMhb/BJHifZEXNYDnHAFAmXGWekACgkQifZEXNYD
nHDFsg/+LFfMdY0hV8/Lf6dT3g9oo2CJ78Flqg6d/Moe0kEEjcVwnFkfjxFwH//T
4Pw7Qvwq1YQ6MVqL/KAZHLUGiVQuQZEnzHtHwSYOgShdfesbDVq/ang3XfrST2ZQ
qlx6QqvCEYWpfjESgjWC6e7SNxoPuSkNrpWOJsZYvE9ZWCS3Ppc7V350EVKUmvTN
lKEwidgDSbZk2rZZKozpVhJya8vyUsJ5OXAkNfZWDetiN2syfEPXS49I/svaF3Jh
Lk4DUO6/6lDhcr4vQUnvZAb672HOPmqlRR5Mh9K/DX+0kkwWjw+l22SS1j4Iatkj
Z5ctMLPGXgKwV26TZeSzCJ/tEl4/tdsTUspQ1fky/G9JBGRGhx3tmusHSqZpKJjF
daBULbrYMNsrYoLAE8jk16JSOO3u4CYDJOGaFiKa7hyqPbduKI1D/7kKoKmUHTJB
3U3C5VFfQBulcf8wA+bH5hkbWz7+RC7YKhM1Orfb598pQOpdsX6ljf+EQxgO0hOd
siMb0T3HonoAnZEhtp77xqWrTxc9gWpTkfuyrjrk0r6I8BI4YBK9PqplhvCSu5eN
sXzIA2L5V6eKQ2+9vi2W5Ehpx9RZMvSplFewnXzdbZJvKeKZfAGE1kKzEMHxCE1I
WmDzzrv7B9LtCEhmqrpyvyTv0xcSQxj3p8wBBwvq8ninBuwEYWQ=
=qSMx
-----END PGP SIGNATURE-----

--adabdr3lq45rmeih--