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

Sanitize autofs_dev_ioctl_ismountpoint()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2010-01-23 20:08:53 -05:00
parent b1e4594ba0
commit f598f9f125
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/autofs4/dev-ioctl.c
View File

@@ -544,10 +544,9 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
goto out; goto out;
devid = new_encode_dev(path.mnt->mnt_sb->s_dev); devid = new_encode_dev(path.mnt->mnt_sb->s_dev);
err = 0; err = 0;
if (path.dentry->d_inode && if (path.mnt->mnt_root == path.dentry) {
path.mnt->mnt_root == path.dentry) {
err = 1; err = 1;
magic = path.dentry->d_inode->i_sb->s_magic; magic = path.mnt->mnt_sb->s_magic;
} }
} else { } else {
dev_t dev = sbi->sb->s_dev; dev_t dev = sbi->sb->s_dev;
@@ -560,11 +559,9 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
err = have_submounts(path.dentry); err = have_submounts(path.dentry);
if (path.mnt->mnt_mountpoint != path.mnt->mnt_root) {
if (follow_down(&path)) if (follow_down(&path))
magic = path.mnt->mnt_sb->s_magic; magic = path.mnt->mnt_sb->s_magic;
} }
}
param->ismountpoint.out.devid = devid; param->ismountpoint.out.devid = devid;
param->ismountpoint.out.magic = magic; param->ismountpoint.out.magic = magic;