diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-10-05 18:11:47 +0200 |
|---|---|---|
| committer |   John Johansen <john.johansen@canonical.com> | 2018-10-12 17:09:56 -0700 |
| commit | e1af4779617928efa84562de4de5dc071e7deb08 (patch) | |
| tree | b05e03c84febe4c0f0967b6260abb7c06677cc23 /security/apparmor/net.c | |
| parent | apparmor: Fix uninitialized value in aa_split_fqname (diff) | |
| download | linux-dev-e1af4779617928efa84562de4de5dc071e7deb08.tar.xz linux-dev-e1af4779617928efa84562de4de5dc071e7deb08.zip | |
apparmor: add #ifdef checks for secmark filtering
The newly added code fails to build when either SECMARK or
NETFILTER are disabled:
security/apparmor/lsm.c: In function 'apparmor_socket_sock_rcv_skb':
security/apparmor/lsm.c:1138:12: error: 'struct sk_buff' has no member named 'secmark'; did you mean 'mark'?
security/apparmor/lsm.c:1671:21: error: 'struct nf_hook_state' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
Add a set of #ifdef checks around it to only enable the code that
we can compile and that makes sense in that configuration.
Fixes: ab9f2115081a ("apparmor: Allow filtering based on secmark policy")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/net.c')
| -rw-r--r-- | security/apparmor/net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/apparmor/net.c b/security/apparmor/net.c index f9a678ce994f..c07fde444792 100644 --- a/security/apparmor/net.c +++ b/security/apparmor/net.c @@ -190,6 +190,7 @@ int aa_sock_file_perm(struct aa_label *label, const char *op, u32 request, return aa_label_sk_perm(label, op, request, sock->sk); } +#ifdef CONFIG_NETWORK_SECMARK static int apparmor_secmark_init(struct aa_secmark *secmark) { struct aa_label *label; @@ -254,3 +255,4 @@ int apparmor_secmark_check(struct aa_label *label, char *op, u32 request, aa_secmark_perm(profile, request, secid, &sa, sk)); } +#endif |