From patchwork Thu Feb 2 04:42:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51674 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp37630wrn; Wed, 1 Feb 2023 20:45:51 -0800 (PST) X-Google-Smtp-Source: AK7set+vzH1TDYkojlXUHdjVEYjyYEtwKyS5aSsCPBkSDN/9UTG4iKITN3SiBGLmKy56oZmMr+p5 X-Received: by 2002:a05:6a20:e18c:b0:bd:8b67:4e6b with SMTP id ks12-20020a056a20e18c00b000bd8b674e6bmr4817744pzb.19.1675313151054; Wed, 01 Feb 2023 20:45:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675313151; cv=none; d=google.com; s=arc-20160816; b=UC7l2HVCP4HytvYaovABxVOTMubNyRugVnO/9QQveNC1Wnt73VzHjc+kKLJDWOttVQ 0ObbsYpPpZOl+3IXigAjfAtf/OheewayOfio1CH/xLPo0YVawZ6PnEC00iUQUCxlZhIK 2ltfirb6e+YZPWRDGGVpXU0B0baDEKHZWFEcFX16Wa35BDEFjQv8u2I/RgxL+qVri5HD Y0JGCdKbllK+55FdPHIb/BOTZeg16ziYYV4z4JfO4d5sFLQc9hfAOPhStFlF5Mny/XF2 BmM7RSsgkM4oWHrZ3oXu6LdjMwfbCh/wh7uFOz+tVzcUZd1stNHbvQstFSl2PML07Gkm wwdQ== 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=Xs84+DfhgpQjfEkxU9R++JEG0n26U3UK3FjvXz+xo2c=; b=k4IipyCImNhK2n2QdA50Y9Ww4m9qoQVRDd51+z9D5yNvezRCW9JSC+2h/xmjvRYUsq ANA7CdAib2xE9f5wMKvyzWQyIq3LNpFCQzY61SF4+N9Mqg1RU1e7hdKVtafZPrDhh8mP RVsY5Vp0cCM2CXCEdLxneGeuJk+BxGgBufPQFmumy+7WY/sVnWJcWTWalTMmVotQyVhn 5cg7tBS0NaxT66zgU5i+4xcSArZp0Uh26JngweVANqli13CJZG5BCMJTwqCeU7TLK5zr 7XRrsG+Dq7X0uA7D4N5nLzkkQ1z1aRFzotpkRxp6xje+095vUe672aWvuutF98z8dgD/ /YOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kz1lKWvL; 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 y24-20020a637d18000000b004ce0ead7aabsi20815947pgc.302.2023.02.01.20.45.36; Wed, 01 Feb 2023 20:45:51 -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=kz1lKWvL; 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 S231743AbjBBEok (ORCPT + 99 others); Wed, 1 Feb 2023 23:44:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231302AbjBBEoN (ORCPT ); Wed, 1 Feb 2023 23:44:13 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F29647A488; Wed, 1 Feb 2023 20:43:52 -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 sin.source.kernel.org (Postfix) with ESMTPS id 44C26CE2774; Thu, 2 Feb 2023 04:43:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AF37C4339C; Thu, 2 Feb 2023 04:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675313029; bh=RlJYO0lbBiRRVAS7XhsN7Zwl+KQ8V40jkMt3z+fFE5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kz1lKWvLC+IAwkHWiuA7r63D1dz/g0mDOUSL8A2p64cyWM/eX76tWeM3KN58NNsb5 6qjlXEswftJqGG6glbdQ0ilFIQ//9e+6KwS4q4kLBaMNQ3ff4LSU69RVS6S92/X0kk w0xdkhn16qvJd9/RJARoPscoFE1dwCNUAAzcPN7Dsr0Uv2iTwHL/UhdFPVfknI+df8 wHxz+fB0WL7gKJw7tXZ1O+vPMA6hf/86aTJEFL3pK+PCmaUiqsY/VIlXT57OL6vqa4 3rUzVtcl1LYC8+K/nULYpKDjgYKOpXjEmLOHsql1RdQIEYBNcNmN+FREKgBmTk3EPE rWjxjTbtnbTUg== 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, kernel test robot Subject: [PATCH 5.4 05/17] objtool: Add a missing comma to avoid string concatenation Date: Wed, 1 Feb 2023 20:42:43 -0800 Message-Id: <20230202044255.128815-6-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202044255.128815-1-ebiggers@kernel.org> References: <20230202044255.128815-1-ebiggers@kernel.org> 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?1756693162648680403?= X-GMAIL-MSGID: =?utf-8?q?1756693162648680403?= From: "Eric W. Biederman" 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 Signed-off-by: "Eric W. Biederman" Signed-off-by: Eric Biggers --- 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 14be7d261ae7a..dfd67243faac0 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -144,7 +144,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, "fortify_panic", "usercopy_abort", "machine_real_restart", - "rewind_stack_and_make_dead" + "rewind_stack_and_make_dead", "cpu_bringup_and_idle", };