From patchwork Fri Feb 3 00:27:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 4905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp555357wrn; Thu, 2 Feb 2023 16:28:36 -0800 (PST) X-Google-Smtp-Source: AK7set9o63nsTmlssd5tlXn7Rv8TaBQXXwlh52VU+BU9B9z7HpYjnI1UY7WZe7m7am1ztKgYyDUL X-Received: by 2002:a17:902:f20c:b0:198:c6d1:cc03 with SMTP id m12-20020a170902f20c00b00198c6d1cc03mr2462376plc.24.1675384116482; Thu, 02 Feb 2023 16:28:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675384116; cv=none; d=google.com; s=arc-20160816; b=g6DhZhZTRTWO2v7QFpxlWvL/P598pJFYA7C8c46IbY66vSSzNZqJpmFDKodxdXJiRb ePig9z0k4MiafYIFlpItCjC/v3o9iGhdaUV8S22PGuujve+OXZFafywtA64OQQEBHWsH PcwuWLS5IyUdP/XKfGEjeGt0eb3YOwqdDfoUtYRRkQzx16E8LsZmd5HAT4Hr53SrLC42 2pfaKeE6KZ41u+nz5Kml2BwCAzF9ouN0Ze/odhDGO9HPd0LwYPe5RPBpttLAsukBD5UH i2SswVK9WPMbHVQc1o9xUysrxiq0InT0nZFuuwyowKpi7DBR8NIz6pJCv42bRfFe17/I iLpA== 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=7pYk6SFwdzbtaoRTQ0AENTrp9HoMiXUFiTgpquIc6IQ=; b=u1kv31WTwx+BdrVvcZtmgH/0WubLpuDiQbbU4n60hYHSdRIJjiSaM0Us5oQLX0g8kH hlTb5rYV1oQckgCKpfeZbdSBmdzpW3CcvX+hUgZcc2xsJhgKFgm7T8za/Evcay1X5Lwi a5OLGk3BeoTxydrA3Mb3tRZJ7e8Y74HhASyANIGmwecTFPQeCyloPzKthPEmPnZDfn5V 0gtiqJnuRhgO4AC6XNiOZeBzsgO9uCwdxYZsSoDJATvY2bzAlZLapvH3133ye2ACTVHZ inwiNPPp5ejC1xVOqWqgl2jPjcUTsNBpWjmU5aZfOKn3NdMQ4o9j7CmxNWLgrBPZpRi2 BBVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iN1RQbrj; 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 l7-20020a170903244700b0019285058636si870818pls.238.2023.02.02.16.28.23; Thu, 02 Feb 2023 16:28:36 -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=iN1RQbrj; 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 S231829AbjBCA2G (ORCPT + 99 others); Thu, 2 Feb 2023 19:28:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229915AbjBCA2E (ORCPT ); Thu, 2 Feb 2023 19:28:04 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1568010ABC; Thu, 2 Feb 2023 16:28:03 -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 A584061D42; Fri, 3 Feb 2023 00:28:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4CD9C433D2; Fri, 3 Feb 2023 00:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384082; bh=cGjeTNl7m/kdvcI4Bnk/YBV908y66tOL9I9W34teMMk=; h=From:To:Cc:Subject:Date:From; b=iN1RQbrj3PVlZpzhnzJya/8QZ/PwPc+3fsObuzsXH9/yn8BFKh8kRu1iqznd1GFdI TLLb/6eQe9JrStbMcn/tSo4qzj4wT9Iln+c4T1718+9myi7yOAIE3rDGTKto0ai8TP McCegGL5HQRtKeIOrPzQF2QiHg4VU/EfI3kmZKj5JIOZVjs+fIVSwV1/tL83p4/Vac L9geVnOsh7LyRnsr+L9EZssekumZSGOwVaJceAeghtQiwxSJSkXy32cVi0MfOFmXBC +5C5FlnK2YYxT4C3tBaHJHqGZZEUSPVoa+xmeTS+vY8+KqDN1+j1Rz3obs6Kf7hfeo nlEcqRpNjtBvQ== 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 4.19 v2 00/15] Backport oops_limit to 4.19 Date: Thu, 2 Feb 2023 16:27:02 -0800 Message-Id: <20230203002717.49198-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756767575196191620?= X-GMAIL-MSGID: =?utf-8?q?1756767575196191620?= 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 4.19, as recommended at https://googleprojectzero.blogspot.com/2023/01/exploiting-null-dereferences-in-linux.html Changed in v2: - Fixed a build error in mm/kasan/report.c by dropping the patch "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 (2): hexagon: Fix function name in die() h8300: Fix build errors from do_exit() to make_task_dead() transition 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/sysctl/kernel.txt | 20 +++++ 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/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/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 | 3 +- tools/objtool/check.c | 3 +- 45 files changed, 257 insertions(+), 64 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-oops_count create mode 100644 Documentation/ABI/testing/sysfs-kernel-warn_count base-commit: b17faf2c4e88ac0deb894f068bda67ace57e9c0a