From patchwork Sat Nov 25 10:31:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1854486vqx; Sat, 25 Nov 2023 02:39:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzZvBfxLM7kL2ZvIt8OLOI1BZHZiPAbbMadMH4j4ygq/cqW7gkWN8fYgXdynto8vr7QSS2 X-Received: by 2002:a05:6830:456:b0:6d3:19bf:2d16 with SMTP id d22-20020a056830045600b006d319bf2d16mr6416092otc.12.1700908746745; Sat, 25 Nov 2023 02:39:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700908746; cv=none; d=google.com; s=arc-20160816; b=G9mfAselH4xArII/VZmJ/eNEgxkLNPqXPnNV5xMu7F0vFE0GEuMp2/3aqeqiOkfi9l 19leW6AIOGPwzo3sG7p4i/ZQ62q1GWHJJv7OrlIIduUPMUnbnM6OjA65puQiWlQOLM0z 6UaiJ0BWkG1L1PDYi3j7hErLmNhCm9OWcgSPkailI2EVojl/sPwDjA3NNXXlBcWGAepk NGbRt55BadyggMeHomU7YYWRL4yO0ENYGJo79xU0E6E0osuRsT9TXTU/lvR45FGbWgjX CGPgU5J85jpGcM7KZ0nxEAAzwoEXw94fEsoZXvt2asa+for+6Mimsoz74Vj8bTAB/ZAQ WXiA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=PXFneQjP6zgIu5wP25pIwVR/uw+BBfx38amLHoRbtvU=; fh=F+Qhsb4TVrOlwRrBD6xyWmL3Oi8a5RmaiYFzloXnqNA=; b=Dy27wF/l/RtwSxU6nK/5LqNOGaC36Hk5qoI9Kz36/5KWmjGcymQ5vl33IvmoPZrsTT VkBk/cdGsx9zYxIWlSsNb+Kxy7HLvhIxvMLelZ0cbksueYTAF+K48OGQnEwVhUwX5q5d WXZMxclQXcKUVCgx2mKqM97uHt2ujRFqbL0AWm+akxiALf5G7MKocpjjzItdlxEoaB19 etcTFGz2tgTwrGvmOuuZrfwMY1g3L5SG8simUnULn8RTBSRVOl3h7oe3b7VyfEEVnow/ joNUpXQ6TOnPVxElycaS7/dcsKxZmA4smHcE1QmTp8GkYkuNsnPlmKHvorbFonWWWTNd tVzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MVlOFapV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id p14-20020a63e64e000000b005be109a793csi5480259pgj.444.2023.11.25.02.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 02:39:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MVlOFapV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 098C68062422; Sat, 25 Nov 2023 02:38:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231856AbjKYKik (ORCPT + 99 others); Sat, 25 Nov 2023 05:38:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232023AbjKYKbZ (ORCPT ); Sat, 25 Nov 2023 05:31:25 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88D6E10E4 for ; Sat, 25 Nov 2023 02:31:32 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4015CC433C8; Sat, 25 Nov 2023 10:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700908292; bh=1NjYyVMTbEYrYJbWYo16fYRJ4go93r4tTFjTVNLyfms=; h=From:To:Cc:Subject:Date:From; b=MVlOFapVpx90KH1wMWShYB/xzzNDh16Atogs82J3zghXoqUFi+xcapJ6fODrvVGTj f8PKozrX4yioUdDuibC4/52x5/HDy9jh35vyHoK+iBupoTA71fJr+6k4z6645jg/H3 1DeDWjz3kfsDpEBTUtmK/rSdVRrAMSH8fE0niSrFj27KTeohvchgKXObM8Yv+iBfH0 zwpEh9eRbOZOChuT7cADbeikGoVOADxGNRSWqov7vBf+f+53FjfsWulDh6Q92P88FW ydTuV0NieSNCF0TTpjTj4wRpSEmRMBggu7emM7j7pbGQcOdiGN2CUYYWPjgOS4m9qy FTIcDOzAUT3fw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nicolas Schier , Masahiro Yamada Subject: [PATCH 1/3] modpost: move __attribute__((format(printf, 2, 3))) to modpost.h Date: Sat, 25 Nov 2023 19:31:14 +0900 Message-Id: <20231125103116.797608-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Sat, 25 Nov 2023 02:38:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783532089666749730 X-GMAIL-MSGID: 1783532089666749730 This attribute must be added to the function declaration in a header for comprehensive checking of all the callsites. Fixes: 6d9a89ea4b06 ("kbuild: declare the modpost error functions as printf like") Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor --- scripts/mod/modpost.c | 3 +-- scripts/mod/modpost.h | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cb6406f485a9..ca0a90158f85 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -60,8 +60,7 @@ static unsigned int nr_unresolved; #define MODULE_NAME_LEN (64 - sizeof(Elf_Addr)) -void __attribute__((format(printf, 2, 3))) -modpost_log(enum loglevel loglevel, const char *fmt, ...) +void modpost_log(enum loglevel loglevel, const char *fmt, ...) { va_list arglist; diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 69baf014da4f..9fe974dc1a52 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -197,7 +197,8 @@ enum loglevel { LOG_FATAL }; -void modpost_log(enum loglevel loglevel, const char *fmt, ...); +void __attribute__((format(printf, 2, 3))) +modpost_log(enum loglevel loglevel, const char *fmt, ...); /* * warn - show the given message, then let modpost continue running, still From patchwork Sat Nov 25 10:31:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169694 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1851921vqx; Sat, 25 Nov 2023 02:31:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuTfec2oX527Y+UgxeQn5EgGxmRhV12GCMeG19PimNF3Q9YExg5+jzRfasC05OV65CevbF X-Received: by 2002:a05:6a00:bef:b0:691:27b:15b4 with SMTP id x47-20020a056a000bef00b00691027b15b4mr12525967pfu.5.1700908301249; Sat, 25 Nov 2023 02:31:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700908301; cv=none; d=google.com; s=arc-20160816; b=PFLImH00jcp+IC+NFXselhuXAhO4IUwloy0afZUvcaCulRTgb1x6GaQfBi9PMK6zXU akQYOUyj2sHpj0FvsigJ8rl7IQqj20HIbl6+zDVYglqd0DRePAnf/mdWBRwjActIiVNe jUjsySJWAe0BbyRCCun5kE0Y23x9lvX4KGTA07nwzYBt6X+/G5pJ50pFmYhvdYE7DcfI yq/I7Z++oCVLLqjlXle4VgIFNwFJTATRc1XP9KAQlvEk1JF8sVFW95dve0dlGvnObPLx XAeeKQSE4lNSHH2NJbvnVQKRBXSqyI59BeCm5S6CpwZT+t49DaEI+xjiJK0iTDFMCJcJ DAvQ== 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=pVC2HAAzEscbAfdKesy5nONZtvJyy0YX7vG1YZQBLxI=; fh=F+Qhsb4TVrOlwRrBD6xyWmL3Oi8a5RmaiYFzloXnqNA=; b=JLmpUdP0mAmbaQliovkaMh3/c1Ouz1qeKw362n621dFhY8NgBwhrGwzKkpfyOxcxrA t1FwWRakjliNd8V/Srp7ukluWqVGtV2noeGTFOhcg6DjHnbQpuH7NBlkjJepLNAAzZoF WNgtuZ53vWmZdaqq77NYDVylRvdd3iGUDebkMWD1I00gx7QMYOmU4tBQwU3v4zg3xNEQ HzBfu+C/xMeWSelbZtEMzN7TZf31D6cM93SDOE7e3uTr2/TyCItbf257IWo5nM1h3fXP PqUu2vav+NHgn0mbL6RPJIsmPVdWFsoXp19jiAPi7ixcljxSeoDs7bouoV/JNdWAMpdR Vb+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Hy1V/roH"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id q9-20020a656249000000b005bdbda280c2si5402589pgv.364.2023.11.25.02.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 02:31:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Hy1V/roH"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 9608B8024C5A; Sat, 25 Nov 2023 02:31:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231887AbjKYKb2 (ORCPT + 99 others); Sat, 25 Nov 2023 05:31:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231847AbjKYKb1 (ORCPT ); Sat, 25 Nov 2023 05:31:27 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC14E10DC for ; Sat, 25 Nov 2023 02:31:33 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9869DC433CB; Sat, 25 Nov 2023 10:31:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700908293; bh=UQohXr4Q1HYdYBXHCpAgYPqYqu05A8PQAIBFeD9Rs4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hy1V/roHQPewcPQbyO4u0xgO+U/7AUQ6zHeTG+3A4iGhHH8I2gAOF+bTlcFIZNaqy E6kbL5ccawosHgiy1iOLfy2rgMDXKQQzrflVIUepKiyjaRVORIA1uqy35KeyT2r41s CYCoiG1Hh8xCxCIEFCGr9INRlFd4O6FHtPAFPb4OO3t5vg+62alSTU1X1z9irnvnDw QrzXFlJpbkKY7fWGDNcxeOKUpbOwpiLwaswfOm0c59LIR7GOPVwT4FoUCaA7lg1YqO xAqtE4SqovC/rVLuV7UvFrY9+K9D/9Qwif8QwF7uF3pzDhDC83pyd8niOrKYqSUFze VLZZB6DeGtB3g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nicolas Schier , Masahiro Yamada Subject: [PATCH 2/3] modpost: remove unreachable code after fatal() Date: Sat, 25 Nov 2023 19:31:15 +0900 Message-Id: <20231125103116.797608-2-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=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Sat, 25 Nov 2023 02:31:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783531622630363506 X-GMAIL-MSGID: 1783531622630363506 fatal() never returns. Remove unreachable code. Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor --- scripts/mod/modpost.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index ca0a90158f85..013fc5031bc7 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -473,11 +473,9 @@ static int parse_elf(struct elf_info *info, const char *filename) fatal("%s: not relocatable object.", filename); /* Check if file offset is correct */ - if (hdr->e_shoff > info->size) { + if (hdr->e_shoff > info->size) fatal("section header offset=%lu in file '%s' is bigger than filesize=%zu\n", (unsigned long)hdr->e_shoff, filename, info->size); - return 0; - } if (hdr->e_shnum == SHN_UNDEF) { /* @@ -515,12 +513,11 @@ static int parse_elf(struct elf_info *info, const char *filename) const char *secname; int nobits = sechdrs[i].sh_type == SHT_NOBITS; - if (!nobits && sechdrs[i].sh_offset > info->size) { + if (!nobits && sechdrs[i].sh_offset > info->size) fatal("%s is truncated. sechdrs[i].sh_offset=%lu > sizeof(*hrd)=%zu\n", filename, (unsigned long)sechdrs[i].sh_offset, sizeof(*hdr)); - return 0; - } + secname = secstrings + sechdrs[i].sh_name; if (strcmp(secname, ".modinfo") == 0) { if (nobits) 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)