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

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

netfilter: remove hook owner refcounting 



since commit 8405a8ff ("netfilter: nf_qeueue: Drop queue entries on
nf_unregister_hook") all pending queued entries are discarded.

So we can simply remove all of the owner handling -- when module is
removed it also needs to unregister all its hooks.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8cbc8708

include/linux/netfilter.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct nf_hook_ops { 
	/* User fills in from here down. */

	nf_hookfn		*hook;

	struct net_device	*dev;

	struct module		*owner;

	void			*priv;

	u_int8_t		pf;

	unsigned int		hooknum;

net/bridge/br_netfilter_hooks.c

+0 −7
Original line number Diff line number Diff line
@@ -901,49 +901,42 @@ EXPORT_SYMBOL_GPL(br_netfilter_enable); 
static struct nf_hook_ops br_nf_ops[] __read_mostly = {

	{

		.hook = br_nf_pre_routing,

		.owner = THIS_MODULE,

		.pf = NFPROTO_BRIDGE,

		.hooknum = NF_BR_PRE_ROUTING,

		.priority = NF_BR_PRI_BRNF,

	},

	{

		.hook = br_nf_local_in,

		.owner = THIS_MODULE,

		.pf = NFPROTO_BRIDGE,

		.hooknum = NF_BR_LOCAL_IN,

		.priority = NF_BR_PRI_BRNF,

	},

	{

		.hook = br_nf_forward_ip,

		.owner = THIS_MODULE,

		.pf = NFPROTO_BRIDGE,

		.hooknum = NF_BR_FORWARD,

		.priority = NF_BR_PRI_BRNF - 1,

	},

	{

		.hook = br_nf_forward_arp,

		.owner = THIS_MODULE,

		.pf = NFPROTO_BRIDGE,

		.hooknum = NF_BR_FORWARD,

		.priority = NF_BR_PRI_BRNF,

	},

	{

		.hook = br_nf_post_routing,

		.owner = THIS_MODULE,

		.pf = NFPROTO_BRIDGE,

		.hooknum = NF_BR_POST_ROUTING,

		.priority = NF_BR_PRI_LAST,

	},

	{

		.hook = ip_sabotage_in,

		.owner = THIS_MODULE,

		.pf = NFPROTO_IPV4,

		.hooknum = NF_INET_PRE_ROUTING,

		.priority = NF_IP_PRI_FIRST,

	},

	{

		.hook = ip_sabotage_in,

		.owner = THIS_MODULE,

		.pf = NFPROTO_IPV6,

		.hooknum = NF_INET_PRE_ROUTING,

		.priority = NF_IP6_PRI_FIRST,

net/bridge/netfilter/ebtable_filter.c

+0 −3
Original line number Diff line number Diff line
@@ -73,21 +73,18 @@ ebt_out_hook(void *priv, struct sk_buff *skb, 
static struct nf_hook_ops ebt_ops_filter[] __read_mostly = {

	{

		.hook		= ebt_in_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_LOCAL_IN,

		.priority	= NF_BR_PRI_FILTER_BRIDGED,

	},

	{

		.hook		= ebt_in_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_FORWARD,

		.priority	= NF_BR_PRI_FILTER_BRIDGED,

	},

	{

		.hook		= ebt_out_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_LOCAL_OUT,

		.priority	= NF_BR_PRI_FILTER_OTHER,

net/bridge/netfilter/ebtable_nat.c

+0 −3
Original line number Diff line number Diff line
@@ -73,21 +73,18 @@ ebt_nat_out(void *priv, struct sk_buff *skb, 
static struct nf_hook_ops ebt_ops_nat[] __read_mostly = {

	{

		.hook		= ebt_nat_out,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_LOCAL_OUT,

		.priority	= NF_BR_PRI_NAT_DST_OTHER,

	},

	{

		.hook		= ebt_nat_out,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_POST_ROUTING,

		.priority	= NF_BR_PRI_NAT_SRC,

	},

	{

		.hook		= ebt_nat_in,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_BRIDGE,

		.hooknum	= NF_BR_PRE_ROUTING,

		.priority	= NF_BR_PRI_NAT_DST_BRIDGED,

net/ipv4/netfilter/ipt_SYNPROXY.c

+0 −2
Original line number Diff line number Diff line
@@ -437,14 +437,12 @@ static struct xt_target synproxy_tg4_reg __read_mostly = { 
static struct nf_hook_ops ipv4_synproxy_ops[] __read_mostly = {

	{

		.hook		= ipv4_synproxy_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM - 1,

	},

	{

		.hook		= ipv4_synproxy_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_POST_ROUTING,

		.priority	= NF_IP_PRI_CONNTRACK_CONFIRM - 1,