[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1422491816.3621.84.camel@x220>
Date: Thu, 29 Jan 2015 01:36:56 +0100
From: Paul Bolle <pebolle@...cali.nl>
To: Arnd Bergmann <arnd@...db.de>
Cc: Casey Schaufler <casey@...aufler-ca.com>,
linux-security-module@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH] Smack: fix netfilter Makefile entry
On Wed, 2015-01-28 at 17:12 +0100, Arnd Bergmann wrote:
> The newly added Smack support for netfilter secmark has its own
> Kconfig symbol, but the actual implementation is conditionally
> built on another symbol.
>
> It is possible for CONFIG_NETFILTER and SECURITY_SMACK to both
> be enabled, but NETWORK_SECMARK to be disabled, in which case
> we get a build error:
>
> ../security/smack/smack_netfilter.c: In function 'smack_ipv6_output':
> ../security/smack/smack_netfilter.c:36:6: error: 'struct sk_buff' has no member named 'secmark'
> skb->secmark = skp->smk_secid;
> ^
> ../security/smack/smack_netfilter.c: In function 'smack_ipv4_output':
> ../security/smack/smack_netfilter.c:55:6: error: 'struct sk_buff' has no member named 'secmark'
> skb->secmark = skp->smk_secid;
> ^
>
> This changes the Makefile to use the correct Kconfig symbol.
>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> Fixes: 69f287ae6fc83 ("Smack: secmark support for netfilter")
>
> diff --git a/security/smack/Makefile b/security/smack/Makefile
> index 616cf93b368e..d4a376c84050 100644
> --- a/security/smack/Makefile
> +++ b/security/smack/Makefile
> @@ -5,4 +5,4 @@
> obj-$(CONFIG_SECURITY_SMACK) := smack.o
>
> smack-y := smack_lsm.o smack_access.o smackfs.o
> -smack-$(CONFIG_NETFILTER) += smack_netfilter.o
> +smack-$(SECURITY_SMACK_NETFILTER) += smack_netfilter.o
You probably wanted to use:
CONFIG_SECURITY_SMACK_NETFILTER
Paul Bolle
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists