From patchwork Fri Feb 3 00:27:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 52219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp555478wrn; Thu, 2 Feb 2023 16:28:53 -0800 (PST) X-Google-Smtp-Source: AK7set94xDuBxjc3QBRxoOGkqiY3QIPGteZ1HAvyiIXER04eghCbDKsjYGw1cqMFBdYyS6DRYl99 X-Received: by 2002:a17:90b:4c51:b0:225:f901:ebf8 with SMTP id np17-20020a17090b4c5100b00225f901ebf8mr8200088pjb.18.1675384133657; Thu, 02 Feb 2023 16:28:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675384133; cv=none; d=google.com; s=arc-20160816; b=EagFtcR/RgQa+/o+ZH53XQyuIDeJqTnUM4Ujcn3c1bHuYGURd9sL8+PAkGQMMYbH6d 8tmzzo+Gu+WBKnJpWF+toWjM6YIgW2e6qL3HSCyslWBQCyedZtId0TY1x6wlqnIlNDKm d9TrFDLJIOulzJUKza/5AjLkCZso0rvzXVcFKXVkj0ilb17QhriLN0pbOlrXogvpthG2 ybmXO9A7XGZDcgS81q2gYZoAKImmaEXDytnKCq8s4LU8M391UhJEOYTqMEoXpp+mD85V KS5D/+mzI9cSwPNVGWIHLUuTVOc5zT7Cu7J6VpP2kTzhnDJWadn5hMV2G0YedkFjnrbk pF8g== 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=ZlxrH2ARP2CsoFIz63wyNEqi2LKCtobPqPxofNK1AH+/ScDU8qRDnsCh3WG8D6Hv1n f+bCJlO4qbCBy7iE0NU10jfl1uFKEt3mmKHvsFlSX+e7sG/QhmpFFAPAvU4wjCm7p9uT Pr8QIe/rqu2woA3LeDOTkWev4hPMfONvlFr1srR8IIirClHQrz0ILRlAUklokd7m/dMi M+aSyj9syCYGZ9lLmTKYMvV8U7zsTjcSZTyKbGCDaOK3gRPGE4hESVgINrBdkgm3nGJR phIv2anQ58pop+XETiizmP48P+lnboy2GNj+bXJSEVxcykLJLldsIG/Skt1RNVsmPB3b GbYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=no1pyuVn; 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 i198-20020a636dcf000000b004da13f2c14esi967433pgc.710.2023.02.02.16.28.40; Thu, 02 Feb 2023 16:28:53 -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=no1pyuVn; 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 S233209AbjBCA2T (ORCPT + 99 others); Thu, 2 Feb 2023 19:28:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232142AbjBCA2H (ORCPT ); Thu, 2 Feb 2023 19:28:07 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57731233E0; Thu, 2 Feb 2023 16:28: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 E4CBE61D38; Fri, 3 Feb 2023 00:28:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06B9CC433A7; Fri, 3 Feb 2023 00:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384085; bh=gMkaknhHOUOvbO7ZN04Mon7pIpUm85+6r8AS4b1iOcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=no1pyuVnYmMPw+FlEWw7leFN33IgSuFQvQ03xKn3qyG8Do7RJzD0/t1cjhHav9sZL /QVdpKhwMra2fIgQkgI+cZlCKSoRmnrmvvOY6bBiBMqr98SmI+NOYQvOQHExxK67DZ hAgYtIHm8qOcsh7u1aSacyPn6+Jsyr8Hab6PmtbA6UJ/XlkCASn6u/vZ7fnVX62/Hs li7ViTQeFy1Xy/r4GA3Wh5VRvPpUw/CBC4YRx1AQYw76X7/iWGFhjRd/GWkjFxJOa9 W/zjAe8IN8bmV79Z/g5+ltMKix3R89L3TSL5AkDBu+Lz+Y0FXJ1L+WTK4Yf684Tmwa 94GSnpKBLfG2w== 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 v2 04/15] objtool: Add a missing comma to avoid string concatenation Date: Thu, 2 Feb 2023 16:27:06 -0800 Message-Id: <20230203002717.49198-5-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230203002717.49198-1-ebiggers@kernel.org> References: <20230203002717.49198-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?1756767593732257844?= X-GMAIL-MSGID: =?utf-8?q?1756767593732257844?= 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)