Skip to content

Backport oops_limit to 5.15

Eric Biggers linux-doc linux-hardening linux-mm lkml stable 1 version Applied

Status from this message: I've queued up this and the 5.10 backport, thanks!

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest20 patches 4 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/20sysctl: add a new register_sysctl_init() interfacefs/proc/proc_sysctl.c include/linux/sysctl.h+36 -00 replies
2/20kernel/panic: move panic sysctls to its own fileinclude/linux/panic.h kernel/panic.c kernel/sysctl.c+25 -180 replies
3/20panic: unset panic_on_warn inside panic()kernel/panic.c+11 -90 replies
4/20ubsan: no need to unset panic_on_warn in ubsan_epilogue()lib/ubsan.c+1 -90 replies
5/20kasan: no need to unset panic_on_warn in end_report()mm/kasan/report.c+1 -90 replies
6/20exit: Add and use make_task_dead.arch/alpha/kernel/traps.c arch/alpha/mm/fault.c arch/arm/kernel/traps.c +36 more+63 -560 replies
7/20objtool: Add a missing comma to avoid string concatenationtools/objtool/check.c+1 -10 replies
8/20hexagon: Fix function name in die()arch/hexagon/kernel/traps.c+1 -10 replies
9/20h8300: Fix build errors from do_exit() to make_task_dead() transitionarch/h8300/kernel/traps.c arch/h8300/mm/fault.c+3 -20 replies
10/20csky: Fix function name in csky_alignment() and die()arch/csky/abiv1/alignment.c arch/csky/kernel/traps.c+2 -20 replies
11/20ia64: make IA64_MCA_RECOVERY bool instead of tristatearch/ia64/Kconfig+1 -10 replies
12/20panic: Separate sysctl logic from CONFIG_SMPkernel/panic.c+3 -10 replies
13/20exit: Put an upper limit on how often we can oopsDocumentation/admin-guide/sysctl/kernel.rst kernel/exit.c+51 -03 replies
14/20exit: Expose "oops_count" to sysfsDocumentation/ABI/testing/sysfs-kernel-oops_count kernel/exit.c+26 -20 replies
15/20exit: Allow oops_limit to be disabledDocumentation/admin-guide/sysctl/kernel.rst kernel/exit.c+4 -30 replies
16/20panic: Consolidate open-coded panic_on_warn checksinclude/linux/panic.h kernel/kcsan/report.c kernel/panic.c +4 more+14 -120 replies
17/20panic: Introduce warn_limitDocumentation/admin-guide/sysctl/kernel.rst kernel/panic.c+24 -00 replies
18/20panic: Expose "warn_count" to sysfsDocumentation/ABI/testing/sysfs-kernel-warn_count kernel/panic.c+26 -20 replies
19/20docs: Fix path paste-o for /sys/kernel/warn_countDocumentation/ABI/testing/sysfs-kernel-warn_count+1 -10 replies
20/20exit: Use READ_ONCE() for all oops/warn limit readskernel/exit.c kernel/panic.c+9 -40 replies

Reviews trailers per patch

12 of 20 patches have a Reviewed-by or Acked-by.

PatchKees CookMarco ElverLuis ChamberlainAndrey KonovalovGuo RenChristoph HellwigEric W. Biederman
1/20R-b
2/20
3/20R-b
4/20R-b
5/20R-b
6/20
7/20
8/20
9/20
10/20R-b
11/20R-b R-b
12/20R-b
13/20R-b
14/20R-b
15/20
16/20R-b R-b R-b
17/20R-b
18/20R-b
19/20
20/20

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 7 reviewers.

Read the v1 thread

Cover letter [PATCH 5.15 00/20] Backport oops_limit to 5.15

