diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-10-10 03:21:55 -0400 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-10-14 05:29:31 -0400 |
| commit | 795aa6ef6a1aba99050735eadd0c2341b789b53b (patch) | |
| tree | ba3b0ee0dadcb55962b596342d5897b02db1d234 /security/selinux/hooks.c | |
| parent | ccdbb6e96beca362db876d820ac1e560ff6d9579 (diff) | |
netfilter: pass hook ops to hookfn
Pass the hook ops to the hookfn to allow for generic hook
functions. This change is required by nf_tables.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 568c7699abf1..3f224d7795f5 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -4668,7 +4668,7 @@ static unsigned int selinux_ip_forward(struct sk_buff *skb, int ifindex, | |||
| 4668 | return NF_ACCEPT; | 4668 | return NF_ACCEPT; |
| 4669 | } | 4669 | } |
| 4670 | 4670 | ||
| 4671 | static unsigned int selinux_ipv4_forward(unsigned int hooknum, | 4671 | static unsigned int selinux_ipv4_forward(const struct nf_hook_ops *ops, |
| 4672 | struct sk_buff *skb, | 4672 | struct sk_buff *skb, |
| 4673 | const struct net_device *in, | 4673 | const struct net_device *in, |
| 4674 | const struct net_device *out, | 4674 | const struct net_device *out, |
| @@ -4678,7 +4678,7 @@ static unsigned int selinux_ipv4_forward(unsigned int hooknum, | |||
| 4678 | } | 4678 | } |
| 4679 | 4679 | ||
| 4680 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 4680 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| 4681 | static unsigned int selinux_ipv6_forward(unsigned int hooknum, | 4681 | static unsigned int selinux_ipv6_forward(const struct nf_hook_ops *ops, |
| 4682 | struct sk_buff *skb, | 4682 | struct sk_buff *skb, |
| 4683 | const struct net_device *in, | 4683 | const struct net_device *in, |
| 4684 | const struct net_device *out, | 4684 | const struct net_device *out, |
| @@ -4710,7 +4710,7 @@ static unsigned int selinux_ip_output(struct sk_buff *skb, | |||
| 4710 | return NF_ACCEPT; | 4710 | return NF_ACCEPT; |
| 4711 | } | 4711 | } |
| 4712 | 4712 | ||
| 4713 | static unsigned int selinux_ipv4_output(unsigned int hooknum, | 4713 | static unsigned int selinux_ipv4_output(const struct nf_hook_ops *ops, |
| 4714 | struct sk_buff *skb, | 4714 | struct sk_buff *skb, |
| 4715 | const struct net_device *in, | 4715 | const struct net_device *in, |
| 4716 | const struct net_device *out, | 4716 | const struct net_device *out, |
| @@ -4837,7 +4837,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex, | |||
| 4837 | return NF_ACCEPT; | 4837 | return NF_ACCEPT; |
| 4838 | } | 4838 | } |
| 4839 | 4839 | ||
| 4840 | static unsigned int selinux_ipv4_postroute(unsigned int hooknum, | 4840 | static unsigned int selinux_ipv4_postroute(const struct nf_hook_ops *ops, |
| 4841 | struct sk_buff *skb, | 4841 | struct sk_buff *skb, |
| 4842 | const struct net_device *in, | 4842 | const struct net_device *in, |
| 4843 | const struct net_device *out, | 4843 | const struct net_device *out, |
| @@ -4847,7 +4847,7 @@ static unsigned int selinux_ipv4_postroute(unsigned int hooknum, | |||
| 4847 | } | 4847 | } |
| 4848 | 4848 | ||
| 4849 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 4849 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| 4850 | static unsigned int selinux_ipv6_postroute(unsigned int hooknum, | 4850 | static unsigned int selinux_ipv6_postroute(const struct nf_hook_ops *ops, |
| 4851 | struct sk_buff *skb, | 4851 | struct sk_buff *skb, |
| 4852 | const struct net_device *in, | 4852 | const struct net_device *in, |
| 4853 | const struct net_device *out, | 4853 | const struct net_device *out, |