summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLepton Wu <ytht.net@gmail.com>2018-01-12 13:42:56 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-17 09:35:30 +0100
commitc18b1bda49334cbef67d5b9fedbbe20e28566088 (patch)
tree372ccffb3cf0fff1f83bc188d19d8d743757c2c8 /arch/x86
parent0b6231faa21228fe486539dc33e39e865a1b0379 (diff)
kaiser: Set _PAGE_NX only if supported
This finally resolve crash if loaded under qemu + haxm. Haitao Shan pointed out that the reason of that crash is that NX bit get set for page tables. It seems we missed checking if _PAGE_NX is supported in kaiser_add_user_map Link: https://www.spinics.net/lists/kernel/msg2689835.html Reviewed-by: Guenter Roeck <groeck@chromium.org> Signed-off-by: Lepton Wu <ytht.net@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/mm/kaiser.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c
index 6a7a77929a8c..8af98513d36c 100644
--- a/arch/x86/mm/kaiser.c
+++ b/arch/x86/mm/kaiser.c
@@ -198,6 +198,8 @@ static int kaiser_add_user_map(const void *__start_addr, unsigned long size,
* requires that not to be #defined to 0): so mask it off here.
*/
flags &= ~_PAGE_GLOBAL;
+ if (!(__supported_pte_mask & _PAGE_NX))
+ flags &= ~_PAGE_NX;
for (; address < end_addr; address += PAGE_SIZE) {
target_address = get_pa_from_mapping(address);