Message ID | 20230203003354.85691-5-ebiggers@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp558806wrn; Thu, 2 Feb 2023 16:37:05 -0800 (PST) X-Google-Smtp-Source: AK7set8YL8IXcPZa8FsdQt11/Zk3fl3bldTVgB+PVJCyJuRP0ptCESckXQ2e7Uxa+U25pdOGV49f X-Received: by 2002:a17:903:2288:b0:198:dd3f:2846 with SMTP id b8-20020a170903228800b00198dd3f2846mr658721plh.29.1675384624748; Thu, 02 Feb 2023 16:37:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675384624; cv=none; d=google.com; s=arc-20160816; b=AF9OJG7fmNC6MSvU1mXaNsDv53bjfbUFXPz+EXPB3c6rJ9kImY8uQaaKLHVQKm9EcP m9Fvo9Zds4rudRK2UwTJnAV0tOIGdrorjplVNdDWDC2U/oyO/up65eNB+upI2Z361UhX AAMDti7W3oflUwsyJIzcYZS8L3s3BTwm/0dY7Wk+g+uLcmkIBKmEEXVPp0OZX2eGGW+w fjfwowmglNcetdNUcS1tkDL/a6oeYAtXs1dQ89seyxiNPuWaNktD8ZV/4vsjKtmr1HUz vSfmVzYv8UWmHHkjMY4dcoDsO9JDsWSrcyqeggR8qTXow3FFKWPUZvtnBlh7a9nkZ6Vi 3MDA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1Ag1Z0QIdRQ5HukYjNwzJPEFWIlH7UcHVh4oSz/tNXs=; b=cIZh+11w3ygpED4eS47Zl7af9nf3vHLx3H28Zb4ncGOvF8BJ1cMvTsCkTrgoAycuMu oIXQUSP5ncTzBx1ZNUbXDQ/yj7CZt/cpTt7c7cZfZEB3pWCF6L71JNboOf9hap4eEvYH oAdh6E7xvFF+h0ic9UcVOfwLhGIQM5I45WHrcsPChQVUKmQWVU3Ay5a9hgi+vzN4d6EW ZeqBOds7mVM7dVPfLpsbU2nahDNrOE7T9UCmRuHunMkUmPJmVPasSLxsDaSsNBxByyOi awBnLju7nz3GgL644g+AFf2JRjndWJIKfwfGJq//4+X5nZj8XJaIIu8ysUhVuPzAYm75 gkaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZzWVcBWp; 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 q2-20020a170902dac200b00194a6e1b334si915863plx.327.2023.02.02.16.36.51; Thu, 02 Feb 2023 16:37:04 -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=ZzWVcBWp; 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 S233223AbjBCAfj (ORCPT <rfc822;il.mystafa@gmail.com> + 99 others); Thu, 2 Feb 2023 19:35:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbjBCAfa (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 2 Feb 2023 19:35:30 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C85856384F; Thu, 2 Feb 2023 16:35:24 -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 6395061D4A; Fri, 3 Feb 2023 00:35:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E09D1C433A8; Fri, 3 Feb 2023 00:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384524; bh=Q1iK07+TfUGftVW45xfnQtsOGOOjDYaWhjdzlKJkRcs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZzWVcBWpbkKGjiEs5IuYVj2pTpiqZIxYjIxFTadGmuWgHfCQA/1/nDEHB8WwXqefI YaUZjh0KqqrEP0Z9OrUmra9UHr9i35yn7IEafLLmVzz6N1zyuqr6VPermlWzh7wMUp 7pO+p2n0zmGFaH7TZA/3DXS5BngX1xxzkmQFR/3SAAw3rCcWZlfHbZ0SfYqWYXk2bL goyxJTwuhK4B+Ts6VUFrNbJe3Te2J9V2kxpLS6JBGPk2Z/NrGUOPzGPu6SKhHUlwgm lhFLQDDuidFNimVBYZHYNpwKOfsYUJ7C6YJEvTI3lMAe4Sgics7lA1ohA/Yr1q1ZVs 0ayFrusU69Ztg== From: Eric Biggers <ebiggers@kernel.org> To: stable@vger.kernel.org Cc: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>, Kees Cook <keescook@chromium.org>, SeongJae Park <sj@kernel.org>, Seth Jenkins <sethjenkins@google.com>, Jann Horn <jannh@google.com>, "Eric W . Biederman" <ebiederm@xmission.com>, linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, kernel test robot <lkp@intel.com> Subject: [PATCH 4.14 v2 04/15] objtool: Add a missing comma to avoid string concatenation Date: Thu, 2 Feb 2023 16:33:43 -0800 Message-Id: <20230203003354.85691-5-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230203003354.85691-1-ebiggers@kernel.org> References: <20230203003354.85691-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756768108391571974?= X-GMAIL-MSGID: =?utf-8?q?1756768108391571974?= |
Series |
Backport oops_limit to 4.14
|
|
Commit Message
Eric Biggers
Feb. 3, 2023, 12:33 a.m. UTC
From: "Eric W. Biederman" <ebiederm@xmission.com> commit 1fb466dff904e4a72282af336f2c355f011eec61 upstream. Recently the kbuild robot reported two new errors: >> lib/kunit/kunit-example-test.o: warning: objtool: .text.unlikely: unexpected end of section >> arch/x86/kernel/dumpstack.o: warning: objtool: oops_end() falls through to next function show_opcodes() I don't know why they did not occur in my test setup but after digging it I realized I had accidentally dropped a comma in tools/objtool/check.c when I renamed rewind_stack_do_exit to rewind_stack_and_make_dead. Add that comma back to fix objtool errors. Link: https://lkml.kernel.org/r/202112140949.Uq5sFKR1-lkp@intel.com Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Eric Biggers <ebiggers@google.com> --- tools/objtool/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 9048b02b54474..e93c061654a79 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -167,7 +167,7 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func, "lbug_with_loc", "fortify_panic", "machine_real_restart", - "rewind_stack_and_make_dead" + "rewind_stack_and_make_dead", }; if (func->bind == STB_WEAK)