netdev - [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto

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-next>] [day] [month] [year] [list]

Message-ID: <20240712235150.99175-1-jhubbard@nvidia.com>
Date: Fri, 12 Jul 2024 16:51:50 -0700
From: John Hubbard <jhubbard@...dia.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Shuah Khan <shuah@...nel.org>,
	"David S . Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Steffen Klassert <steffen.klassert@...unet.com>,
	Herbert Xu <herbert@...dor.apana.org.au>,
	Andreas Färber <afaerber@...e.de>,
	Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>,
	Matthieu Baerts <matttbe@...nel.org>,
	Mat Martineau <martineau@...nel.org>,
	Geliang Tang <geliang@...nel.org>,
	Pravin B Shelar <pshelar@....org>,
	Willem de Bruijn <willemdebruijn.kernel@...il.com>,
	Alexander Mikhalitsyn <alexander@...alicyn.com>,
	zhujun2 <zhujun2@...s.chinamobile.com>,
	Petr Machata <petrm@...dia.com>,
	Ido Schimmel <idosch@...dia.com>,
	Hangbin Liu <liuhangbin@...il.com>,
	Nikolay Aleksandrov <razor@...ckwall.org>,
	Benjamin Poirier <bpoirier@...dia.com>,
	Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
	Dmitry Safonov <0x7f454c46@...il.com>,
	netdev@...r.kernel.org,
	linux-arm-kernel@...ts.infradead.org,
	linux-actions@...ts.infradead.org,
	mptcp@...ts.linux.dev,
	dev@...nvswitch.org,
	linux-kselftest@...r.kernel.org,
	LKML <linux-kernel@...r.kernel.org>,
	llvm@...ts.linux.dev,
	John Hubbard <jhubbard@...dia.com>,
	stable@...r.kernel.org,
	Ignat Korchagin <ignat@...udflare.com>
Subject: [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off

Linux 6.6 does not have an opt_ipproto_off variable in gro.c at all (it
was added in later kernel versions), so attempting to initialize one
breaks the build.

Fixes: c80d53c484e8 ("selftests/net: fix uninitialized variables")
Cc: <stable@...r.kernel.org> # 6.6
Reported-by: Ignat Korchagin <ignat@...udflare.com>
Closes: https://lore.kernel.org/all/8B1717DB-8C4A-47EE-B28C-170B630C4639@cloudflare.com/#t
Signed-off-by: John Hubbard <jhubbard@...dia.com>
---
 tools/testing/selftests/net/gro.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/net/gro.c
index b204df4f3332..30024d0ed373 100644
--- a/tools/testing/selftests/net/gro.c
+++ b/tools/testing/selftests/net/gro.c
@@ -113,9 +113,6 @@ static void setup_sock_filter(int fd)
 		next_off = offsetof(struct ipv6hdr, nexthdr);
 	ipproto_off = ETH_HLEN + next_off;
 
-	/* Overridden later if exthdrs are used: */
-	opt_ipproto_off = ipproto_off;
-
 	if (strcmp(testname, "ip") == 0) {
 		if (proto == PF_INET)
 			optlen = sizeof(struct ip_timestamp);

base-commit: 2ced7518a03d002284999ed8336ffac462a358ec
-- 
2.45.2