]> Git Repo - J-linux.git/commitdiff
Merge tag 'execve-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <[email protected]>
Wed, 27 Mar 2024 16:57:30 +0000 (09:57 -0700)
committerLinus Torvalds <[email protected]>
Wed, 27 Mar 2024 16:57:30 +0000 (09:57 -0700)
Pull execve fixes from Kees Cook:

 - Fix selftests to conform to the TAP output format (Muhammad Usama
   Anjum)

 - Fix NOMMU linux_binprm::exec pointer in auxv (Max Filippov)

 - Replace deprecated strncpy usage (Justin Stitt)

 - Replace another /bin/sh instance in selftests

* tag 'execve-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  binfmt: replace deprecated strncpy
  exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
  selftests/exec: Convert remaining /bin/sh to /bin/bash
  selftests/exec: execveat: Improve debug reporting
  selftests/exec: recursion-depth: conform test to TAP format output
  selftests/exec: load_address: conform test to TAP format output
  selftests/exec: binfmt_script: Add the overall result line according to TAP

1  2 
fs/exec.c

diff --combined fs/exec.c
index ff6f26671cfc0207961267ee1b95155d0733e835,f666398205800afcb432c6a7eedb049b2c069483..cf1df7f16e55cc7516236c724bd64f10affe9407
+++ b/fs/exec.c
@@@ -895,6 -895,7 +895,7 @@@ int transfer_args_to_stack(struct linux
                        goto out;
        }
  
+       bprm->exec += *sp_location - MAX_ARG_PAGES * PAGE_SIZE;
        *sp_location = sp;
  
  out:
@@@ -1158,6 -1159,7 +1159,6 @@@ static int de_thread(struct task_struc
  
                BUG_ON(leader->exit_state != EXIT_ZOMBIE);
                leader->exit_state = EXIT_DEAD;
 -
                /*
                 * We are going to release_task()->ptrace_unlink() silently,
                 * the tracer can sleep in do_wait(). EXIT_DEAD guarantees
This page took 0.055426 seconds and 4 git commands to generate.