|
@@ -297,11 +297,13 @@ int __die(const char *str, struct pt_regs *regs, long err)
|
|
|
unsigned long sp;
|
|
|
#endif
|
|
|
printk(KERN_DEFAULT
|
|
|
- "%s: %04lx [#%d]%s%s%s%s\n", str, err & 0xffff, ++die_counter,
|
|
|
+ "%s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff, ++die_counter,
|
|
|
IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
|
|
|
IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
|
|
|
debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
|
|
|
- IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "");
|
|
|
+ IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "",
|
|
|
+ IS_ENABLED(CONFIG_PAGE_TABLE_ISOLATION) ?
|
|
|
+ (boot_cpu_has(X86_FEATURE_PTI) ? " PTI" : " NOPTI") : "");
|
|
|
|
|
|
if (notify_die(DIE_OOPS, str, regs, err,
|
|
|
current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)
|