Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbc3617f authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nfnetlink: don't probe module if it exists 



nfnetlink_bind request_module()s all the time as nfnetlink_get_subsys()
shifts the argument by 8 to obtain the subsys id.

So using type instead of type << 8 always returns NULL.

Fixes: 03292745 ("netlink: add nlk->netlink_bind hook for module auto-loading")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 94f9cd81

net/netfilter/nfnetlink.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int nfnetlink_bind(struct net *net, int group) 
	type = nfnl_group2type[group];



	rcu_read_lock();

	ss = nfnetlink_get_subsys(type);

	ss = nfnetlink_get_subsys(type << 8);

	rcu_read_unlock();

	if (!ss)

		request_module("nfnetlink-subsys-%d", type);