From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Sep 2016 16:18:33 +0000 (-0700)
Subject: Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: v4.8-rc6~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6905732c80bc7f85602abbe27f7bdc3fe81f56d0;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull fscrypto fixes fromTed Ts'o:
 "Fix some brown-paper-bag bugs for fscrypto, including one one which
  allows a malicious user to set an encryption policy on an empty
  directory which they do not own"

* tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  fscrypto: require write access to mount to set encryption policy
  fscrypto: only allow setting encryption policy on directories
  fscrypto: add authorization check for setting encryption policy
---

6905732c80bc7f85602abbe27f7bdc3fe81f56d0