From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] Smack: fix netfilter Makefile entry
Date: Wed, 28 Jan 2015 17:12 +0100 [thread overview]
Message-ID: <2504358.ZeqdfUXKpJ@wuerfel> (raw)
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")
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
next reply other threads:[~2015-01-28 16:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 16:12 Arnd Bergmann [this message]
2015-01-28 16:27 ` [PATCH] Smack: fix netfilter Makefile entry Casey Schaufler
2015-01-28 16:29 ` Arnd Bergmann
2015-01-28 18:18 ` Sergei Shtylyov
2015-01-28 19:23 ` Arnd Bergmann
2015-01-29 0:36 ` Paul Bolle
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=2504358.ZeqdfUXKpJ@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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).