[PATCH] Smack: fix netfilter Makefile entry
From: Sergei Shtylyov <hidden>
Date: 2015-01-28 20:59:33
Also in:
lkml
Hello. On 01/28/2015 07:12 PM, 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@arndb.de>
Fixes: 69f287ae6fc83 ("Smack: secmark support for netfilter")quoted hunk ↗ jump to hunk
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
CONFIG_ missing?
WBR, Sergei