Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 14:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

execve fix for v6.11-rc6

Browse Source 
- binfmt_elf_fdpic: fix AUXV size with ELF_HWCAP2 (Max Filippov)
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQRSPkdeREjth1dHnSE2KwveOeQkuwUCZtDUTAAKCRA2KwveOeQk
 u/G1AP95bAt6g/+da7pGzS3KwdCZVUNL36kaZvoj8zH7ShVMkQD9GotercPaISh1
 PURnWKPYUrMxaHGUxRc0IOXBRPTeXgo=
 =FRmR
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-08-30 12:32:53 +12:00
commit 1b5fe53681
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/binfmt_elf_fdpic.c
View File

@ -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);