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

Commit 71b2e5f5 authored by Ken-ichirou MATSUZAWA's avatar Ken-ichirou MATSUZAWA Committed by Pablo Neira Ayuso
Browse files

netfilter: nfnetlink_queue: autoload nf_conntrack_netlink module NFQA_CFG_F_CONNTRACK config flag 



This patch enables to load nf_conntrack_netlink module if
NFQA_CFG_F_CONNTRACK config flag is specified.

Signed-off-by: default avatarKen-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 21c3c971

net/netfilter/nfnetlink_queue.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -1147,6 +1147,17 @@ static int nfqnl_recv_config(struct net *net, struct sock *ctnl, 
		if (flags & mask & NFQA_CFG_F_SECCTX)

		if (flags & mask & NFQA_CFG_F_SECCTX)

			return -EOPNOTSUPP;

			return -EOPNOTSUPP;

#endif

#endif

		if ((flags & mask & NFQA_CFG_F_CONNTRACK) &&

		    !rcu_access_pointer(nfnl_ct_hook)) {

#ifdef CONFIG_MODULES

			nfnl_unlock(NFNL_SUBSYS_QUEUE);

			request_module("ip_conntrack_netlink");

			nfnl_lock(NFNL_SUBSYS_QUEUE);

			if (rcu_access_pointer(nfnl_ct_hook))

				return -EAGAIN;

#endif

			return -EOPNOTSUPP;

		}

	}

	}





	rcu_read_lock();

	rcu_read_lock();