[PATCH 1/1] ecryptfs: read on a directory should return EISDIR if not supported
Colin King
colin.king at canonical.com
Thu Feb 16 17:11:07 UTC 2012
From: Andy Whitcroft <apw at canonical.com>
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 at canonical.com>
Signed-off-by: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
(cherry picked from commit 323ef68faf1bbd9b1e66aea268fd09d358d7e8ab)
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
fs/ecryptfs/file.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index d8adc51..3015389 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -323,6 +323,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,
--
1.7.0.4
More information about the kernel-team
mailing list