lkml.org 
[lkml]   [2011]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 1/1] ecryptfs: read on a directory should return EISDIR if not supported
On Wed Feb 16, 2011 at 04:49:59AM +0000, Andy Whitcroft <apw@canonical.com> wrote:
> 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>

Thanks Andy - applied to
git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next

Tyler

> ---
> 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 81e10e6..7d1050e 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,
> --
> 1.7.1
>


\
 
 \ /
  Last update: 2011-02-18 04:51    [W:0.046 / U:0.228 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site