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)