From nobody Thu Apr 9 20:28:21 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 99AF33446B2 for ; Thu, 5 Mar 2026 20:37:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772743072; cv=none; b=Nyx9r9XtzKz+HhkILxSX9f75oApSYWFGmvcc2l/wYbCeTA/j2hXbUzZyzzkaqIrtVjGy6cRs35TOlpksrluXk0VfsRUSYlc7aMzzRCFApkoRLcKslqzU2Nm0MngPmQt9Uj13f4X/4ar3oHWKXoPelBenNSmFH++UgKuquuPvRPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772743072; c=relaxed/simple; bh=Yfucwf5JHvyU/znf9S6sDQrRZ/qy3di3N5iSoXWL4aM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L+aFixu7YwqSRWyFd940slT8W0skNw1I/hla6oZa65cmd/Wz9ixbx4A0veeYQo9jS3qJ6vdOJnNxCAH+84p4Ayni6+Kk6aggpyq08Fhw1uF3toHjpYhufBC99expIGT29ws0ADQfbA99dHlVb3zm2Oaxm1hfKwZy0ISBKQ+XHM4= 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=OwYnViCU; arc=none smtp.client-ip=209.85.128.46 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="OwYnViCU" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-48371119eacso100302625e9.2 for ; Thu, 05 Mar 2026 12:37:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772743069; x=1773347869; 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=6qqlYUk2uLknCELv6zwONHG5x3atJmpFah5PNZJ3m1g=; b=OwYnViCUQd7q/FhqXzjz9Q8r4KoWEKZa/1pt39UHCDDILvlIgm+PK7qqo4Vlen4XXy 2Z4rIFVx1DOj9kRtPCN5wbKFjxEjqzoEUuJ02KGLheB21r9V2LomJqBSr4mn0Qs3IIJx F3MTZCV6eeSc/fCcHPeWyoRYGbcTd3LUNPkTwOk/FhKGWMD2xwyJQUysJhI86E+ts30Z QbJ/dlzu4aSatL9iHEdQwfCLLuSFPLLC+25n5Ll6PItYogwGRsFzBPTz/8Rr6A/IVVd0 oX3WdG94wBeovCVbLngT+x2pFaAU2/mrlK4mXyDzkEx5O685ylrzRTzqFMOJ3oMficqx Gotw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772743069; x=1773347869; 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=6qqlYUk2uLknCELv6zwONHG5x3atJmpFah5PNZJ3m1g=; b=wXosQwRuB/4RcJ38/xLkbXr0jkMZaoVek8D/tANCdZX34IAqV02Cn08bOYYFp+XhSj 00g5nfLG8znPmnSblrTMX7cY2mdu/yMHJNln06xZaxsN/jW5iL6ViibU1fHjBDyMBr+R RSf18JYaN6FfbFCr7xp06I9IFIF2ALV+HTQypvBw0o/OWphX/RzS4RCcBoAZmSix4FEM 1TRvtfQoXThd+FaRY/Kx94us+26euKbdu8/I+/bXNdQl5wH5kpj9LxpCnhTLHun7vs5d wLpxalMZenpVbzcIIe79j4M9TOc/rQ5FjKd/gJ+X2Tog6J9nXemi7cOY7Qtjlk6p7aNz qBiA== X-Forwarded-Encrypted: i=1; AJvYcCXtGBPoBmGPUCcUVcf+TNkz+eL3vlKCIEzaCWMI5iT/x/ZSmRqz6yJ1wt/ioUCS4q9YGygRxTgxzDjTHI8=@vger.kernel.org X-Gm-Message-State: AOJu0YwRsOMwwNXhz0dy3J9P+8d02eQQLH63c7y1U+zwC3CvHHFvMVIG Wwv6cJFTKYxmB2UcH2QgOyX3uGlrr7O2IoRQngxgDi93y2/EU5wZMQ2oSwVsyRd07AE= X-Gm-Gg: ATEYQzyO9Em0GgkqUNjskgh86lw1L2mDghI8UqiEScJWsE1HnSQeMoSJZ+qpodPd/MY bIzW+VyvRqNhEWyowHsCKQhzJqAW/997K4Q3SoLEF5WhMdCs3dYkpH0b6VRDK0gPBofEUgwJ1J9 8fZpf7z2R4DrVijmYrNKNqREEBPN6TVp9GgEIwAMljIKjjsPPAD50EtLCmPiQrVmUQ4Ygbykfdd mguFndLX33U6VJfsqB7prLnwI7IMZD7mchCEiEGcy63pzl97ywDZWKh6APxvesRkWmoclbhnjYc Fm2dxlPOt8iGh68IZNiCX0+u+gU9zw66xiI8dW4045GoYNkG2nI1qh2t07PtczQLE+5nm+o11P9 ejh2SoCkxKyl+ZAgt25ARbRS11Ryq2DeNeUDcNu3IF+TZtVgslctMhlPrXS8WyG8i9n1MDN+eig PX3isTrPnStw== X-Received: by 2002:a05:600c:3f10:b0:483:b01c:9508 with SMTP id 5b1f17b1804b1-485235a78d8mr14649615e9.2.1772743068926; Thu, 05 Mar 2026 12:37:48 -0800 (PST) Received: from localhost ([189.99.238.164]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-5ffce11d29dsm2610413137.7.2026.03.05.12.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 12:37:48 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Thu, 05 Mar 2026 17:37:39 -0300 Subject: [PATCH net v2 1/3] bpf: bpf_out_neigh_v4: 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: quoted-printable Message-Id: <20260305-net-nd_tbl_fixes-v2-1-b7177db1a9f3@suse.com> References: <20260305-net-nd_tbl_fixes-v2-0-b7177db1a9f3@suse.com> In-Reply-To: <20260305-net-nd_tbl_fixes-v2-0-b7177db1a9f3@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=1772743062; l=2193; i=rbm@suse.com; h=from:subject:message-id; bh=Yfucwf5JHvyU/znf9S6sDQrRZ/qy3di3N5iSoXWL4aM=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QELA4fZ8Uu1G8uhu9+u3KMAefcDUWGgV/dwgvshG/ifXp0EaQKOUYgVehq7+ApJEY+ASGkfwf7P bFe0OGSXMmgI= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g When booting with the 'ipv6.disable=3D1' 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 from tc with an explicit nexthop of nh_family =3D=3D AF_INET6, bpf_out_neigh_v4() takes the AF_INET6 branch and calls ip_neigh_gw6(), which relies on ipv6_stub->nd_tbl. BUG: kernel NULL pointer dereference, address: 0000000000000248 Oops: Oops: 0000 [#1] SMP NOPTI RIP: 0010:skb_do_redirect+0xb93/0xf00 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 ? srso_alias_return_thunk+0x5/0xfbef5 ? alloc_skb_with_frags+0x58/0x200 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 the AF_INET6 branch of bpf_out_neigh_v4(). If ipv6_stub->nd_tbl is NULL, unlock RCU and drop the packet. Suggested-by: Fernando Fernandez Mancera Fixes: ba452c9e996d ("bpf: Fix bpf_redirect_neigh helper api to support sup= plying nexthop") Signed-off-by: Ricardo B. Marli=C3=A8re --- net/core/filter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index 0d5d5a17acb2..ff02dbe4c94f 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2335,6 +2335,10 @@ static int bpf_out_neigh_v4(struct net *net, struct = sk_buff *skb, =20 neigh =3D ip_neigh_for_gw(rt, skb, &is_v6gw); } else if (nh->nh_family =3D=3D AF_INET6) { + if (unlikely(!ipv6_mod_enabled())) { + rcu_read_unlock(); + goto out_drop; + } neigh =3D ip_neigh_gw6(dev, &nh->ipv6_nh); is_v6gw =3D true; } else if (nh->nh_family =3D=3D AF_INET) { --=20 2.53.0 From nobody Thu Apr 9 20:28:21 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 2B99D344DB4 for ; Thu, 5 Mar 2026 20:37:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772743077; cv=none; b=ayl2F68sSsOfdDOv19DQVV7QTPXPvkbnOmYS4caXabQfau488973cONZ7XUlvNzdJ9mjMhK35twcPLd9zp5dW/e7vniLWdsOeIx6eDuA+U4S4yrChLLIsv5qXtKdJrMQnZhE6sQ6kGELv8F4p8++bPkHDxUy4PlzQcONjjHR4zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772743077; c=relaxed/simple; bh=BJNtUYfcCSIEf+KeHSlKgwI0CK0CjGEsuB477WGKkxc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O5SkMaoPOkAjDco/24rkEV9swt8T67l+OngUF3KArOtlRKDGM1TihE9axRpEWkZwzib0k4a09N4P7joX44R9SKrLhKJdj3HFCGtVBV9QZi6BdN8NcwPz3mYp1nN9JzsHQNCX/EARnaIdCYughwp+IbPHoXDJGAR+rx3FphPPL3o= 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=d40pxSfv; arc=none smtp.client-ip=209.85.221.44 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="d40pxSfv" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-439c4bde55cso1906341f8f.1 for ; Thu, 05 Mar 2026 12:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772743073; x=1773347873; 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=5iQa15gRV5WHmyp76havDhzqIhlaRupWnpaZaZ9e388=; b=d40pxSfvQg+T40WC4baDClvjkGivNBvgPsiskFs140c40hWoSXfX8PN7PeDorTS31G U0SZzVGlsToJ3T58uTfVTPrAX8HJQGNSrGfTzwyhZg/AfmIzTpF1wd0yTM2FjJAf+pI5 l6EqbX6NaGSNrRtO66EENu6yu/ShkLrw2N4nJ4ZPUbreOAdKlQpqxUNm4OLhBIrmim5y 9NoMIqG8Us39fHAi0ZGTzSdLTVz/w0oRrdGLpW+EmwuQ+FilrwkAQ3qEJy4Mmm2z5OM0 Fwm8mQYV9EfQxuhHw+GaOpOY9s6tLtnyyR+ASCeNFBxf+Djhos4oExD6BzHKd1YUuncP zgiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772743073; x=1773347873; 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=5iQa15gRV5WHmyp76havDhzqIhlaRupWnpaZaZ9e388=; b=QoNi17v88nIvj9nQLY1GKD1cn80JsfZAe9SHaVfD5SELCjCCALdtpWSc1weRooPIh/ XEEaoVLpLxTQV3/pTnv85Wix3wesMl6HA3oPjqFZHiN2DojDmSjnWZRPnG/7J13bK5Di yLMaawgqqgrVNeeY8qFngbitCxwBp+rORl84tKVaDBRrTHyOOD3vySBOgmeSk9oQat8L mRmQv3C9ckbVpZWiHEteFE2Av2cc6nc3y77BQMqCSUNpt45TZeJVHVSi5X8ma0ZXesuL dJ3nNAeqwdhSQAPe3MsNBZtpaazJWllrcDTjQHL/1ZSnW87wcu35ErEz9xEdWI99XZnd tu3g== X-Forwarded-Encrypted: i=1; AJvYcCUYb01CMP92maPhKgpeHQRXcU3Qqyj6pJJwjEGIii62kkVOwUovMi2SvjeWDhjhAeL5KXkQdNa2A9Wmg00=@vger.kernel.org X-Gm-Message-State: AOJu0YzPF/1+eYG9Gdptr9P8u7FGOsnu8siYDpOD0Ga5wJ51SzSYq6Gb 3m1js3ZGwzZRetrnmKVaSz31qXxkxpwgJfMs7pxuMWUPU55ZfeKlsIMcT2pP3gTEhbU= X-Gm-Gg: ATEYQzzTG2XqJbNczta6ZoNjONcLLSgFzww5os8G/ANT8tixrTpC9iEWH0gnUM0wO/v 0A5Zi+Edx1ENy8lDcWKVTKCj85ZoSnO5HZM0dl6+RTLGfLvOPJPNd1oh/mYv1/WnsYczJsei/rE uMsaTyqsYIwRURo+fIo6jztpyDQI4SbY+rUqKF5hYO5LO7+CboijAI8g4jMxj4q26Y7VJnoMB5Q Pj65Emtcczu8E0gidgH01YhcNxQGOUhOjZL9JJkoK258QngWAGIL7DLSVoNtRUlh5NdNbcJ5nRX A3nvYl8ldXT1kuwD1hn5Msso5fEo6CT2R1SdQP0FTtxLr5aiSKtUr5fVQ5nA8WmGmJEAw53M5rY ecDp2l8ZB7CHgJyodDxwjhsNTcztMrtXGMx9HjX1x0eBCZCJLznHCGtAPsJFSTfXYNitNd736s9 fs0iDAm6ltmt6dTx4CGadY X-Received: by 2002:a05:600c:4e8a:b0:47e:e9c9:23bc with SMTP id 5b1f17b1804b1-4851989fb4cmr108131025e9.30.1772743073493; Thu, 05 Mar 2026 12:37:53 -0800 (PST) Received: from localhost ([189.99.238.164]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-94df65a2a0esm21503219241.12.2026.03.05.12.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 12:37:51 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Thu, 05 Mar 2026 17:37:40 -0300 Subject: [PATCH net v2 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: quoted-printable Message-Id: <20260305-net-nd_tbl_fixes-v2-2-b7177db1a9f3@suse.com> References: <20260305-net-nd_tbl_fixes-v2-0-b7177db1a9f3@suse.com> In-Reply-To: <20260305-net-nd_tbl_fixes-v2-0-b7177db1a9f3@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=1772743062; l=2000; i=rbm@suse.com; h=from:subject:message-id; bh=BJNtUYfcCSIEf+KeHSlKgwI0CK0CjGEsuB477WGKkxc=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QKpwaygzkyRw1nX1Db8ixqMTwa+zBHSzqsGzeC0nU7VvrPsKL8ySrGdrLXidS6fBHmhzLURON79 y3rFPuYcGygw= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g When booting with the 'ipv6.disable=3D1' 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 sup= plying nexthop") Signed-off-by: Ricardo B. Marli=C3=A8re --- net/core/filter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index ff02dbe4c94f..3344fa0789f0 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 s= k_buff *skb, return -ENOMEM; } =20 + if (unlikely(!ipv6_mod_enabled())) + goto out_drop; + rcu_read_lock(); if (!nh) { dst =3D skb_dst(skb); --=20 2.53.0 From nobody Thu Apr 9 20:28:21 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 A5152345CA1 for ; Thu, 5 Mar 2026 20:37:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772743080; cv=none; b=d16LUVGe5EXoOeuhimjEezOOe1B4f/Ekiy0qErigRtt1RTtdI0jsMA9gL8kvzxjEQn5mMi90CmBMElGM7KvfUwuIp1/Q5rgL1+bKjhFHSEu5ut46sneuRTNKg1lKdPp2GRb9jF7E1VVmlqY0UEgVpulZEl+FdddHPtlcvaD7NTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772743080; c=relaxed/simple; bh=cnxiDzaTG3dDRmVmA/NbvEgeXNe7TfmfMEbBpvNLqsY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TgRQhXqMJdtyxtRD3ABKHer9wAabWEoYde7PxdtSp+f8C8OS0BhwNQ+2l0lE1ZIJKkHl85S1H46g7n6Xby6nun2xFAe+pA2jpU0bwacvCigz7NuQ/4lPmC9kRCHmlLvSGUjRoU/Yo6W0nd6eAzDPnm8M8HVEsoQCi5zdIVsMkjQ= 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=Gni7X/C3; arc=none smtp.client-ip=209.85.128.42 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="Gni7X/C3" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-48372efa020so75337145e9.2 for ; Thu, 05 Mar 2026 12:37:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772743077; x=1773347877; 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=yBymiq7nID2vF4wesRN60I/529SDzorxfefrpkxAGsE=; b=Gni7X/C38IFjzoKGxSw36Mv7ExYpAofpud9tmH6C78LpgTXLWvZaDDcuRNH7Lkvdx3 naAstLwTOkgUPwq91rNedD8X0Sx1E98x07zjT6NGlRP2v3TyCrZgYWctMyFjuphGquK/ gUj7NPR4NW3RxhAdC+t73Rxn6ijza0Yv7jbQLUwSgROARE1LkM4TY1O7evWhBdCTPHwJ KpcYGYUcMvVSF4j6c2kDE5giU1LPq91VIc/Yno/Y2amBPN2zoWUA+JwERA1QHD10YOuU vn0GcPV7W6a2b5R2ykzXdrIGlt3IWPlhU971KSDHTVSJRrJUFvkHGla0jyyeCPF02pEz TWAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772743077; x=1773347877; 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=yBymiq7nID2vF4wesRN60I/529SDzorxfefrpkxAGsE=; b=wiunkOSNJczvkBMNRX3XniyY0BkTzQDWOchPlAzOaTjAciZvrY5kLcBmQ5B4PQXxNw POsck/6xytWnBdkRXIblfAa9RfcwdIoFOOJ7erRB8TnAU0cw+RJbyAS40rm2x7vz30NV qKmE8paPEoZNWD/gemyfha8FzVeCJ8h+GzJ+molPiHKLlUNhBUTr1p6foCsJx/sVTtVc 0YxLvqWUqb0ACr0iiKe5LHOf6H0J+ahX11rIwISI9lqZ8PYFa5CLsMm5Y+ku/qSVqMdB tmf7CnMwFgs77N97NT/r6XFNRrxpaqlgVtmH0zMuH2P68e1o0gpGMbs13+WIMDOBKvhF bcmA== X-Forwarded-Encrypted: i=1; AJvYcCWnHPOxUYkVBZnq5+DdK72n7TUsAU+M9FwVtMUTraX0ZxUjQlx7qWmB+zipcHxgcNGf987eYMCBYMf0HcM=@vger.kernel.org X-Gm-Message-State: AOJu0YxbMasiRH03hfO1KE+fzo6FOpeId0mybp9FhLVYj3xMcYwHIwRG VL4+NDjRBQuEtVUZpFLfBfs8kcWJ37izWVFtpfGAVXBMkeUs4mS29Fvhz2A02q/AAf8= X-Gm-Gg: ATEYQzzykUakxKpvy1F/6McWnMbkpzaeRni3uEZBn9Cpc+sSyVViiG6/Yzzrx3h3KhJ CB0cILCuSOksgutS4uO61mDjA28SaWVA260fZVAKxnUyEvQlS+FXlOXkdhLzpu+q1fN5k9tGO6n 7R6tPVg6IiDbY/JdFFQSOlF8lArp3PusTYbKkRjCjhidqwTSX4bSlsq2k4yj1d1nU6vMxA6L185 ha7L1EznFPDCpn3Vz9fibLsl+JmBQKYVbjmZaMrFr4u02KgGdUfoKn7rAjnm5V+5VtTuzTCQyAT cts7cj4GxSsaBGNXN56E19+Lx8tC7zOBV99EDPJ+3xZJOdsc4AX5ANIflSkze+PT+WPO0olWiEt 01IbPpKLHTEhPR/Fots99J3g/gU6BqwoLeVKXEKf5CVvraQR6yoCTE+17uh+DWqsDrgXxCDxTjL xCdTu6a3LwOg== X-Received: by 2002:a05:600c:a08c:b0:483:885:f0b0 with SMTP id 5b1f17b1804b1-485198bac26mr132115915e9.35.1772743077012; Thu, 05 Mar 2026 12:37:57 -0800 (PST) Received: from localhost ([189.99.238.164]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-56b007a3364sm1714489e0c.16.2026.03.05.12.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 12:37:56 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Thu, 05 Mar 2026 17:37:41 -0300 Subject: [PATCH net v2 3/3] net: bonding: 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: quoted-printable Message-Id: <20260305-net-nd_tbl_fixes-v2-3-b7177db1a9f3@suse.com> References: <20260305-net-nd_tbl_fixes-v2-0-b7177db1a9f3@suse.com> In-Reply-To: <20260305-net-nd_tbl_fixes-v2-0-b7177db1a9f3@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=1772743062; l=2650; i=rbm@suse.com; h=from:subject:message-id; bh=cnxiDzaTG3dDRmVmA/NbvEgeXNe7TfmfMEbBpvNLqsY=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFEHFEzi4olsRwKIGTYjj0OJcMJUp7J/8RoYSXtHC6YxcKesAOSiPUA9lLV1yaiiKX9118RM+Zw h7qF3LiueJwA= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g When booting with the 'ipv6.disable=3D1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. If bonding ARP/NS validation is enabled, an IPv6 NS/NA packet received on a slave can reach bond_validate_na(), which calls bond_has_this_ip6(). That path calls ipv6_chk_addr() and can crash in __ipv6_chk_addr_and_flags(). BUG: kernel NULL pointer dereference, address: 00000000000005d8 Oops: Oops: 0000 [#1] SMP NOPTI RIP: 0010:__ipv6_chk_addr_and_flags+0x69/0x170 Call Trace: ipv6_chk_addr+0x1f/0x30 bond_validate_na+0x12e/0x1d0 [bonding] ? __pfx_bond_handle_frame+0x10/0x10 [bonding] bond_rcv_validate+0x1a0/0x450 [bonding] bond_handle_frame+0x5e/0x290 [bonding] ? srso_alias_return_thunk+0x5/0xfbef5 __netif_receive_skb_core.constprop.0+0x3e8/0xe50 ? srso_alias_return_thunk+0x5/0xfbef5 ? update_cfs_rq_load_avg+0x1a/0x240 ? srso_alias_return_thunk+0x5/0xfbef5 ? __enqueue_entity+0x5e/0x240 __netif_receive_skb_one_core+0x39/0xa0 process_backlog+0x9c/0x150 __napi_poll+0x30/0x200 ? srso_alias_return_thunk+0x5/0xfbef5 net_rx_action+0x338/0x3b0 handle_softirqs+0xc9/0x2a0 do_softirq+0x42/0x60 __local_bh_enable_ip+0x62/0x70 __dev_queue_xmit+0x2d3/0x1000 ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? packet_parse_headers+0x10a/0x1a0 packet_sendmsg+0x10da/0x1700 ? kick_pool+0x5f/0x140 ? srso_alias_return_thunk+0x5/0xfbef5 ? __queue_work+0x12d/0x4f0 __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 bond_confirm_addr6(). If ipv6_stub->nd_tbl is NULL, return before calling ipv6_chk_addr(). Suggested-by: Fernando Fernandez Mancera Fixes: 4e24be018eb9 ("bonding: add new parameter ns_targets") Signed-off-by: Ricardo B. Marli=C3=A8re --- drivers/net/bonding/bond_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_mai= n.c index 14ed91391fcc..7d32cd231633 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3256,6 +3256,9 @@ static int bond_confirm_addr6(struct net_device *dev, { struct in6_addr *addr =3D (struct in6_addr *)priv->data; =20 + if (unlikely(!ipv6_mod_enabled())) + return 0; + return ipv6_chk_addr(dev_net(dev), addr, dev, 0); } =20 --=20 2.53.0