public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
From: Nathan Chancellor <nathan@kernel.org>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicolas Schier <nicolas@fjasle.eu>
Subject: Re: [PATCH 2/3] modpost: remove unreachable code after fatal()
Date: Wed, 29 Nov 2023 17:29:43 -0700	[thread overview]
Message-ID: <20231130002943.GC2513828@dev-arch.thelio-3990X> (raw)
In-Reply-To: <20231125103116.797608-2-masahiroy@kernel.org>

On Sat, Nov 25, 2023 at 07:31:15PM +0900, Masahiro Yamada wrote:
> fatal() never returns. Remove unreachable code.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
> 
>  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)
> -- 
> 2.40.1
> 

  reply	other threads:[~2023-11-30  0:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-25 10:31 [PATCH 1/3] modpost: move __attribute__((format(printf, 2, 3))) to modpost.h Masahiro Yamada
2023-11-25 10:31 ` [PATCH 2/3] modpost: remove unreachable code after fatal() Masahiro Yamada
2023-11-30  0:29   ` Nathan Chancellor [this message]
2023-11-25 10:31 ` [PATCH 3/3] modpost: move exit(1) for fatal() to modpost.h Masahiro Yamada
2023-11-30  0:32   ` Nathan Chancellor
2023-12-03  9:03     ` Masahiro Yamada
2023-11-30  0:17 ` [PATCH 1/3] modpost: move __attribute__((format(printf, 2, 3))) " Nathan Chancellor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231130002943.GC2513828@dev-arch.thelio-3990X \
    --to=nathan@kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=nicolas@fjasle.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox