ecryptfs: read on a directory should return EISDIR if not supported
PATCH 1/1 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().
--- fs/ecryptfs/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
fs/ecryptfs/file.c +1 -0
@@ -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,
Signature · 1 line
1.7.1
Quoted 8 lines · Andy Whitcroft
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 usingread()orpread(). Thereaddir()function should be used instead. [Option End]
Quoted 5 lines
This occurs because we do not have a .read operation defined for ecryptfs directories. Connect this up to
generic_read_dir().Signed-off-by Andy Whitcroft <[email protected]>
Thanks Andy - applied togit://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next
Tyler
Quoted 19 lines
--- fs/ecryptfs/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)fs/ecryptfs/file.c +1
-0@@ -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,Signature · 1 line
1.7.1