From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Mar 2017 18:06:25 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: v4.11-rc2~39
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=304362a8bce1a5b7f9491be5a0643cd14a52364d;p=users%2Fjedix%2Flinux-maple.git

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

304362a8bce1a5b7f9491be5a0643cd14a52364d