From nobody Thu Apr 9 21:52:50 2026 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.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 75E0D2FD1D0 for ; Fri, 6 Mar 2026 00:51:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772758288; cv=none; b=u0yeOGIpi4nnhk8x5PNEolBd/BgUZMEwOSQcO4/zIWdPOCAzB8sKxC9HxAJiziUPiOpbhF4LcyJAQgMotB9WIh0xRcFvIWunS+KaIUQp3Z1R/WdBTNZIq9t1ALgBduGFHYHWJqUKU2sP2zXwxdgjOmCHIJbvldjE05sbN0SfrY0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772758288; c=relaxed/simple; bh=uY/cmt2Sth4SxjohY5zGzx4ELvftPGuex3rlN1K/nqM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=arKIQscU+wgApotWiWdm0Nl5Go53uJ18o15Y7aCdUSHDi+cq+Br9Uc5D/uYDMTYcUeW73xtoT4oFhod/VAD3vBCeMSmI2S4hEdtRC9u//L24c07wzfuax3U8dgKBFu7CcrQg6yl6txnMJs+CAmg9CJwEueGdKwWU9LlwWdLX+gY= 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=U7IjsFI6; arc=none smtp.client-ip=209.85.221.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="U7IjsFI6" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-439d8df7620so120752f8f.0 for ; Thu, 05 Mar 2026 16:51:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772758282; x=1773363082; 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=Cj+T9d3Zgf3+ritNDiK94fhxI8rgFwWgGmiNKUx6cEs=; b=U7IjsFI6ZVhXKXQSlulUJAniGOY6cfVExehoDjuQI5Yc/glgmnzQRFqgGA81U9jmFr I4L8908AT0JDZckZDWklLZgH7mhn0OZjQiSkar0FqeA1h4sH5yrX1jy3tYgP5MJyT+XP KILxkoy/qcQUkxAV5JI/wmyTui/8HUAbHap7Zvv3cNmm0OXoreWRZOGZG1SLC/xhY4Cv h6n/HenZeto74K4ui47fN+pnU/v8MAjBNt2hrN69G2NbIcJVuYRefQoJwh9LglkOdble x28WyLjmIt3AMKRzL9jjmP9CqAMW13b5dXiMm7iR9MAbCZkMxydBtXPg7dpDMJKBvBiL OmSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772758282; x=1773363082; 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=Cj+T9d3Zgf3+ritNDiK94fhxI8rgFwWgGmiNKUx6cEs=; b=hHovcxqzATH0MNZoXWy/2vGUo2IjTGLK00tD2jijfyZzRbeckICzzcOmXG8rE1TsbL 7NOjmZVteTiXuZVHxjVsvCraSAhGJiosXNwh6o8mOqcRbTBBSF9MBMbUKhqzpNvciKUC 4jiocmEmiiIKmOQT0ypFi+3uNw6J/R20eqtmnDOBghgT3Yw+CA1KrT31P0mezERFYjp8 nfbktQpsM92v7Z802CMxDXMQY5q8tPLmCDLnCiQqGzzqMOn0cG3C0fteN489xf8GRrBo Bf380RJPmUiR+P3RwP6bMtZE9mcQX8frabbK8fKcARPGQwI5XmvHtiBkJ9n2jZqQ/g9P UHvA== X-Forwarded-Encrypted: i=1; AJvYcCVuJU7XNG0K8+4Q8p0yfZZ+zYEn+QD8tYHHy5xTfdvogvPvVl9N+c8z4Y5JXyiHH6Rvngzj76logY6gzps=@vger.kernel.org X-Gm-Message-State: AOJu0YzScaqGA0pUqc+HxveZPIvd8PEfWqQUlMf6PqNpEUoZbypHTnGT J5cAjpBw8nvQSmGmOFBwd0UgdDyrV2i7tjiLEJD+HTJGoZfkbOUXzceXFdg0wg9PoOc= X-Gm-Gg: ATEYQzwgwUV3QcZVbVBsLiWAD4gCZATpvrBqty2azqgF0o4U7jmXTi0KehTzAgMv1BN Ocx59cxEcijXLpZMZ+O4ZpOsxyJ0Yf/oLFbpBX3Vwmgg7M4ruhRob28XVlFovky2npDWzGe8+jp Riv3kU0Iw5xCuxgvq10J7xAJeUU6TGBS2L1og+MCI5ax0cYyZECcuZ6XBgL6bN2g/PtwPbKY8Y7 y0PgXusp7GzudiufAmU2qQ/5B/rKg9qOedhBmdNi3Btzi9lgiJ2VvqFIAhb/ECpvSnTwCp1jalx RRqQOiIwqFg64qnQ2oZASG9JyWTlaqcttA+o0BzkUDpGQcPERbyn9VI41tE0FRhB9mAQZl2bzzs 91LJICveSCkpPUawGlHdc4pS02vaVq5aqQiLDdANphCp8Ut+Ab4lqNy0d8cg0fO+5HtIGvjF5tu xaLa7G/nqebA== X-Received: by 2002:a05:600c:8115:b0:480:52fd:d2e4 with SMTP id 5b1f17b1804b1-485268bcfb4mr4040065e9.0.1772758281849; Thu, 05 Mar 2026 16:51:21 -0800 (PST) Received: from localhost ([189.99.238.164]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-56b0865825asm51909e0c.9.2026.03.05.16.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 16:51:21 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Thu, 05 Mar 2026 18:29:56 -0300 Subject: [PATCH net v3 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-v3-2-fde28b30a744@suse.com> References: <20260305-net-nd_tbl_fixes-v3-0-fde28b30a744@suse.com> In-Reply-To: <20260305-net-nd_tbl_fixes-v3-0-fde28b30a744@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=1772758271; l=1999; i=rbm@suse.com; h=from:subject:message-id; bh=uY/cmt2Sth4SxjohY5zGzx4ELvftPGuex3rlN1K/nqM=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QF1Q1aDL07UnscOXXDba/eBfS/TWj0GNuavW/i1D9zrky1fKqHpr6myU7MaBBl1bEnmCjHaihP4 uj5GNpCcc8QA= 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 4f8ff05c4ec4..3be669347e62 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_stub->nd_tbl)) + goto out_drop; + rcu_read_lock(); if (!nh) { dst =3D skb_dst(skb); --=20 2.53.0