Commit b48397cb authored May 17, 2020 by Linus Torvalds

user-namespace

Pull execve fix from Eric Biederman:
 "While working on my exec cleanups I found a bug in exec that I
  introduced by accident a couple of years ago. I apparently missed the
  fact that bprm->file can change.

  Now I have a very personal motive to clean up exec and make it more
  approachable.

  The change is just moving woud_dump to where it acts on the final
  bprm->file not the initial bprm->file. I have been careful and tested
  and verify this fix works"

* 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  exec: Move would_dump into flush_old_exec

parents ef0d5b91 f87d1c95

fs/exec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1317,6 +1317,8 @@ int flush_old_exec(struct linux_binprm * bprm)
		*/
		set_mm_exe_file(bprm->mm, bprm->file);

		would_dump(bprm, bprm->file);

		/*
		* Release all of the old mmap stuff
		*/
		@@ -1876,8 +1878,6 @@ static int __do_execve_file(int fd, struct filename *filename,
		if (retval < 0)
		goto out;

		would_dump(bprm, bprm->file);

		retval = exec_binprm(bprm);
		if (retval < 0)
		goto out;

Admin message