diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-06-01 21:41:07 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-06-01 21:41:07 -0700 |
| commit | 4f9786035f9e519db41375818e1d0b5f20da2f10 (patch) | |
| tree | b307ecc9ab55c44ace462e59549c6d7976da5bfd /kernel/panic.c | |
| parent | ca39500f6af9cfe6823dc5aa8fbaed788d6e35b2 (diff) | |
| parent | a95ef0199e80f3384eb992889322957d26c00102 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.16 merge window.
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index d8635d5cecb2..a3889f38153d 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -511,6 +511,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { TAINT_FLAG(AUX, 'X', ' ', true), TAINT_FLAG(RANDSTRUCT, 'T', ' ', true), TAINT_FLAG(TEST, 'N', ' ', true), + TAINT_FLAG(FWCTL, 'J', ' ', true), }; #undef TAINT_FLAG @@ -832,9 +833,15 @@ device_initcall(register_warn_debugfs); */ __visible noinstr void __stack_chk_fail(void) { + unsigned long flags; + instrumentation_begin(); + flags = user_access_save(); + panic("stack-protector: Kernel stack is corrupted in: %pB", __builtin_return_address(0)); + + user_access_restore(flags); instrumentation_end(); } EXPORT_SYMBOL(__stack_chk_fail); |