[PATCH] Smack: fix netfilter Makefile entry
From: casey@schaufler-ca.com (Casey Schaufler)
Date: 2015-01-28 20:27:26
Also in:
lkml
On 1/28/2015 8:12 AM, 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.
A patch for this problem, 82b0b2c2b1e64ad6c5309a9eeba806af9812666b is already available in: git://git.gitorious.org/smack-next/kernel.git smack-for-3.20-rebased A pull request has sent to James Morris for inclusion in the security tree.
quoted hunk ↗ jump to hunk
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@arndb.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