From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6C5942F57D for ; Sat, 28 Feb 2026 17:46:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300821; cv=none; b=b4Cz26EtOPvAyxiw3ADSr1MPQPm5cSrLzkfjqjPZTqM4GmuKrEvFrmJQdidAzYPM1VWDboGerMpkGv6kw4oBvE3zRlwI8xYbNrr1fShEpKeKe3veFiStXdK+nP+ePUSihYwmJYAul8vqeDDB7vhE45wPqBYWP6bxNNo0AezHKeU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300821; c=relaxed/simple; bh=C4KUZeK1Hi7rfQcTxVhmRP3plJWRRKSRXeRWRjZLG2E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ixkDjI9Izw6eQEZAQBCXb8AHCG5DhEW0ljJlAeyErFTTiOFavRT3kaOq2Sx+F12rA7mZ6YLs+oj092/P6L6k2Qr/Vm2WiM7PcLizxzfZmlpfXFaWKELs/5lgeD5D2WaBCPD5EVYSYbfd0arEiZEznaSGBQmontXuZc3yfi4FkXI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=WR0rMLVu; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="WR0rMLVu" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-482f454be5bso37114275e9.0 for ; Sat, 28 Feb 2026 09:46:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772300818; x=1772905618; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=esHyrvwDztyurGcqLZ4eAcc1uKLaDOcfnZVfPZ9eJ00=; b=WR0rMLVug6/retEeZ4mzTXnn48o25xqKGLiwjHPqvlo/kX6PJFxYflXgFbqKAxK7Uz nDFbJ6jfmTx/RDGzFEWUsVI3LyK+m/5u5Xax9Mjn64OkrfEQ7vAxlbyg9Z050PlQZ1MW VJCS/WrcxrGaQApnxGsgcL5eWGCxkDnr1bazWQ5TWDy7EJnO90OTpHgQNbDAqY/OgrwP IXrfAC5D4DKp0g+cjLshIeeBI95KEUmN8X1DdcORpp5v72437Kowxxw9uxg3QNxS0+Ze 0/IwQacxxCOTOW+0k7S6ZMdSZA+hziLhsC4HMCp1/JO/mJwHEMwSXMhdEYGQoIBP9ec9 dL+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772300818; x=1772905618; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=esHyrvwDztyurGcqLZ4eAcc1uKLaDOcfnZVfPZ9eJ00=; b=dBrv2b9z0on/B2Q4GJyxgcg54W8jDZnIP7Zrv7qW2H2J5pKzvWojpUQEV5Q5nZcMF8 FXYjwqzzKvqtQLvjUb+Sjr5ek2NFmCFWQC7oYvwsFaoVK5DCdjOTE3uaqiK/71+IceXk r9llgw2k7tInAMBUiB2i4V7s4e9SF3dJO3FrLLf+KimoYV6jAJjnK7tF5vAjqt18MRbN 18Iff5n71HgclGmbYYDl46T0jetJ2vO2bDhrUpJLxeAcd4qs5lGO/MBbyQhdD6m/CBgz cfjJRyqT2+kFha+oFOALUJvimg0ZKwWD65jgofypx6ohoRmsJdjPC/P+XxLXxCWiBdEy 0MnA== X-Forwarded-Encrypted: i=1; AJvYcCUCYTaVjwA6I8EItcMbzW4glQahze8jugzKhJDTGvmHiNohadwW36MZ+uxm2NHFKLm8wcBatjzo/FI7Ago=@vger.kernel.org X-Gm-Message-State: AOJu0YwGb8qxPKOHgzdfBlr0vinDocS9DEeSDSO36nCEQvyDGZ7rEs1m RfxysGZitT2ydTTiWaOA1IB2JD/3c5JooxcAjYx1EcLexreV+rF6LAfN/Rr+bCVYGPE= X-Gm-Gg: ATEYQzxxT8TkteTrs3uW8vzXCpTlSZxr75sOQ2PUwAyPAQaewvbLkU4RmOKgTdUEfV9 Ni4cf6D5Fg7dKfwAlpXFXQVZJNBO7dS8l2AQcWFt80ZUTMfFmdTZI6CuzugsNBQbTlZN7LRiSGk AdNRhhkPAc36mJGFJdgEjlQpfOehO5ebknEhxVL+miWR8YnpQdWmM294uQUosM/Xkb2mLV4CRyi /Pge/HXvVBXgEV/YxqBJxrAop3Dk63jyFvGr1XS+AxNNSC7aFqrIaZ6MhUb2nmr+KfPFYnubXY9 5Yzzb1Y/xdIVYEWcO46iooPbXM4R96XZleAeiYeQ5RLegSC6OlOCcSZlBR8F2tf1mb4xNhHFZiw VaHxJbTPxO7Io4w7IJ7nFNpT0r46itItDA8dh8JO4pZcK1wzyWIwI7PUiRkTjndeM+eNCuson0q P5vEnVBbrN X-Received: by 2002:a05:600c:4256:b0:483:6fe3:bb49 with SMTP id 5b1f17b1804b1-483c3192683mr117862785e9.0.1772300818191; Sat, 28 Feb 2026 09:46:58 -0800 (PST) Received: from localhost ([189.99.238.12]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-94df65782f4sm7474139241.11.2026.02.28.09.46.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Feb 2026 09:46:57 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Sat, 28 Feb 2026 14:46:27 -0300 Subject: [PATCH net 2/3] bpf: bpf_out_neigh_v6: Fix nd_tbl NULL dereference when IPv6 is disabled Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260228-net-nd_tbl_fixes-v1-2-2b2a274df9bb@suse.com> References: <20260228-net-nd_tbl_fixes-v1-0-2b2a274df9bb@suse.com> In-Reply-To: <20260228-net-nd_tbl_fixes-v1-0-2b2a274df9bb@suse.com> To: Martin KaFai Lau , Daniel Borkmann , John Fastabend , Stanislav Fomichev , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Hao Luo , Jiri Olsa , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , David Ahern , Jay Vosburgh , Andrew Lunn , Hangbin Liu Cc: Fernando Fernandez Mancera , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openssh-sha256; t=1772300803; l=1989; i=rbm@suse.com; h=from:subject:message-id; bh=C4KUZeK1Hi7rfQcTxVhmRP3plJWRRKSRXeRWRjZLG2E=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QATSOt0MBqXmmfLN1fQuQPIpcZOIRw0awhFQgAxRXUZGNukQbfeMMEZkMUFe6uV+SU1Bf5CQenM 12cyI8o7mnAQ= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g When booting with the 'ipv6.disable=1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. If bpf_redirect_neigh() is called with explicit AF_INET6 nexthop parameters, __bpf_redirect_neigh_v6() can skip the IPv6 FIB lookup and call bpf_out_neigh_v6() directly. bpf_out_neigh_v6() then calls ip_neigh_gw6(), which uses ipv6_stub->nd_tbl. BUG: kernel NULL pointer dereference, address: 0000000000000248 Oops: Oops: 0000 [#1] SMP NOPTI RIP: 0010:skb_do_redirect+0x44f/0xf40 Call Trace: ? srso_alias_return_thunk+0x5/0xfbef5 ? __tcf_classify.constprop.0+0x83/0x160 ? srso_alias_return_thunk+0x5/0xfbef5 ? tcf_classify+0x2b/0x50 ? srso_alias_return_thunk+0x5/0xfbef5 ? tc_run+0xb8/0x120 ? srso_alias_return_thunk+0x5/0xfbef5 __dev_queue_xmit+0x6fa/0x1000 ? srso_alias_return_thunk+0x5/0xfbef5 packet_sendmsg+0x10da/0x1700 ? srso_alias_return_thunk+0x5/0xfbef5 __sys_sendto+0x1f3/0x220 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x101/0xf80 ? exc_page_fault+0x6e/0x170 ? srso_alias_return_thunk+0x5/0xfbef5 entry_SYSCALL_64_after_hwframe+0x77/0x7f Fix this by adding an early check in bpf_out_neigh_v6(). If ipv6_stub->nd_tbl is NULL, drop the packet before neighbor lookup. Suggested-by: Fernando Fernandez Mancera Fixes: ba452c9e996d ("bpf: Fix bpf_redirect_neigh helper api to support supplying nexthop") Signed-off-by: Ricardo B. Marlière --- net/core/filter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index 9ab2fae3a0d9..ad87c40f1393 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2228,6 +2228,9 @@ static int bpf_out_neigh_v6(struct net *net, struct sk_buff *skb, return -ENOMEM; } + if (!ipv6_stub->nd_tbl) + goto out_drop; + rcu_read_lock(); if (!nh) { dst = skb_dst(skb); -- 2.53.0