diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2020-05-18 15:11:17 +0300 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-05-18 15:12:43 +0300 |
| commit | b127c16d0603e1f995e3d08b71d2c3100727e2c1 (patch) | |
| tree | aac48e154502d110d95a3f0cfee8b5f97836255b | |
| parent | 27e68f086393b34ada9d5e2bb255f74abe7dc19a (diff) | |
| parent | f87d1c9559164294040e58f5e3b74a162bf7c6e8 (diff) | |
| download | linux-b127c16d0603e1f995e3d08b71d2c3100727e2c1.tar.xz | |
Merge f87d1c955916 ("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>
| -rw-r--r-- | fs/exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c index 9aa08ce2ffcc..14b786158aa9 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -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; |