summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-10-11 13:54:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-11 15:06:32 -0700
commitd90ae51a3e7556c9f50431db43cd8190934ccf94 (patch)
tree66614a5c2f1d0b21213aa89df04e4f2ed6a613c7
parentf023a3956f273859ed36f624f75a66c272124b16 (diff)
downloadlinux-stable-d90ae51a3e7556c9f50431db43cd8190934ccf94.tar.gz
linux-stable-d90ae51a3e7556c9f50431db43cd8190934ccf94.tar.bz2
linux-stable-d90ae51a3e7556c9f50431db43cd8190934ccf94.zip
config: android: set SELinux as default security mode
Android won't boot without SELinux enabled, so make it the default. Link: http://lkml.kernel.org/r/20160908185934.18098-2-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/configs/android-base.config1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index da8b3e9deac6..248070e0d61d 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -18,6 +18,7 @@ CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_SCHED=y
CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
CONFIG_EMBEDDED=y
CONFIG_FB=y
CONFIG_HIGH_RES_TIMERS=y