From patchwork Tue Jan 24 18:50:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 47818 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2318753wrn; Tue, 24 Jan 2023 10:53:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXtimm4dxI97e4ZZfWiUawLBzsliSCKFRFvU7kftU1kr9vP22qMbChG6Tfn5dm5T0HeSVjPw X-Received: by 2002:a17:902:e548:b0:194:687c:e883 with SMTP id n8-20020a170902e54800b00194687ce883mr39656428plf.37.1674586390785; Tue, 24 Jan 2023 10:53:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674586390; cv=none; d=google.com; s=arc-20160816; b=tBWnSsAxlLry7PBSlZ3fU7fc44PvDe9U4i4WTkz30cww12OGRKJVlnLBS12XPybY8H KFTHBTWFnG5EIZgeuNbx7NJWWRNIV4/wJk9+ysYNvpalttzdTq6P6N9mGStYuKT1tdEZ lhxAG4yx98EtecP9hg7QnTIY8lTEHK3bCypw6qEIP3aV/pjaUh+C0aqt1MRqp7kKrstt MvwZsBBR8o6NAAIl2FfaAQgHaseLXXtyrACOBasVAuEa//fIBqGbM8KprKXy262NSbhW ON2qqo9Det5ecYmVe5EpvM1Ojq5u/kwmJVPq0IXdTZopAQsY5Z3NiDQ6g1hCbjKZknHm KkxQ== 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=9cGvNp3uSGsw1g7c4Y/xqaIWy+gsDlfGW4ZDwOwHZRM=; b=EVRjVNx0E6hTgKjR/ZxzIQtiiXVxiMrC6DiphOdkBAeadcIosEjKID05Y38ONMqpos RJZhdF8qwcjNBXbqmJRkiJWVpRpXu5Ff8RhAFMaY5H+pbc/h/YpRtQzxTzHNO0Lu5zGy UtRcTFiXdZ2C/jfSykbPL03c8dXIKiCf4MNvtHAAHCLrJuL7GYQdgMgPUWPYfrkN7E+f uO2210H/H0hqKATQK+VrCDddIHeFIi47cbBi7mnurlZYD994YMOVH/KCiuW/t73HPF4R TV2FBfEzKMdjI0xlRAA+8oOKJsjURw0xiLQg+Tie2Tbtg6HE+IUY45QZyY0c2cqnvZhh 30QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jYUxilzC; 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 u3-20020a170902e5c300b001949d233d5csi3287047plf.65.2023.01.24.10.52.57; Tue, 24 Jan 2023 10:53:10 -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=jYUxilzC; 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 S232854AbjAXSwY (ORCPT + 99 others); Tue, 24 Jan 2023 13:52:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230317AbjAXSwH (ORCPT ); Tue, 24 Jan 2023 13:52:07 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BD7044BD1; Tue, 24 Jan 2023 10:52:06 -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 36A9A61329; Tue, 24 Jan 2023 18:52:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C1F5C433A0; Tue, 24 Jan 2023 18:52:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674586325; bh=ETUNzGdE1q29ST7qCi2iY3q174yxefVjhGSMsUKt8+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jYUxilzCb2eUCPCGnkS8Eq9AfBcrQuVXg6iCq95NE+ExdI7jQeKsBDgSr+7nWGBKv /8z0vMxXiJwlUB7cAKTxNcEKjIDVBaDdjDVdzDR4YNIrwj356K+XynhyAfRx0Qm9Le V1s5yI4WHIHLtj7fjNfb17gpGY2zqTP0pmbKmD/Q0HVFaBdKC193uYAVxtkOCjQ8WI IgQYYDOZ6QWhlObAx2GyOoBSuqtdXbP8YPOfE7Vm/fvWNkb7quTDIvEOIa6OKnKeD7 +VZj4x/Y4JHPKSmDM8E2PZJy4BoHmlYiLim3p+NAgUppKpJPhDQgQ/vYkQ23q6kuqB LJKWFiv36mJvw== From: Eric Biggers To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: 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.15 07/20] objtool: Add a missing comma to avoid string concatenation Date: Tue, 24 Jan 2023 10:50:57 -0800 Message-Id: <20230124185110.143857-8-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230124185110.143857-1-ebiggers@kernel.org> References: <20230124185110.143857-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?1755931099527359913?= X-GMAIL-MSGID: =?utf-8?q?1755931099527359913?= 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 82ade76dcef2f..758c0ba8de350 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -177,7 +177,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", "kunit_try_catch_throw", "xen_start_kernel", "cpu_bringup_and_idle",