summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2018-11-02 00:07:23 +0100
committerDavid Howells <dhowells@redhat.com>2018-12-20 17:32:56 +0100
commite262e32d6bde0f77fb0c95d977482fc872c51996 (patch)
treee97542fe8392bb3c31459ac3163b0c7111ae34c6 /security/apparmor
parentexofs_mount(): fix leaks on failure exits (diff)
downloadlinux-e262e32d6bde0f77fb0c95d977482fc872c51996.tar.xz
linux-e262e32d6bde0f77fb0c95d977482fc872c51996.zip
vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled
Only the mount namespace code that implements mount(2) should be using the MS_* flags. Suppress them inside the kernel unless uapi/linux/mount.h is included. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Reviewed-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/lsm.c1
-rw-r--r--security/apparmor/mount.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 42446a216f3b..2c010874329f 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -26,6 +26,7 @@
#include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv6.h>
#include <net/sock.h>
+#include <uapi/linux/mount.h>
#include "include/apparmor.h"
#include "include/apparmorfs.h"
diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index c1da22482bfb..8c3787399356 100644
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -15,6 +15,7 @@
#include <linux/fs.h>
#include <linux/mount.h>
#include <linux/namei.h>
+#include <uapi/linux/mount.h>
#include "include/apparmor.h"
#include "include/audit.h"