Merge branch 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/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

Changed files
+2 -2
fs
+2 -2
fs/exec.c
··· 1317 1317 */ 1318 1318 set_mm_exe_file(bprm->mm, bprm->file); 1319 1319 1320 + would_dump(bprm, bprm->file); 1321 + 1320 1322 /* 1321 1323 * Release all of the old mmap stuff 1322 1324 */ ··· 1877 1875 retval = copy_strings(bprm->argc, argv, bprm); 1878 1876 if (retval < 0) 1879 1877 goto out; 1880 - 1881 - would_dump(bprm, bprm->file); 1882 1878 1883 1879 retval = exec_binprm(bprm); 1884 1880 if (retval < 0)