diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 11:50:22 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 11:50:22 +0530 |
| commit | 395ae9f4e6934c9f61d7002dc12b267d0c302104 (patch) | |
| tree | d80d145feb56614796dfe6c2ce41db16b290daf3 /security/Kconfig | |
| parent | 317c5652a7c300c2d82ef5bfae8d3558f389d219 (diff) | |
| parent | 13b48cd3ac945d4e4075bec53f107a315fe771ae (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
kernel/fork.c
Conflict due to Kaiser implementation in LTS 4.4.110.
net/ipv4/raw.c
Minor conflict due to LTS commit
be27b620a861 ("net: ipv4: fix for a race condition in raw_sendmsg")
Diffstat (limited to 'security/Kconfig')
| -rw-r--r-- | security/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig index 3aa60791f84d..7bcb805f36a4 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -40,6 +40,16 @@ config SECURITY If you are unsure how to answer this question, answer N. +config PAGE_TABLE_ISOLATION + bool "Remove the kernel mapping in user mode" + default y + depends on X86_64 && SMP + help + This enforces a strict kernel and user space isolation, in order + to close hardware side channels on kernel address information. + + If you are unsure how to answer this question, answer Y. + config SECURITYFS bool "Enable the securityfs filesystem" help |