tree 82c2cdac5cdec9ce9904f470cccb41dad217d680
parent 50d0f78f5c736e974188d72bf9317971e37e69b0
parent c0ee554906c3d6554fbddf95ae664cd9f817082b
author Linus Torvalds <torvalds@linux-foundation.org> 1515006187 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1515006187 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull pid allocation bug fix from Eric Biederman:
 "The replacement of the pid hash table and the pid bitmap with an idr
  resulted in an implementation that now fails more often in low memory
  situations. Allowing fuzzers to observe bad behavior from a memory
  allocation failure during pid allocation.

  This is a small change to fix this by making the kernel more robust in
  the case of error. The non-error paths are left alone so the only
  danger is to the already broken error path. I have manually injected
  errors and verified that this new error handling works"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  pid: Handle failure to allocate the first pid in a pid namespace