diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-25 13:22:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-25 13:22:05 +0200 |
| commit | 344235f55707f6f7538378e9790cec58e86ebbca (patch) | |
| tree | 8c4f41904450e9b929c162a32faf6141ff26ce75 /fs/exec.c | |
| parent | sc16is7xx: Read the LSR register for basic device presence check (diff) | |
| parent | Linux 5.7-rc7 (diff) | |
| download | linux-344235f55707f6f7538378e9790cec58e86ebbca.tar.xz linux-344235f55707f6f7538378e9790cec58e86ebbca.zip | |
Merge 5.7-rc7 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/exec.c')
| -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 06b4c550af5d..2c465119affc 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -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; |