From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E035C61D9D for ; Sat, 25 Nov 2023 10:36:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232034AbjKYKbd (ORCPT ); Sat, 25 Nov 2023 05:31:33 -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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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) -- 2.40.1