aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-10-15 05:58:25 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-15 15:26:44 -0400
commita224be766bf593f7bcd534ca0c48dbd3eaf7bfce (patch)
treeb0a053b35fe654fb35199c1b5326a4d3932f79da /security/selinux
parent762cc40801ad757a34527d5e548816cf3b6fc606 (diff)
[SELINUX]: Update for netfilter ->hook() arg changes.
They take a "struct sk_buff *" instead of a "struct sk_buff **" now. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/hooks.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 3c3fff33d1ce..cf76150e623e 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3932,7 +3932,7 @@ out:
3932} 3932}
3933 3933
3934static unsigned int selinux_ip_postroute_last(unsigned int hooknum, 3934static unsigned int selinux_ip_postroute_last(unsigned int hooknum,
3935 struct sk_buff **pskb, 3935 struct sk_buff *skb,
3936 const struct net_device *in, 3936 const struct net_device *in,
3937 const struct net_device *out, 3937 const struct net_device *out,
3938 int (*okfn)(struct sk_buff *), 3938 int (*okfn)(struct sk_buff *),
@@ -3941,7 +3941,6 @@ static unsigned int selinux_ip_postroute_last(unsigned int hooknum,
3941 char *addrp; 3941 char *addrp;
3942 int len, err = 0; 3942 int len, err = 0;
3943 struct sock *sk; 3943 struct sock *sk;
3944 struct sk_buff *skb = *pskb;
3945 struct avc_audit_data ad; 3944 struct avc_audit_data ad;
3946 struct net_device *dev = (struct net_device *)out; 3945 struct net_device *dev = (struct net_device *)out;
3947 struct sk_security_struct *sksec; 3946 struct sk_security_struct *sksec;
@@ -3977,23 +3976,23 @@ out:
3977} 3976}
3978 3977
3979static unsigned int selinux_ipv4_postroute_last(unsigned int hooknum, 3978static unsigned int selinux_ipv4_postroute_last(unsigned int hooknum,
3980 struct sk_buff **pskb, 3979 struct sk_buff *skb,
3981 const struct net_device *in, 3980 const struct net_device *in,
3982 const struct net_device *out, 3981 const struct net_device *out,
3983 int (*okfn)(struct sk_buff *)) 3982 int (*okfn)(struct sk_buff *))
3984{ 3983{
3985 return selinux_ip_postroute_last(hooknum, pskb, in, out, okfn, PF_INET); 3984 return selinux_ip_postroute_last(hooknum, skb, in, out, okfn, PF_INET);
3986} 3985}
3987 3986
3988#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 3987#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
3989 3988
3990static unsigned int selinux_ipv6_postroute_last(unsigned int hooknum, 3989static unsigned int selinux_ipv6_postroute_last(unsigned int hooknum,
3991 struct sk_buff **pskb, 3990 struct sk_buff *skb,
3992 const struct net_device *in, 3991 const struct net_device *in,
3993 const struct net_device *out, 3992 const struct net_device *out,
3994 int (*okfn)(struct sk_buff *)) 3993 int (*okfn)(struct sk_buff *))
3995{ 3994{
3996 return selinux_ip_postroute_last(hooknum, pskb, in, out, okfn, PF_INET6); 3995 return selinux_ip_postroute_last(hooknum, skb, in, out, okfn, PF_INET6);
3997} 3996}
3998 3997
3999#endif /* IPV6 */ 3998#endif /* IPV6 */