Commit 1b5fe536 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'execve-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull execve fix from Kees Cook:

 - binfmt_elf_fdpic: fix AUXV size with ELF_HWCAP2 (Max Filippov)

* tag 'execve-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  binfmt_elf_fdpic: fix AUXV size calculation when ELF_HWCAP2 is defined
parents 04c8abae c6a09e34

fs/binfmt_elf_fdpic.c

+3 −0
Original line number Diff line number Diff line
@@ -589,6 +589,9 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, 


	if (bprm->have_execfd)

		nitems++;

#ifdef ELF_HWCAP2

	nitems++;

#endif



	csp = sp;

	sp -= nitems * 2 * sizeof(unsigned long);