From: James Morris <jmorris@namei.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Stephen Smalley <sds@tycho.nsa.gov>
Subject: Re: [PATCH]: SELINUX fixup for netfilter hook changes
Date: Tue, 16 Oct 2007 00:20:29 +1000 (EST) [thread overview]
Message-ID: <Xine.LNX.4.64.0710160020130.21052@us.intercode.com.au> (raw)
In-Reply-To: <20071015.025909.77039408.davem@davemloft.net>
On Mon, 15 Oct 2007, David Miller wrote:
>
> I just noticed a warning for this in my allmodconfig build,
> so I checked in the obvious fix.
Thanks.
>
> commit d0a23b19f552c4fd0126d903078ea5ceca968617
> Author: David S. Miller <davem@sunset.davemloft.net>
> Date: Mon Oct 15 02:58:25 2007 -0700
>
> [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>
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 3c3fff3..cf76150 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -3932,7 +3932,7 @@ out:
> }
>
> 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 *out,
> int (*okfn)(struct sk_buff *),
> @@ -3941,7 +3941,6 @@ static unsigned int selinux_ip_postroute_last(unsigned int hooknum,
> char *addrp;
> int len, err = 0;
> struct sock *sk;
> - struct sk_buff *skb = *pskb;
> struct avc_audit_data ad;
> struct net_device *dev = (struct net_device *)out;
> struct sk_security_struct *sksec;
> @@ -3977,23 +3976,23 @@ out:
> }
>
> 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 *out,
> 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)
>
> 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 *out,
> 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 */
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
James Morris
<jmorris@namei.org>
prev parent reply other threads:[~2007-10-15 14:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-15 9:59 [PATCH]: SELINUX fixup for netfilter hook changes David Miller
2007-10-15 14:20 ` James Morris [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Xine.LNX.4.64.0710160020130.21052@us.intercode.com.au \
--to=jmorris@namei.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sds@tycho.nsa.gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).