[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1496915712-14176-5-git-send-email-amit.pundir@linaro.org>
Date: Thu, 8 Jun 2017 15:25:07 +0530
From: Amit Pundir <amit.pundir@...aro.org>
To: Andrew Morton <akpm@...ux-foundation.org>,
Rob Herring <robh@...nel.org>,
Greg KH <gregkh@...uxfoundation.org>
Cc: lkml <linux-kernel@...r.kernel.org>,
Android Kernel Team <kernel-team@...roid.com>,
Sami Tolvanen <samitolvanen@...gle.com>
Subject: [PATCH 4/9] config: android-recommended: enable CONFIG_CPU_SW_DOMAIN_PAN
From: Sami Tolvanen <samitolvanen@...gle.com>
Enable CPU domain PAN to ensure that normal kernel accesses are
unable to access userspace addresses.
Reviewed-at: https://android-review.googlesource.com/#/c/334035/
Signed-off-by: Sami Tolvanen <samitolvanen@...gle.com>
[AmitP: cherry-picked this change from Android common kernel, updated
the commit message and re-placed the CONFIG_STRICT_KERNEL_RWX
config in sorted order]
Signed-off-by: Amit Pundir <amit.pundir@...aro.org>
---
kernel/configs/android-recommended.config | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config
index a02c447769f7..946fb92418f7 100644
--- a/kernel/configs/android-recommended.config
+++ b/kernel/configs/android-recommended.config
@@ -14,7 +14,7 @@ CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_COMPACTION=y
-CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
CONFIG_DM_CRYPT=y
CONFIG_DM_UEVENT=y
CONFIG_DM_VERITY=y
@@ -107,6 +107,7 @@ CONFIG_SCHEDSTATS=y
CONFIG_SMARTJOYPLUS_FF=y
CONFIG_SND=y
CONFIG_SOUND=y
+CONFIG_STRICT_KERNEL_RWX=y
CONFIG_SUSPEND_TIME=y
CONFIG_TABLET_USB_ACECAD=y
CONFIG_TABLET_USB_AIPTEK=y
--
2.7.4
Powered by blists - more mailing lists