summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2011-02-16 04:49:59 +0000
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-02-21 14:46:36 -0600
commit323ef68faf1bbd9b1e66aea268fd09d358d7e8ab (patch)
treed728a47b8345f3d45ee388df51cade09a16137db
parent70b8902199003b098fde86d1db02e7465115a02c (diff)
downloadlinux-323ef68faf1bbd9b1e66aea268fd09d358d7e8ab.tar.gz
linux-323ef68faf1bbd9b1e66aea268fd09d358d7e8ab.tar.bz2
linux-323ef68faf1bbd9b1e66aea268fd09d358d7e8ab.zip
ecryptfs: read on a directory should return EISDIR if not supported
read() calls against a file descriptor connected to a directory are incorrectly returning EINVAL rather than EISDIR: [EISDIR] [XSI] [Option Start] The fildes argument refers to a directory and the implementation does not allow the directory to be read using read() or pread(). The readdir() function should be used instead. [Option End] This occurs because we do not have a .read operation defined for ecryptfs directories. Connect this up to generic_read_dir(). BugLink: http://bugs.launchpad.net/bugs/719691 Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
-rw-r--r--fs/ecryptfs/file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 81e10e6a9443..7d1050e254f9 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -317,6 +317,7 @@ ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
const struct file_operations ecryptfs_dir_fops = {
.readdir = ecryptfs_readdir,
+ .read = generic_read_dir,
.unlocked_ioctl = ecryptfs_unlocked_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = ecryptfs_compat_ioctl,