Commit a224be76 authored by David S. Miller's avatar David S. Miller

[SELINUX]: Update for netfilter ->hook() arg changes.

They take a "struct sk_buff *" instead of a "struct sk_buff **" now.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 762cc408
...@@ -3932,7 +3932,7 @@ static int selinux_ip_postroute_last_compat(struct sock *sk, struct net_device * ...@@ -3932,7 +3932,7 @@ static int selinux_ip_postroute_last_compat(struct sock *sk, struct net_device *
} }
static unsigned int selinux_ip_postroute_last(unsigned int hooknum, static unsigned int selinux_ip_postroute_last(unsigned int hooknum,
struct sk_buff **pskb, struct sk_buff *skb,
const struct net_device *in, const struct net_device *in,
const struct net_device *out, const struct net_device *out,
int (*okfn)(struct sk_buff *), int (*okfn)(struct sk_buff *),
...@@ -3941,7 +3941,6 @@ static unsigned int selinux_ip_postroute_last(unsigned int hooknum, ...@@ -3941,7 +3941,6 @@ static unsigned int selinux_ip_postroute_last(unsigned int hooknum,
char *addrp; char *addrp;
int len, err = 0; int len, err = 0;
struct sock *sk; struct sock *sk;
struct sk_buff *skb = *pskb;
struct avc_audit_data ad; struct avc_audit_data ad;
struct net_device *dev = (struct net_device *)out; struct net_device *dev = (struct net_device *)out;
struct sk_security_struct *sksec; struct sk_security_struct *sksec;
...@@ -3977,23 +3976,23 @@ static unsigned int selinux_ip_postroute_last(unsigned int hooknum, ...@@ -3977,23 +3976,23 @@ static unsigned int selinux_ip_postroute_last(unsigned int hooknum,
} }
static unsigned int selinux_ipv4_postroute_last(unsigned int hooknum, static unsigned int selinux_ipv4_postroute_last(unsigned int hooknum,
struct sk_buff **pskb, struct sk_buff *skb,
const struct net_device *in, const struct net_device *in,
const struct net_device *out, const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
return selinux_ip_postroute_last(hooknum, pskb, in, out, okfn, PF_INET); return selinux_ip_postroute_last(hooknum, skb, in, out, okfn, PF_INET);
} }
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
static unsigned int selinux_ipv6_postroute_last(unsigned int hooknum, static unsigned int selinux_ipv6_postroute_last(unsigned int hooknum,
struct sk_buff **pskb, struct sk_buff *skb,
const struct net_device *in, const struct net_device *in,
const struct net_device *out, const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
return selinux_ip_postroute_last(hooknum, pskb, in, out, okfn, PF_INET6); return selinux_ip_postroute_last(hooknum, skb, in, out, okfn, PF_INET6);
} }
#endif /* IPV6 */ #endif /* IPV6 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment