Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Mar 2017 18:06:25 +0000 (10:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Mar 2017 18:06:25 +0000 (10:06 -0800)
commit304362a8bce1a5b7f9491be5a0643cd14a52364d
treec1e54257a4e9cc5327cb4c84e566a8869af62b6e
parentf26db9649af36b8eb76850108113d4056f494537
parent040757f738e13caaa9c5078bca79aa97e11dde88
Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull namespace fix from Eric Biederman:
 "This fixes a race between put_ucounts and get_ucounts that can cause a
  use after free. The fix works by simplifying the code and so there is
  not even a temptation to be clever and play spinlock vs atomic
  reference games"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  ucount: Remove the atomicity from ucount->count