Skip to content

Commit b127c16

Browse files
committed
Merge f87d1c9 ("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" <[email protected]>
2 parents 27e68f0 + f87d1c9 commit b127c16

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/exec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,6 +1323,8 @@ int begin_new_exec(struct linux_binprm * bprm)
13231323
*/
13241324
set_mm_exe_file(bprm->mm, bprm->file);
13251325

1326+
would_dump(bprm, bprm->file);
1327+
13261328
/*
13271329
* Release all of the old mmap stuff
13281330
*/
@@ -1870,8 +1872,6 @@ static int __do_execve_file(int fd, struct filename *filename,
18701872
if (retval < 0)
18711873
goto out;
18721874

1873-
would_dump(bprm, bprm->file);
1874-
18751875
retval = exec_binprm(bprm);
18761876
if (retval < 0)
18771877
goto out;

0 commit comments

Comments
 (0)