Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 323ef68f authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Tyler Hicks
Browse files

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: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 70b89021

fs/ecryptfs/file.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -317,6 +317,7 @@ ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 




const struct file_operations ecryptfs_dir_fops = {

const struct file_operations ecryptfs_dir_fops = {

	.readdir = ecryptfs_readdir,

	.readdir = ecryptfs_readdir,

	.read = generic_read_dir,

	.unlocked_ioctl = ecryptfs_unlocked_ioctl,

	.unlocked_ioctl = ecryptfs_unlocked_ioctl,

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	.compat_ioctl = ecryptfs_compat_ioctl,

	.compat_ioctl = ecryptfs_compat_ioctl,