]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2020 19:59:56 +0000 (12:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2020 19:59:56 +0000 (12:59 -0700)
commit15ee1b4a3bcfbbbc1784f0d0089afd0f235adab6
tree33fc81013077804e4bdea9465de66144ca1d025b
parentfc4a8b4ac137d3e916ca3bd086ea109c95c1275f
parent8013ccab31a5028598c08c24b8b8f3be422097b1
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull proc fix from Eric Biederman:
 "A brown paper bag slipped through my proc changes, and syzcaller
  caught it when the code ended up in your tree.

  I have opted to fix it the simplest cleanest way I know how, so there
  is no reasonable chance for the bug to repeat"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  proc: Use a dedicated lock in struct pid
kernel/pid.c