From patchwork Thu Feb 2 04:42:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 4850 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp37386wrn; Wed, 1 Feb 2023 20:45:07 -0800 (PST) X-Google-Smtp-Source: AK7set/IsUariifQyNimwMrERABmLDCdHEwDy0N1zr4kyCMhRBLztn/z3g6m160YwKpXnHrWqbIw X-Received: by 2002:a17:90b:314e:b0:229:19f7:a60d with SMTP id ip14-20020a17090b314e00b0022919f7a60dmr5274045pjb.0.1675313107341; Wed, 01 Feb 2023 20:45:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675313107; cv=none; d=google.com; s=arc-20160816; b=z5DkG4e7kS/QQP1HodLd7iLd7+R5L/woHdZ/8CcUuKMXTTRBLhGqFlkJrrdK7PK5HZ MgnIv3WP6o+oRYUfq7fTVsZjpQc5pkgVn0OatoFwKb2ZkZKzBtK07IsQ3NJOPtQQgfUl VGPhVjWKzVq10VXkkPDxvZM1cyLW2q+MDH1arWGiX9ov3Vx8wEb9p1+vcmbZeTw+MBwz N3ozIAwJyQoX7USle9F0vgCuFeCQHaTFfXGBdvtAaJD4lp1EVE1PF38ZTukJE3HdUlaf RiNH+Upo74qSZfeYe4cKwV+8KQsRwrrq2+DLlnnL3l5c7lPs2dkzrl65/xaysg3NvacQ pchg== 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=g55KJWva3GZDXUALKR2nQQ5y8Y3ozNkGGv6N5OM3mww=; b=e0bFeLjLVsgtMlc9vZUljqUX30i4dnvsEVhfGw14AgYfNo2h23m/rrq++GOBXQNQO5 /FlHup5Zan+q8M0AQ4tfaN/igqo5nM842ZnCea2pc35XpfKSZYQEMnMI+UjxXVmWa8HT bqy9c4t1NX1CpYZwUH9HJx5OVhxRruDjMPNXWxuhS8XL6+T8Km3mvPYxAKIp+DBObb0v oj3ILwQmAQdDmBl0Uqqjl7nu731xXu/Po7bEOPazpM4eP/uZdM/Ipi9XIq4LgKrkEXRG 8Jt6GJ1roBaJVjBNlQr6v4DvssyLB0BHNyBmFvYW86JRg2ZiZUa24SZjYUwwjtXIYQkH kcww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UinRr4aM; 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 v3-20020a17090a960300b0022c19e2e734si3543077pjo.151.2023.02.01.20.44.53; Wed, 01 Feb 2023 20:45:07 -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=UinRr4aM; 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 S231465AbjBBEn7 (ORCPT + 99 others); Wed, 1 Feb 2023 23:43:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229916AbjBBEnz (ORCPT ); Wed, 1 Feb 2023 23:43:55 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4DA57A490; Wed, 1 Feb 2023 20:43:46 -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 3E87E619FC; Thu, 2 Feb 2023 04:43:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54194C433EF; Thu, 2 Feb 2023 04:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675313025; bh=Rxs3Gaexm1CCG3qQ+Jn6zC7WiYN+oj18KdkDjYmSq94=; h=From:To:Cc:Subject:Date:From; b=UinRr4aMAsLR2BtgP6Y4w4M08kwmc5LmPIGwEHyfNlfqvOM989UqAGcX8Pn6e0onY 3f4H90dSfQAfv6E++YxquVFaKMHTkSD68wv/chH98e5aS/Yv/O+XveJiB2eeiZfK0U E90FZWCyfoJUlQcODblnQWUQHfNtmqxA/aPZdLdTPW982ZvOuMTmx7v2Zqmx1xpVu/ OZh/DAO7UGEoaLj9HBe6nTzk9azWqK6E+bt+OLDaiKL/Y30UqI5ZtGG0vtKyrvkClu jZgDVdokldy9Kt2AXAwVfl8JzDgJriH2JpkC+RhdFnlCHCcDvdxFXB/Mn8452ckvEq cLds4R2BqASQA== From: Eric Biggers To: stable@vger.kernel.org Cc: Harshit Mogalapalli , Kees Cook , SeongJae Park , Seth Jenkins , Jann Horn , "Eric W . Biederman" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5.4 00/17] Backport oops_limit to 5.4 Date: Wed, 1 Feb 2023 20:42:38 -0800 Message-Id: <20230202044255.128815-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?1756693116741152899?= X-GMAIL-MSGID: =?utf-8?q?1756693116741152899?= 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.4, as recommended at https://googleprojectzero.blogspot.com/2023/01/exploiting-null-dereferences-in-linux.html This follows the backports to 5.10 and 5.15 which already released. This required backporting various prerequisite patches. I've tested that oops_limit and warn_limit work correctly on x86_64. David Gow (1): mm: kasan: do not panic if both panic_on_warn and kasan_multishot set 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 (7): 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 (1): panic: unset panic_on_warn inside panic() Xiaoming Ni (1): sysctl: add a new register_sysctl_init() interface .../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 | 1 + include/linux/sched/task.h | 1 + include/linux/sysctl.h | 3 + kernel/exit.c | 72 ++++++++++++++++++ kernel/panic.c | 75 ++++++++++++++++--- kernel/sched/core.c | 3 +- mm/kasan/report.c | 4 +- tools/objtool/check.c | 3 +- 48 files changed, 260 insertions(+), 67 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-oops_count create mode 100644 Documentation/ABI/testing/sysfs-kernel-warn_count Tested-by: SeongJae Park