From patchwork Tue Jan 24 19:29:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 4472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2337031wrn; Tue, 24 Jan 2023 11:35:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXv+fhMGs+B8FWq2Bf7JXvGE9BkNaQSoSakJvc9HU2q6TnZS4Njx7h/aU+RsHrtXNQuwvZ64 X-Received: by 2002:a17:902:ec85:b0:194:dda4:4b5c with SMTP id x5-20020a170902ec8500b00194dda44b5cmr22956601plg.28.1674588937247; Tue, 24 Jan 2023 11:35:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674588937; cv=none; d=google.com; s=arc-20160816; b=Qh9ryDBODMBf3b4H9QvEPL31vuWYECVLavj0KBNm46ABjYhaGKq9/sc4U0/ThE3KWt Z5vYNHeO0nc03r4S1/GSnq6DDhlDMrqlnG0k246drFfbVCDHbpM9lsaRga/OcCe82HXi gMg8IZ6kZ8pxi380zo+jnaKtIQ5kNsZhOg/x0t6paQ5PXzQJ9Cv/34mBspZ2l3y/e/Oy RiiO3hhZSU/P/uH1rw0E/FXTN4LX4DeIQum502T2hlisxQudogvBsewYG1KHOMGHeC0p IW0LyYV2gWkCBINIFEaY1Ac/rWjg4zFN/RQhv1PeXy7eDnCdhwSjEhiRqcwJYBKL5ltM ATUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=B6tPkfOfc6xbutzXmMAOqoJH39EHhr8me7+Awjfv/FI=; b=gqRvkUxhVW0mUvBz/+6ES1Mf31S+uc5MDCC6O1fCH8NfWlqzOmUjhM6wfY2wbbNTdW +4IVBkogutYaqUgJqJEoTAZDUKPZ+GVr0NnErisBce8PrLjMGieuL/NgFWysiInszWPF 0WHnUIVZOiZcCnla4p37FOwEn44Zo1Re+jdQXgPJ9LddQIMvQd0pTJO8GmM+q6YNJpDE PeyG0riY+VHf49z2CeS1EtVDoIIFgXmge3YZu6GS/8pq2zN5EeUvmAvx44W24rbB0hpv pF/FdXEbVfP8ifq3pyBs7W6QvvSMYujijQtdIjql0BLiXQA5asYz+llihZ+5AeXGe5Mc /yfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=glZJZEaS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n12-20020a170902968c00b0019319c34917si3120867plp.505.2023.01.24.11.35.23; Tue, 24 Jan 2023 11:35:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=glZJZEaS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232202AbjAXTfS (ORCPT + 99 others); Tue, 24 Jan 2023 14:35:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229933AbjAXTfQ (ORCPT ); Tue, 24 Jan 2023 14:35:16 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C3252D72; Tue, 24 Jan 2023 11:35:15 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B216E61320; Tue, 24 Jan 2023 19:35:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9965C433D2; Tue, 24 Jan 2023 19:35:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674588914; bh=pBf4JzqxGrCAc9TQ7YAZkrTygAUHBoECrmoN3gBZZrc=; h=From:To:Cc:Subject:Date:From; b=glZJZEaS9TkHs8maCFpg58ZIcmsnuHnS+6zC0dY/CMXAGHvVFsls3dvNzn/badtBC F6Mun1q/pPlQqaZCKxDDimjb1JaIcrGr1yo9LRUs466Z075FHKqCiwLSNz8LKy8yZd w3a9NR+/6ITQ6iWmiBgqW9wICKhwlzzLIMBJ1AUsEtTWk0M+LKHrDz9CQ7QAmrHrNZ aBChmaZNI4vBFhZ5YORkdouWw88C1Fspp7XTD8byICoRxe0xXvj+Jfx9awxxBuL/P9 I8iAch/LVxeqpD7MbkZtdqUt3gHldSvv/PKai47olScMAJmD94V9md8dx1jVTHcFD0 P6BBtoIaC1L9A== From: Eric Biggers To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Kees Cook , SeongJae Park , Seth Jenkins , Jann Horn , "Eric W . Biederman" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5.10 00/20] Backport oops_limit to 5.10 Date: Tue, 24 Jan 2023 11:29:44 -0800 Message-Id: <20230124193004.206841-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755933769628924345?= X-GMAIL-MSGID: =?utf-8?q?1755933769628924345?= From: Eric Biggers This series backports the patchset "exit: Put an upper limit on how often we can oops" (https://lore.kernel.org/linux-mm/20221117233838.give.484-kees@kernel.org/T/#u) to 5.10, 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/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 | 2 +- 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/kernel.h | 7 +- include/linux/sched/task.h | 1 + include/linux/sysctl.h | 3 + kernel/exit.c | 72 +++++++++++++++ kernel/kcsan/report.c | 4 +- kernel/panic.c | 90 ++++++++++++++++--- kernel/sched/core.c | 3 +- kernel/sysctl.c | 11 --- lib/ubsan.c | 11 +-- mm/kasan/report.c | 12 +-- tools/objtool/check.c | 3 +- 51 files changed, 277 insertions(+), 105 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-oops_count create mode 100644 Documentation/ABI/testing/sysfs-kernel-warn_count base-commit: 179624a57b78c02de833370b7bdf0b0f4a27ca31