diff options
author | Florian Westphal <fw@strlen.de> | 2015-10-13 08:33:26 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-16 12:21:39 -0400 |
commit | 2ffbceb2b08f8ca0496c54a9ebcd11d25275954e (patch) | |
tree | f4da28636d8583f4817b4e374c8e78eba2b822b5 /security/smack | |
parent | 8cbc870829ecd8f1062f2a756683c80e2d1eae7f (diff) |
netfilter: remove hook owner refcounting
since commit 8405a8fff3f8 ("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: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'security/smack')
-rw-r--r-- | security/smack/smack_netfilter.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/smack/smack_netfilter.c b/security/smack/smack_netfilter.c index a9e41da05d28..6d1706c9777e 100644 --- a/security/smack/smack_netfilter.c +++ b/security/smack/smack_netfilter.c | |||
@@ -57,7 +57,6 @@ static unsigned int smack_ipv4_output(void *priv, | |||
57 | static struct nf_hook_ops smack_nf_ops[] = { | 57 | static struct nf_hook_ops smack_nf_ops[] = { |
58 | { | 58 | { |
59 | .hook = smack_ipv4_output, | 59 | .hook = smack_ipv4_output, |
60 | .owner = THIS_MODULE, | ||
61 | .pf = NFPROTO_IPV4, | 60 | .pf = NFPROTO_IPV4, |
62 | .hooknum = NF_INET_LOCAL_OUT, | 61 | .hooknum = NF_INET_LOCAL_OUT, |
63 | .priority = NF_IP_PRI_SELINUX_FIRST, | 62 | .priority = NF_IP_PRI_SELINUX_FIRST, |
@@ -65,7 +64,6 @@ static struct nf_hook_ops smack_nf_ops[] = { | |||
65 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 64 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
66 | { | 65 | { |
67 | .hook = smack_ipv6_output, | 66 | .hook = smack_ipv6_output, |
68 | .owner = THIS_MODULE, | ||
69 | .pf = NFPROTO_IPV6, | 67 | .pf = NFPROTO_IPV6, |
70 | .hooknum = NF_INET_LOCAL_OUT, | 68 | .hooknum = NF_INET_LOCAL_OUT, |
71 | .priority = NF_IP6_PRI_SELINUX_FIRST, | 69 | .priority = NF_IP6_PRI_SELINUX_FIRST, |