Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Sep 2016 16:18:33 +0000 (09:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Sep 2016 16:18:33 +0000 (09:18 -0700)
commit6905732c80bc7f85602abbe27f7bdc3fe81f56d0
tree8d181da54cd9e57e1004553a0e76f30606bf6142
parentd0acc7dfd90eb97e90ccd42a567034017ec60fb8
parentba63f23d69a3a10e7e527a02702023da68ef8a6d
Merge tag 'for_linus_stable' of git://git./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