From: sunliming <sunliming@kylinos.cn>

Fix below kernel warning:
fs/binfmt_elf_fdpic.c:1024:52: warning: variable 'excess1' set but not
used [-Wunused-but-set-variable]

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: sunliming <sunliming@kylinos.cn>
Reviewed-by: Jan Kara <jack@suse.cz>
---
 fs/binfmt_elf_fdpic.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index e3cf2801cd64..a1ad3c94b2b7 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1024,7 +1024,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
 	/* deal with each load segment separately */
 	phdr = params->phdrs;
 	for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
-		unsigned long maddr, disp, excess, excess1;
+		unsigned long maddr, disp, excess;
 		int prot = 0, flags;
 
 		if (phdr->p_type != PT_LOAD)
@@ -1120,9 +1120,10 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
 		 *   extant in the file
 		 */
 		excess = phdr->p_memsz - phdr->p_filesz;
-		excess1 = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK);
 
 #ifdef CONFIG_MMU
+		unsiged long excess1
+			= PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK);
 		if (excess > excess1) {
 			unsigned long xaddr = maddr + phdr->p_filesz + excess1;
 			unsigned long xmaddr;
-- 
2.25.1

On Sat, 08 Mar 2025 10:27:54 +0800, sunliming@linux.dev wrote:
> Fix below kernel warning:
> fs/binfmt_elf_fdpic.c:1024:52: warning: variable 'excess1' set but not
> used [-Wunused-but-set-variable]
> 
> 

Adjusted Subject for typos.

Applied to for-next/execve, thanks!

[1/1] binfmt_elf_fdpic: fix variable set but not used warning
      https://git.kernel.org/kees/c/7845fe65b33d

Take care,

-- 
Kees Cook

On Sat, Mar 8, 2025 at 3:45 AM Kees Cook <kees@kernel.org> wrote:
>
> On Sat, 08 Mar 2025 10:27:54 +0800, sunliming@linux.dev wrote:
> > Fix below kernel warning:
> > fs/binfmt_elf_fdpic.c:1024:52: warning: variable 'excess1' set but not
> > used [-Wunused-but-set-variable]
> >
> >
>
> Adjusted Subject for typos.
>
> Applied to for-next/execve, thanks!
>
> [1/1] binfmt_elf_fdpic: fix variable set but not used warning
>       https://git.kernel.org/kees/c/7845fe65b33d
>

FYI, there's a typo so this patch won't compile

>+ unsiged long excess1
>+ = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK);

s/unsiged/unsigned/

:)

-- 
Pedro

On Sat, Mar 08, 2025 at 04:01:50AM +0000, Pedro Falcato wrote:
> On Sat, Mar 8, 2025 at 3:45 AM Kees Cook <kees@kernel.org> wrote:
> >
> > On Sat, 08 Mar 2025 10:27:54 +0800, sunliming@linux.dev wrote:
> > > Fix below kernel warning:
> > > fs/binfmt_elf_fdpic.c:1024:52: warning: variable 'excess1' set but not
> > > used [-Wunused-but-set-variable]
> > >
> > >
> >
> > Adjusted Subject for typos.
> >
> > Applied to for-next/execve, thanks!
> >
> > [1/1] binfmt_elf_fdpic: fix variable set but not used warning
> >       https://git.kernel.org/kees/c/7845fe65b33d
> >
> 
> FYI, there's a typo so this patch won't compile
> 
> >+ unsiged long excess1
> >+ = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK);
> 
> s/unsiged/unsigned/

D'oh. Fixing in my tree..

-- 
Kees Cook