AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] ecryptfs: lower root result must be adirectory

Browse Source 
- Currently after path_lookup succeed we dot't have any guarantie what
  it is DIR. This must be explicitly demanded.
- path_lookup can't return negative dentry, So inode check is useless.

Signed-off-by: Dmitriy Monakhov <dmonakhov@openvz.org>
Acked-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dmitriy Monakhov 2007-03-05 00:30:46 -08:00 committed by Linus Torvalds
parent a5f5e43e2b
commit 82b1652840
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ecryptfs/main.c
View File

@ -484,18 +484,12 @@ static int ecryptfs_read_super(struct super_block *sb, const char *dev_name)
struct vfsmount *lower_mnt; struct vfsmount *lower_mnt;
memset(&nd, 0, sizeof(struct nameidata)); memset(&nd, 0, sizeof(struct nameidata));
rc = path_lookup(dev_name, LOOKUP_FOLLOW, &nd); rc = path_lookup(dev_name, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &nd);
if (rc) { if (rc) {
ecryptfs_printk(KERN_WARNING, "path_lookup() failed\n"); ecryptfs_printk(KERN_WARNING, "path_lookup() failed\n");
goto out; goto out;
} }
lower_root = nd.dentry; lower_root = nd.dentry;
if (!lower_root->d_inode) {
ecryptfs_printk(KERN_WARNING,
"No directory to interpose on\n");
rc = -ENOENT;
goto out_free;
}
lower_mnt = nd.mnt; lower_mnt = nd.mnt;
ecryptfs_set_superblock_lower(sb, lower_root->d_sb); ecryptfs_set_superblock_lower(sb, lower_root->d_sb);
sb->s_maxbytes = lower_root->d_sb->s_maxbytes; sb->s_maxbytes = lower_root->d_sb->s_maxbytes;