Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Date:   Fri, 13 Oct 2023 16:30:34 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Andrii Nakryiko <andrii@kernel.org>
Cc:     bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
        Daan De Meyer <daan.j.demeyer@gmail.com>,
        Martin KaFai Lau <martin.lau@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build warning after merge of the bpf-next tree
Message-ID: <20231013163034.73314060@canb.auug.org.au>
In-Reply-To: <20231013114007.2fb09691@canb.auug.org.au>
References: <20231013114007.2fb09691@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/k+myDR2_YBcKtAwJqPXFyO6";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/k+myDR2_YBcKtAwJqPXFyO6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 13 Oct 2023 11:40:07 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the bpf-next tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
>=20
> net/ipv4/af_inet.c: In function 'inet_getname':
> net/ipv4/af_inet.c:791:13: warning: unused variable 'sin_addr_len' [-Wunu=
sed-variable]
>   791 |         int sin_addr_len =3D sizeof(*sin);
>       |             ^~~~~~~~~~~~
>=20
> Introduced by commit
>=20
>   fefba7d1ae19 ("bpf: Propagate modified uaddrlen from cgroup sockaddr pr=
ograms")

This became a build failure for the i386 defconfig build, so I applied
the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Oct 2023 16:25:08 +1100
Subject: [PATCH] fix up for "bpf: Propagate modified uaddrlen from cgroup s=
ockaddr programs"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/ipv4/af_inet.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 7e27ad37b939..0fcab6b6cb04 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -788,7 +788,9 @@ int inet_getname(struct socket *sock, struct sockaddr *=
uaddr,
 	struct sock *sk		=3D sock->sk;
 	struct inet_sock *inet	=3D inet_sk(sk);
 	DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr);
+#ifdef CONFIG_CGROUP_BPF
 	int sin_addr_len =3D sizeof(*sin);
+#endif
=20
 	sin->sin_family =3D AF_INET;
 	lock_sock(sk);
--=20
2.40.1

--=20
Cheers,
Stephen Rothwell

--Sig_/k+myDR2_YBcKtAwJqPXFyO6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUo1foACgkQAVBC80lX
0Gy36gf8DWwDC94MJhWkzMIkGcJHT8SGoMCeaYPIqPAVeD7L5DUf9WRTz9DQf0bJ
hC1bNGqyfW9e52BBYPMDpFZgyNbJ3avCPH67Jm4f97J7Sq5tGWKKoUyI/j3dQgt/
RbJ+px91E2OK7gSKQLaj1V041f7/1owJdF/z9h9cuNjc56yy5n9mb1v9+cl4YMQq
hYzo2lfq2Rw7yiDYvNwY3dHQJfkzER/0zExupCyCbOeO1z3zC6Qc5cX3dZB32RDa
MwgXQQPe3deMgLDHcJKNkOUBjszxwcfZHGhRLD7H29KxXEZFrDexrUojRrosvDQm
vuuvjMIoC4lz6HG8VEN4ZRbtcH2jaw==
=V1UC
-----END PGP SIGNATURE-----

--Sig_/k+myDR2_YBcKtAwJqPXFyO6--