Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Eric W. Biederman" <ebiederm@xmission.com>
To:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc:     Alexander Viro <viro@zeniv.linux.org.uk>,
        Christian Brauner <brauner@kernel.org>,
        Kees Cook <keescook@chromium.org>,
        linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
References: <53150beae5dc04dac513dba391a2e4ae8696a7f3.1685290790.git.christophe.jaillet@wanadoo.fr>
        <4f5e4096ad7f17716e924b5bd080e5709fc0b84b.1685290790.git.christophe.jaillet@wanadoo.fr>
Date:   Sun, 28 May 2023 11:34:13 -0500
In-Reply-To: <4f5e4096ad7f17716e924b5bd080e5709fc0b84b.1685290790.git.christophe.jaillet@wanadoo.fr>
        (Christophe JAILLET's message of "Sun, 28 May 2023 18:20:25 +0200")
Message-ID: <87sfbgjtyy.fsf@email.froward.int.ebiederm.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [PATCH 2/2] binfmt: Slightly simplify elf_fdpic_map_file()
Precedence: bulk

Christophe JAILLET <christophe.jaillet@wanadoo.fr> writes:

> There is no point in initializing 'load_addr' and 'seg' here, they are both
> re-written just before being used below.
>
> Doing so, 'load_addr' can be moved in the #ifdef CONFIG_MMU section.
>

Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>

Kees do you maybe want to pick these trivial fixes up?

> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested on arm, with and without CONFIG_MMU
> ---
>  fs/binfmt_elf_fdpic.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
> index 237ce388d06d..1c6c5832af86 100644
> --- a/fs/binfmt_elf_fdpic.c
> +++ b/fs/binfmt_elf_fdpic.c
> @@ -743,11 +743,12 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
>  	struct elf32_fdpic_loadmap *loadmap;
>  #ifdef CONFIG_MMU
>  	struct elf32_fdpic_loadseg *mseg;
> +	unsigned long load_addr;
>  #endif
>  	struct elf32_fdpic_loadseg *seg;
>  	struct elf32_phdr *phdr;
> -	unsigned long load_addr, stop;
>  	unsigned nloads, tmp;
> +	unsigned long stop;
>  	int loop, ret;
>  
>  	/* allocate a load map table */
> @@ -768,9 +769,6 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
>  	loadmap->version = ELF32_FDPIC_LOADMAP_VERSION;
>  	loadmap->nsegs = nloads;
>  
> -	load_addr = params->load_addr;
> -	seg = loadmap->segs;
> -
>  	/* map the requested LOADs into the memory space */
>  	switch (params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) {
>  	case ELF_FDPIC_FLAG_CONSTDISP: