From patchwork Thu Feb 2 05:25:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51692 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp52383wrn; Wed, 1 Feb 2023 21:29:23 -0800 (PST) X-Google-Smtp-Source: AK7set+zqaKba8D4MPUYF3nlRwZrgoBOCEnz5NyXh4p+ddk9dXf6D8DlcAzcyFyJCeAk/KbJZKLb X-Received: by 2002:a05:6a20:6d1f:b0:be:a27a:d5ba with SMTP id fv31-20020a056a206d1f00b000bea27ad5bamr5265573pzb.0.1675315763034; Wed, 01 Feb 2023 21:29:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675315763; cv=none; d=google.com; s=arc-20160816; b=j/qP+fNff3q5mvszCrzWUnuYWQOQVaC+t9tQEKNvF+/vSupQ2iR4prSkWT1XxfJOpZ trDyX+BVjpM9WPXXxue5DFdrnmqY0ZLDCPIxjEACD6Aoi5hcp51L23xA6oMsJWCzR1cV 1hwBBcXA2NZGqgxsDynvhytmISkm+zJkiZ+2X0uIW4G5967i/BrMnO8D4tRFDq/JAYTn MQwcCSRO1ccN8okckETa/GyeI8s+28esVDyc42Kj1lWnQWarFqRYLN17oBUp8j0oGxL2 PuVh2pB9ajErKuNegaHQcuPKLBNUcpuKM+gw+/qxINk9QYn5ItK7K/LAVHu5K/RJr+eh qyVA== 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=HlUVjx7MR2AUpsiMIzOTaaN47kyIq56+aONYYZRR9bA=; b=lEa+p1zK6DWFNIIQUD8yDjtZnss2wv2Inf1E5+bIrma95iOZUQ5S/2+vbTlIEL+CMS YZJHlgwFPai05sMrMbuwbW1rlsU28yQvdL7aRZ6SVyrzOQ6cgnIs3lG1r2Qkga77XZOp DLO+hM17mijHKSPNN6BGi57dlgjmlR6mWoe5uprA3iWRWl+owgpk+zyCdWOvIre/of7M IJtgxUL4OVafw6MbO/CveSXhdp0gvsR4RGkm49Z72mdj68eCQxswE+f+XxGFErv/DiJA rXXoQkoNo+cJSdhMn8s8MREFR+VrHwQv1gTo5nzvLXAjE4T8EKFC8BBa1WjVGjIBwgQt tT+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UQn4mn6A; 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 q78-20020a632a51000000b00462a6f64703si22406597pgq.376.2023.02.01.21.29.08; Wed, 01 Feb 2023 21:29:23 -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=UQn4mn6A; 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 S229471AbjBBF2J (ORCPT + 99 others); Thu, 2 Feb 2023 00:28:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbjBBF2G (ORCPT ); Thu, 2 Feb 2023 00:28:06 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 271E012853; Wed, 1 Feb 2023 21:28:05 -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 B6660615EB; Thu, 2 Feb 2023 05:28:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5DDAC4339E; Thu, 2 Feb 2023 05:28:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675315684; bh=gMkaknhHOUOvbO7ZN04Mon7pIpUm85+6r8AS4b1iOcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UQn4mn6AUuux27TwN86ZHCGRMsE4Avlp8emzHlKJfzi/PWA8QGO4QmcO4GJhVU6wq SyeOXX1m455EyEVmPKWBHZ1IngGrNKvmFxxXNiJpx9nTJM9O8AcQlJKQbsR2MDphUI OmPVAhSDbZeCuwAmi2iDHbyg/5EhL+a33IcvIalidpUxw7f3AbNfVH4yHZjeb9aISV N2tt8Lg87gvK1PQdT74/I1qNFbfhFTDKK2w4YYC7ZAoE03sidSL02nXUngfTb2xRDq csUhEbdoUIxgM6VYCYzDn+8STskKX7IMSGNP9eWLSB4Bf15X2UO/2k3kJ/SNrFljWK z4julWHZYzllw== 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.19 05/16] objtool: Add a missing comma to avoid string concatenation Date: Wed, 1 Feb 2023 21:25:53 -0800 Message-Id: <20230202052604.179184-6-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202052604.179184-1-ebiggers@kernel.org> References: <20230202052604.179184-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?1756695901572797454?= X-GMAIL-MSGID: =?utf-8?q?1756695901572797454?= 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 0477190557107..55f3e7fa1c5d0 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -168,7 +168,7 @@ static int __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", }; if (func->bind == STB_WEAK)