From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 May 2020 19:23:37 +0000 (-0700)
Subject: Merge branch 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: baikal/mips/sdk5.9~13678
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=45b97b77ea09a7827f2476aabaae91dd9364e336;p=kernel.git

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
---

45b97b77ea09a7827f2476aabaae91dd9364e336