This series backports the patchset
"exit: Put an upper limit on how often we can oops"
(https://lore.kernel.org/linux-mm/[email protected]/T/#u)
to 5.15, as recommended at
https://googleprojectzero.blogspot.com/2023/01/exploiting-null-dereferences-in-linux.html

This required backporting various prerequisite patches.

I've tested that oops_limit and warn_limit work correctly on x86_64.

Eric W. Biederman (2):
exit: Add and use make_task_dead.
objtool: Add a missing comma to avoid string concatenation

Jann Horn (1):
exit: Put an upper limit on how often we can oops

Kees Cook (8):
panic: Separate sysctl logic from CONFIG_SMP
exit: Expose "oops_count" to sysfs
exit: Allow oops_limit to be disabled
panic: Consolidate open-coded panic_on_warn checks
panic: Introduce warn_limit
panic: Expose "warn_count" to sysfs
docs: Fix path paste-o for /sys/kernel/warn_count
exit: Use READ_ONCE() for all oops/warn limit reads

Nathan Chancellor (3):
hexagon: Fix function name in die()
h8300: Fix build errors from do_exit() to make_task_dead() transition
csky: Fix function name in csky_alignment() and die()

Randy Dunlap (1):
ia64: make IA64_MCA_RECOVERY bool instead of tristate

Tiezhu Yang (3):
panic: unset panic_on_warn inside panic()
ubsan: no need to unset panic_on_warn in ubsan_epilogue()
kasan: no need to unset panic_on_warn in end_report()

Xiaoming Ni (1):
sysctl: add a new register_sysctl_init() interface

tangmeng (1):
kernel/panic: move panic sysctls to its own file

 .../ABI/testing/sysfs-kernel-oops_count       |  6 ++
 .../ABI/testing/sysfs-kernel-warn_count       |  6 ++
 Documentation/admin-guide/sysctl/kernel.rst   | 19 ++++
 arch/alpha/kernel/traps.c                     |  6 +-
 arch/alpha/mm/fault.c                         |  2 +-
 arch/arm/kernel/traps.c                       |  2 +-
 arch/arm/mm/fault.c                           |  2 +-
 arch/arm64/kernel/traps.c                     |  2 +-
 arch/arm64/mm/fault.c                         |  2 +-
 arch/csky/abiv1/alignment.c                   |  2 +-
 arch/csky/kernel/traps.c                      |  2 +-
 arch/csky/mm/fault.c                          |  2 +-
 arch/h8300/kernel/traps.c                     |  3 +-
 arch/h8300/mm/fault.c                         |  2 +-
 arch/hexagon/kernel/traps.c                   |  2 +-
 arch/ia64/Kconfig                             |  2 +-
 arch/ia64/kernel/mca_drv.c                    |  2 +-
 arch/ia64/kernel/traps.c                      |  2 +-
 arch/ia64/mm/fault.c                          |  2 +-
 arch/m68k/kernel/traps.c                      |  2 +-
 arch/m68k/mm/fault.c                          |  2 +-
 arch/microblaze/kernel/exceptions.c           |  4 +-
 arch/mips/kernel/traps.c                      |  2 +-
 arch/nds32/kernel/fpu.c                       |  2 +-
 arch/nds32/kernel/traps.c                     |  8 +-
 arch/nios2/kernel/traps.c                     |  4 +-
 arch/openrisc/kernel/traps.c                  |  2 +-
 arch/parisc/kernel/traps.c                    |  2 +-
 arch/powerpc/kernel/traps.c                   |  8 +-
 arch/riscv/kernel/traps.c                     |  2 +-
 arch/riscv/mm/fault.c                         |  2 +-
 arch/s390/kernel/dumpstack.c                  |  2 +-
 arch/s390/kernel/nmi.c                        |  2 +-
 arch/sh/kernel/traps.c                        |  2 +-
 arch/sparc/kernel/traps_32.c                  |  4 +-
 arch/sparc/kernel/traps_64.c                  |  4 +-
 arch/x86/entry/entry_32.S                     |  6 +-
 arch/x86/entry/entry_64.S                     |  6 +-
 arch/x86/kernel/dumpstack.c                   |  4 +-
 arch/xtensa/kernel/traps.c                    |  2 +-
 fs/proc/proc_sysctl.c                         | 33 +++++++
 include/linux/panic.h                         |  7 +-
 include/linux/sched/task.h                    |  1 +
 include/linux/sysctl.h                        |  3 +
 kernel/exit.c                                 | 72 +++++++++++++++
 kernel/kcsan/report.c                         |  3 +-
 kernel/panic.c                                | 90 ++++++++++++++++---
 kernel/sched/core.c                           |  3 +-
 kernel/sysctl.c                               | 11 ---
 lib/ubsan.c                                   | 11 +--
 mm/kasan/report.c                             | 12 +--
 mm/kfence/report.c                            |  3 +-
 tools/objtool/check.c                         |  3 +-
 53 files changed, 281 insertions(+), 111 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-kernel-oops_count
 create mode 100644 Documentation/ABI/testing/sysfs-kernel-warn_count

base-commit: aabd5ba7e9b03e9a211a4842ab4a93d46f684d2c

Signature · 1 line
2.39.1