From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Mar 2015 22:19:48 +0000 (-0800)
Subject: Merge tag 'ecryptfs-4.0-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~2207
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a001af4bbb8a2e4e8ca6805f80b7b04db9aacc3;p=firefly-linux-kernel-4.4.55.git

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
---

8a001af4bbb8a2e4e8ca6805f80b7b04db9aacc3