From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A18E4CDB47E for ; Fri, 13 Oct 2023 05:30:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229651AbjJMFan (ORCPT ); Fri, 13 Oct 2023 01:30:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjJMFal (ORCPT ); Fri, 13 Oct 2023 01:30:41 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34264BC; Thu, 12 Oct 2023 22:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697175037; bh=AfBIySfe8fzqGBOdkjxdb3bfx1qDc/XmAZ67Y9SaAac=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rw38ukSjr6aqa3lxPk3vRRGIuP5LW4BKBj9TK36FGVsbxjB+nAUYJvvmf0/FUSo1j F3uK4/C4qbEumhrdNz9Asz4zj0x28JeJTVc/Hi+nsnlQh0PJA74fGy6Pg7/YaNVVLz G0fUr8y5yYekuGZNw0Ckt8iKrdMi9A9UcczLvSABhSw0q4fNDbG1jZrADtG0yDc7jT o1408nJUy75CY/Myuy1kYxr9nyPfPAx+6CrcK1/NG0j+FoK1LxIBoyPPu2jvaBuS8d dGKq2YfSqy2b7ubXQiWi+AIsAhKSh8RliwVqGkB7FJQVSgqb+kI0udN9+WOl8ssLlN TqQFnXw69zOOw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S6FTS65HBz4x5K; Fri, 13 Oct 2023 16:30:36 +1100 (AEDT) Date: Fri, 13 Oct 2023 16:30:34 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko Cc: bpf , Networking , Daan De Meyer , Martin KaFai Lau , Linux Kernel Mailing List , Linux Next Mailing List 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --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 = 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 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 --- 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--