Merge tag 'ecryptfs-4.0-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2015 22:19:48 +0000 (14:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2015 22:19:48 +0000 (14:19 -0800)
commit8a001af4bbb8a2e4e8ca6805f80b7b04db9aacc3
tree7a5edb93910026735d53cf6adea897ef0513e712
parent6587457b4b3d663b237a0f95ddf6e67d1828c8ea
parent6d65261a09adaa374c05de807f73a144d783669e
Merge tag 'ecryptfs-4.0-rc3-fixes' of git://git./linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs fixes from Tyler Hicks:
 "Fixes for proper ioctl handling and an untriggerable buffer overflow

   - The eCryptfs ioctl handling functions should only pass known-good
     ioctl commands to the lower filesystem

   - A static checker found a potential buffer overflow.  Upon
     inspection, it is not triggerable due to input validation performed
     on the mount parameters"

* tag 'ecryptfs-4.0-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: don't pass fs-specific ioctl commands through
  eCryptfs: ensure copy to crypt_stat->cipher does not overrun