From patchwork Thu Feb 2 05:43:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp57617wrn; Wed, 1 Feb 2023 21:46:22 -0800 (PST) X-Google-Smtp-Source: AK7set+juZ14npeNp9+/74E/BBdEKl7XYFb16sNvlyz6Xryys6gb0QprlLOt8dRyXuUYCxYMpxtq X-Received: by 2002:a17:90a:1d1:b0:22b:e2ef:6845 with SMTP id 17-20020a17090a01d100b0022be2ef6845mr5319062pjd.41.1675316782552; Wed, 01 Feb 2023 21:46:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675316782; cv=none; d=google.com; s=arc-20160816; b=jFGYq5eRXFr4SLHdhBV7iwHcuc8M5hp1id5jWnyzFJao2hm65rF7wxkGWWxQmmg9cp qH/uRIdzTpETFl3LTD5fv3tP7wPHKe2amu+B8XhvcTn6C3hGSSttn8zMWYom11iAbGzk qWmxfT3VOPPwmBLA2/GDMUnih5B0uHNW/f1DsCqwJ+Aw3wlJA2NTtHQU9D+g3CN0YelW SacVasIU6/tH8RV1EagAo6JOS/J2M3nwGEO4sKcxJ4Yx2k+ZvVSY4cKmUqASJ1NlNPb3 gHlMS3vfisifbrcVSj7iprYSMSWxtTb9rYX5Xz179i1UBm16E/FzZinGCjBI71jcZGzH HL4A== 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=eorLBO/49QcoC6BGlUh5GFMYZP3K5qtrCZrENFT0QMdpRE9v/zHMnsz2qO/5J8U4L3 FbD3CyZ3Fxm/vKyMMErAL/+T4rmerXhdCVyT/oxKguMR9LaiAexOD5W30rq+gayOFQu8 piO+N9bmsnUGSN178pZMSSbShwj5Qn85M5qgLH9ag4gRIen2Qn5MepaxV0TSyLJOIryz 1RFO2kuAJAmTzrrh5FqyxIhFWhYgDTRWLHsewWRF8/+aSRMVjnthrXvaPbrWQbEPPL9p GJJlMDNOo+fS5tonzbMwsaCHlCeLiP31EbE7bje/Tn/JyVNkgmBHjfRTeJPti4Qph/Ea B4eQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=H5K2ZX8N; 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 oc14-20020a17090b1c0e00b00223b92028c1si3941344pjb.190.2023.02.01.21.46.10; Wed, 01 Feb 2023 21:46:22 -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=H5K2ZX8N; 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 S231193AbjBBFpf (ORCPT + 99 others); Thu, 2 Feb 2023 00:45:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229595AbjBBFpZ (ORCPT ); Thu, 2 Feb 2023 00:45:25 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7407135261; Wed, 1 Feb 2023 21:45: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 ED3AE61783; Thu, 2 Feb 2023 05:45:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B92BC433EF; Thu, 2 Feb 2023 05:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675316723; bh=Q1iK07+TfUGftVW45xfnQtsOGOOjDYaWhjdzlKJkRcs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H5K2ZX8NDzqu0C7L9WC5+5iXCgFyof+VCgQu/94N7VwSnt8esGfz8PIgWaolj5NyQ S4jdv63roHDQWMR4UtfnMjpq1ynDtiown4KVBv8QzyG4h+Whj7Rws8wZjMa2Ry1IFT QK1i8+5gnKLWAcLlXA+uHpaEgugUsKwVzi/UBQ/H6SsHfQ1sf70shq8Bb2lamQTmh6 1oxFC54idfXed6qlIZJYBQ2ZT5/Eszmidm8SNdHWiU2zYaimgXrCcJUl9u8sedsKol L3u37LgDAHziYQwjS6A95F3qWmgeHxW6XwRNEvAGEUCycgQkPOfRSLjFOaGxkN4cq6 yEBvOjjMjeTKw== 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 4.14 05/16] objtool: Add a missing comma to avoid string concatenation Date: Wed, 1 Feb 2023 21:43:55 -0800 Message-Id: <20230202054406.221721-6-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202054406.221721-1-ebiggers@kernel.org> References: <20230202054406.221721-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?1756696970236211281?= X-GMAIL-MSGID: =?utf-8?q?1756696970236211281?= 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 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)