From patchwork Sat Nov 25 10:31:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169695 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1852376vqx; Sat, 25 Nov 2023 02:32:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2FewNMNps7RgYB4PJpU1+CzdyJko54+P2JA6htwUTupOWN8WNuxWgpuiSKqohc387VAf0 X-Received: by 2002:a17:903:1c8:b0:1cf:a7c2:328d with SMTP id e8-20020a17090301c800b001cfa7c2328dmr4230403plh.2.1700908369264; Sat, 25 Nov 2023 02:32:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700908369; cv=none; d=google.com; s=arc-20160816; b=WqKGl0zfdH/e+ZMrWI+q/QbqqHbweUSy3Hu8KCnwwTTAKIku3Abm6NA94teCjQkH2M hNkuLGpzM4CajmKQTCl834vjPCnxTdgAVfDuo+QMwEqO1o+yILC3jaFGjf4BSlvqW7jp uHYRPtzQrRQN22IsBiXwtVnhw7tdfZJ/XD8GgN587rgSHs9p9qd8ns95rLjGuwSR6/bU GvbJLWCFswsQv5ztmQ0eMShtaEp5vWw1Bu0CTs8DxDdy+ZKpyQlQLpsaMXl2ceBIPGEB qCA3J9Vygt4aIZeLvy1mOBH3fv50miykGzTOIIfDtYfwBMpFmzDdCO5SURkpc5el9+Gg OBQg== 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=VARC/WNFp3JOJiW0eqX2EFDvulAcY6WaI1xjuUpLg30=; fh=F+Qhsb4TVrOlwRrBD6xyWmL3Oi8a5RmaiYFzloXnqNA=; b=tWBzKwRmvuMZkiw6tdgv3q7+MASncjoo6Ag5lngVdcs2q4yDVFrGbVnYKS8eKmBc8v 0RPqyF81SNMVdBNaXuSOgb+TEz7kQZcKzHEBsK8zoRC4SD72aMDN300q9+WoKshtbQ0O xa8cCXbK6SyJC9XaSIwzdwG4HBnC5ZMGk8+KYO1WVY3t9FIJFgxedOEWtVcCafFcmGVO q/OL6rVsXWryqwgvnKdOj9LfyXkoJGd7lt6wkEbMKh5c6XaHs9dqdLuiQo9fZ56Brt5Y qHEYO7MI2jgfgpLVkGA0YgK3iPFuETQGXE+p2u/9O9Qveo8N5/T1LEwU5bT6NgCdwJcO ocNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PDxIF4NT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id i9-20020a170902c94900b001cfb52101fesi1047225pla.214.2023.11.25.02.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 02:32:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PDxIF4NT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5F32880755E1; Sat, 25 Nov 2023 02:31:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231886AbjKYKbc (ORCPT + 99 others); Sat, 25 Nov 2023 05:31:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231873AbjKYKb2 (ORCPT ); Sat, 25 Nov 2023 05:31:28 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F025D62 for ; Sat, 25 Nov 2023 02:31:35 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E947FC433C8; Sat, 25 Nov 2023 10:31:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700908294; bh=zXAi/9CNLqqmyNpA1eHsdMgrholOb1Cem6oT1U9JQNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PDxIF4NTuqIxsAI3HnxjK3nRVHtYRRrbTyEAn91gJaUSI+4jcXTx7+ZmEb0DiRpuw ZpEB3K3hDfONj7vO+ClsEoi4G6OaSM5mBhq8t3yFd5gJBfju+qPh5dxc6/7QmP8AET QjHILXceyTEE+584cTyh6nQKAlk+1jLk7sXrqP8/oZBVl3QT0UVXbEpwlO1XfxwZVs aeM0IfKjS4y6KQ9Hacx76TpyKvhbQ0fbbjccFIR9qun5Y23cj/Cep7TC+CNO1iMhma bHKSgMjUFLo5bEgF7sfoYFvBATQgsbUGvLZ8IVDR2kji2kUgCw4iJ42E8l/BkXm6nm IYN+/qEqZ3sDA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nicolas Schier , Masahiro Yamada Subject: [PATCH 3/3] modpost: move exit(1) for fatal() to modpost.h Date: Sat, 25 Nov 2023 19:31:16 +0900 Message-Id: <20231125103116.797608-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231125103116.797608-1-masahiroy@kernel.org> References: <20231125103116.797608-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 25 Nov 2023 02:31:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783531694126566609 X-GMAIL-MSGID: 1783531694126566609 fatal() never returns, but compilers are not aware of this fact because exit(1) is called within the modpost_log() definition. Move exit(1) to the fatal() macro so that compilers can identify unreachable code flows. Remove the initializer for 'taddr' in section_rel(), as compilers now recognize this is not an uninitialized bug. Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor --- scripts/mod/modpost.c | 4 +--- scripts/mod/modpost.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 013fc5031bc7..696c583a14ec 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -84,8 +84,6 @@ void modpost_log(enum loglevel loglevel, const char *fmt, ...) vfprintf(stderr, fmt, arglist); va_end(arglist); - if (loglevel == LOG_FATAL) - exit(1); if (loglevel == LOG_ERROR) error_occurred = true; } @@ -1415,7 +1413,7 @@ static void section_rel(struct module *mod, struct elf_info *elf, for (rel = start; rel < stop; rel++) { Elf_Sym *tsym; - Elf_Addr taddr = 0, r_offset; + Elf_Addr taddr, r_offset; unsigned int r_type, r_sym; void *loc; diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 9fe974dc1a52..aaa67b24775e 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -215,4 +215,4 @@ modpost_log(enum loglevel loglevel, const char *fmt, ...); */ #define warn(fmt, args...) modpost_log(LOG_WARN, fmt, ##args) #define error(fmt, args...) modpost_log(LOG_ERROR, fmt, ##args) -#define fatal(fmt, args...) modpost_log(LOG_FATAL, fmt, ##args) +#define fatal(fmt, args...) do { modpost_log(LOG_FATAL, fmt, ##args); exit(1); } while (1)