diff options
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 5b5231068516..c540795fb3f2 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -3928,7 +3928,7 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in | |||
| 3928 | if (snum) { | 3928 | if (snum) { |
| 3929 | int low, high; | 3929 | int low, high; |
| 3930 | 3930 | ||
| 3931 | inet_get_local_port_range(&low, &high); | 3931 | inet_get_local_port_range(sock_net(sk), &low, &high); |
| 3932 | 3932 | ||
| 3933 | if (snum < max(PROT_SOCK, low) || snum > high) { | 3933 | if (snum < max(PROT_SOCK, low) || snum > high) { |
| 3934 | err = sel_netport_sid(sk->sk_protocol, | 3934 | err = sel_netport_sid(sk->sk_protocol, |
| @@ -4667,7 +4667,7 @@ static unsigned int selinux_ip_forward(struct sk_buff *skb, int ifindex, | |||
| 4667 | return NF_ACCEPT; | 4667 | return NF_ACCEPT; |
| 4668 | } | 4668 | } |
| 4669 | 4669 | ||
| 4670 | static unsigned int selinux_ipv4_forward(unsigned int hooknum, | 4670 | static unsigned int selinux_ipv4_forward(const struct nf_hook_ops *ops, |
| 4671 | struct sk_buff *skb, | 4671 | struct sk_buff *skb, |
| 4672 | const struct net_device *in, | 4672 | const struct net_device *in, |
| 4673 | const struct net_device *out, | 4673 | const struct net_device *out, |
| @@ -4677,7 +4677,7 @@ static unsigned int selinux_ipv4_forward(unsigned int hooknum, | |||
| 4677 | } | 4677 | } |
| 4678 | 4678 | ||
| 4679 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 4679 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| 4680 | static unsigned int selinux_ipv6_forward(unsigned int hooknum, | 4680 | static unsigned int selinux_ipv6_forward(const struct nf_hook_ops *ops, |
| 4681 | struct sk_buff *skb, | 4681 | struct sk_buff *skb, |
| 4682 | const struct net_device *in, | 4682 | const struct net_device *in, |
| 4683 | const struct net_device *out, | 4683 | const struct net_device *out, |
| @@ -4709,7 +4709,7 @@ static unsigned int selinux_ip_output(struct sk_buff *skb, | |||
| 4709 | return NF_ACCEPT; | 4709 | return NF_ACCEPT; |
| 4710 | } | 4710 | } |
| 4711 | 4711 | ||
| 4712 | static unsigned int selinux_ipv4_output(unsigned int hooknum, | 4712 | static unsigned int selinux_ipv4_output(const struct nf_hook_ops *ops, |
| 4713 | struct sk_buff *skb, | 4713 | struct sk_buff *skb, |
| 4714 | const struct net_device *in, | 4714 | const struct net_device *in, |
| 4715 | const struct net_device *out, | 4715 | const struct net_device *out, |
| @@ -4836,7 +4836,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex, | |||
| 4836 | return NF_ACCEPT; | 4836 | return NF_ACCEPT; |
| 4837 | } | 4837 | } |
| 4838 | 4838 | ||
| 4839 | static unsigned int selinux_ipv4_postroute(unsigned int hooknum, | 4839 | static unsigned int selinux_ipv4_postroute(const struct nf_hook_ops *ops, |
| 4840 | struct sk_buff *skb, | 4840 | struct sk_buff *skb, |
| 4841 | const struct net_device *in, | 4841 | const struct net_device *in, |
| 4842 | const struct net_device *out, | 4842 | const struct net_device *out, |
| @@ -4846,7 +4846,7 @@ static unsigned int selinux_ipv4_postroute(unsigned int hooknum, | |||
| 4846 | } | 4846 | } |
| 4847 | 4847 | ||
| 4848 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 4848 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
| 4849 | static unsigned int selinux_ipv6_postroute(unsigned int hooknum, | 4849 | static unsigned int selinux_ipv6_postroute(const struct nf_hook_ops *ops, |
| 4850 | struct sk_buff *skb, | 4850 | struct sk_buff *skb, |
| 4851 | const struct net_device *in, | 4851 | const struct net_device *in, |
| 4852 | const struct net_device *out, | 4852 | const struct net_device *out, |