Commit 20c1be4c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-bpf-nd_tbl-fixes-for-when-ipv6-disable-1' 

Ricardo B. Marlière says:

====================
{net,bpf}: nd_tbl fixes for when ipv6.disable=1

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@mail.gmail.com

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

Link: https://patch.msgid.link/20260307-net-nd_tbl_fixes-v4-0-e2677e85628c@suse.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 908c344d d56b5d16

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3428,7 +3428,7 @@ int bond_rcv_validate(const struct sk_buff *skb, struct bonding *bond, 
	} else if (is_arp) {

		return bond_arp_rcv(skb, bond, slave);

#if IS_ENABLED(CONFIG_IPV6)

	} else if (is_ipv6) {

	} else if (is_ipv6 && likely(ipv6_mod_enabled())) {

		return bond_na_rcv(skb, bond, slave);

#endif

	} else {

include/linux/ipv6.h

+6 −1
Original line number Diff line number Diff line
@@ -333,7 +333,12 @@ struct tcp6_timewait_sock { 
};



#if IS_ENABLED(CONFIG_IPV6)

bool ipv6_mod_enabled(void);

extern int disable_ipv6_mod;



static inline bool ipv6_mod_enabled(void)

{

	return disable_ipv6_mod == 0;

}



static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk)

{

net/core/filter.c

+7 −0
Original line number Diff line number Diff line
@@ -2228,6 +2228,9 @@ static int bpf_out_neigh_v6(struct net *net, struct sk_buff *skb, 
			return -ENOMEM;

	}



	if (unlikely(!ipv6_mod_enabled()))

		goto out_drop;



	rcu_read_lock();

	if (!nh) {

		dst = skb_dst(skb);
@@ -2335,6 +2338,10 @@ static int bpf_out_neigh_v4(struct net *net, struct sk_buff *skb, 


		neigh = ip_neigh_for_gw(rt, skb, &is_v6gw);

	} else if (nh->nh_family == AF_INET6) {

		if (unlikely(!ipv6_mod_enabled())) {

			rcu_read_unlock();

			goto out_drop;

		}

		neigh = ip_neigh_gw6(dev, &nh->ipv6_nh);

		is_v6gw = true;

	} else if (nh->nh_family == AF_INET) {

net/ipv4/af_inet.c

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,12 @@ 


#include <trace/events/sock.h>



/* Keep the definition of IPv6 disable here for now, to avoid annoying linker

 * issues in case IPv6=m

 */

int disable_ipv6_mod;

EXPORT_SYMBOL(disable_ipv6_mod);



/* The inetsw table contains everything that inet_create needs to

 * build a new socket.

 */

net/ipv6/af_inet6.c

+0 −8
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ struct ipv6_params ipv6_defaults = { 
	.autoconf = 1,

};



static int disable_ipv6_mod;



module_param_named(disable, disable_ipv6_mod, int, 0444);

MODULE_PARM_DESC(disable, "Disable IPv6 module such that it is non-functional");
@@ -97,12 +95,6 @@ MODULE_PARM_DESC(disable_ipv6, "Disable IPv6 on all interfaces"); 
module_param_named(autoconf, ipv6_defaults.autoconf, int, 0444);

MODULE_PARM_DESC(autoconf, "Enable IPv6 address autoconfiguration on all interfaces");



bool ipv6_mod_enabled(void)

{

	return disable_ipv6_mod == 0;

}

EXPORT_SYMBOL_GPL(ipv6_mod_enabled);



static struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)

{

	const int offset = sk->sk_prot->ipv6_pinfo_offset;