[PATCH net v4 0/4] {net,bpf}: nd_tbl fixes for when ipv6.disable=1

From: Ricardo B. Marlière

Date: Sat Mar 07 2026 - 15:51:38 EST


Hi,

Please consider merging these four patches to fix three crashes that were
found after this report:

https://lore.kernel.org/all/CAHXs0ORzd62QOG-Fttqa2Cx_A_VFp=utE2H2VTX5nqfgs7LDxQ@xxxxxxxxxxxxxx

The first patch from Jakub Kicinski is a preparation in order to enable
the use ipv6_mod_enabled() even when CONFIG_IPV6=n.

Thank you,
- Ricardo.

Signed-off-by: Ricardo B. Marlière <rbm@xxxxxxxx>
---
Changes in v4:
- Use preparatory patch from Jakub (thx!)
- Use ipv6_mod_enabled() helper in all three patches
- bonding: Move check to an earlier point - bond_rcv_validate() instead of bond_na_rcv()
- Link to v3: https://lore.kernel.org/r/20260305-net-nd_tbl_fixes-v3-0-fde28b30a744@xxxxxxxx

Changes in v3:
- Don't use ipv6_mod_enabled() in net/core/filter.c.
- Link to v2: https://lore.kernel.org/r/20260305-net-nd_tbl_fixes-v2-0-b7177db1a9f3@xxxxxxxx

Changes in v2:
- Used ipv6_mod_enabled() helper, guarded by unlikely().
- Link to v1: https://lore.kernel.org/r/20260228-net-nd_tbl_fixes-v1-0-2b2a274df9bb@xxxxxxxx

---
Jakub Kicinski (1):
ipv6: move the disable_ipv6_mod knob to core code

Ricardo B. Marlière (3):
net: bonding: Fix nd_tbl NULL dereference when IPv6 is disabled
bpf: bpf_out_neigh_v4: Fix nd_tbl NULL dereference when IPv6 is disabled
bpf: bpf_out_neigh_v6: Fix nd_tbl NULL dereference when IPv6 is disabled

drivers/net/bonding/bond_main.c | 2 +-
include/linux/ipv6.h | 7 ++++++-
net/core/filter.c | 7 +++++++
net/ipv4/af_inet.c | 6 ++++++
net/ipv6/af_inet6.c | 8 --------
5 files changed, 20 insertions(+), 10 deletions(-)
---
base-commit: b824c3e16c1904bf80df489e293d1e3cbf98896d
change-id: 20260228-net-nd_tbl_fixes-ce81ca1e0bf2

Best regards,
--
Ricardo B. Marlière <rbm@xxxxxxxx>