Commit b127c16d authored May 18, 2020 by Eric W. Biederman

Merge f87d1c95 ("exec: Move would_dump into flush_old_exec")

The change to exec is relevant to the cleanup work I have been doing.

Merge it here so that I can build on top of it, and so hopefully
that other merge logic can pick up on this and see how to deal
with the conflict between that change and my exec cleanup work.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

parents 27e68f08 f87d1c95

fs/exec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1323,6 +1323,8 @@ int begin_new_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
		*/
		@@ -1870,8 +1872,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