diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-02-16 04:49:59 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-03-17 14:03:56 +0100 |
| commit | 1663b5e456b6dc59d02224f93bd36d4580b94dd5 (patch) | |
| tree | b7e4dfe2c49b8c2cc489eaa13b5341b992048866 | |
| parent | 63543d09044162d59381ca5ffd6dcf6f1d207e2f (diff) | |
ecryptfs: read on a directory should return EISDIR if not supported
commit 323ef68faf1bbd9b1e66aea268fd09d358d7e8ab upstream.
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | 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 a6dc11b9378b..c70772dd528b 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c @@ -333,6 +333,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, |