lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

eCryptfs: remove retry loop in ecryptfs_readdir()

Browse Source 
The retry block in ecryptfs_readdir() has been in the eCryptfs code base
for a while, apparently for no good reason.  This loop could potentially
run without terminating.  This patch removes the loop, instead erroring
out if vfs_readdir() on the lower file fails.

Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Reported-by: Al Viro <viro@ZinIV.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michael Halcrow
2008-10-15 22:02:49 -07:00
committed by Linus Torvalds
parent 9d793b0bcb
commit 7d6c704558
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/ecryptfs/file.c
View File

@@ -71,12 +71,11 @@ struct ecryptfs_getdents_callback {
void *dirent; void *dirent;
struct dentry *dentry; struct dentry *dentry;
filldir_t filldir; filldir_t filldir;
int err;
int filldir_called; int filldir_called;
int entries_written; int entries_written;
}; };
/* Inspired by generic filldir in fs/readir.c */ /* Inspired by generic filldir in fs/readdir.c */
static int static int
ecryptfs_filldir(void *dirent, const char *name, int namelen, loff_t offset, ecryptfs_filldir(void *dirent, const char *name, int namelen, loff_t offset,
u64 ino, unsigned int d_type) u64 ino, unsigned int d_type)
@@ -125,18 +124,18 @@ static int ecryptfs_readdir(struct file *file, void *dirent, filldir_t filldir)
buf.dirent = dirent; buf.dirent = dirent;
buf.dentry = file->f_path.dentry; buf.dentry = file->f_path.dentry;
buf.filldir = filldir; buf.filldir = filldir;
retry:
buf.filldir_called = 0; buf.filldir_called = 0;
buf.entries_written = 0; buf.entries_written = 0;
buf.err = 0;
rc = vfs_readdir(lower_file, ecryptfs_filldir, (void *)&buf); rc = vfs_readdir(lower_file, ecryptfs_filldir, (void *)&buf);
if (buf.err)
rc = buf.err;
if (buf.filldir_called && !buf.entries_written)
goto retry;
file->f_pos = lower_file->f_pos; file->f_pos = lower_file->f_pos;
if (rc < 0)
goto out;
if (buf.filldir_called && !buf.entries_written)
goto out;
if (rc >= 0) if (rc >= 0)
fsstack_copy_attr_atime(inode, lower_file->f_path.dentry->d_inode); fsstack_copy_attr_atime(inode,
lower_file->f_path.dentry->d_inode);
out:
return rc; return rc;
} }