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

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

netfilter: nfnetlink_log: autoload nf_conntrack_netlink module NFQA_CFG_F_CONNTRACK config flag 



This patch enables to load nf_conntrack_netlink module if
NFULNL_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 c9322458

net/netfilter/nfnetlink_log.c

+10 −1
Original line number Diff line number Diff line
@@ -927,7 +927,16 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, 
		}



		if (flags & NFULNL_CFG_F_CONNTRACK &&

		    rcu_access_pointer(nfnl_ct_hook) == NULL) {

		    !rcu_access_pointer(nfnl_ct_hook)) {

#ifdef CONFIG_MODULES

			nfnl_unlock(NFNL_SUBSYS_ULOG);

			request_module("ip_conntrack_netlink");

			nfnl_lock(NFNL_SUBSYS_ULOG);

			if (rcu_access_pointer(nfnl_ct_hook)) {

				ret = -EAGAIN;

				goto out;

			}

#endif

			ret = -EOPNOTSUPP;

			goto out;

		}