diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-01-23 20:08:53 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 14:07:53 -0500 |
| commit | f598f9f1252b33410ffc52f51e117645ac5116c4 (patch) | |
| tree | 78191ec2ccdf725c5fa8a8f23828c4761abe84ed /fs | |
| parent | b1e4594ba097634e9436cc4c6ba95f70a2d627ff (diff) | |
| download | kernel_samsung_aries-f598f9f1252b33410ffc52f51e117645ac5116c4.zip kernel_samsung_aries-f598f9f1252b33410ffc52f51e117645ac5116c4.tar.gz kernel_samsung_aries-f598f9f1252b33410ffc52f51e117645ac5116c4.tar.bz2 | |
Sanitize autofs_dev_ioctl_ismountpoint()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/autofs4/dev-ioctl.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c index 00bf8fc..c8a80df 100644 --- a/fs/autofs4/dev-ioctl.c +++ b/fs/autofs4/dev-ioctl.c @@ -544,10 +544,9 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, goto out; devid = new_encode_dev(path.mnt->mnt_sb->s_dev); err = 0; - if (path.dentry->d_inode && - path.mnt->mnt_root == path.dentry) { + if (path.mnt->mnt_root == path.dentry) { err = 1; - magic = path.dentry->d_inode->i_sb->s_magic; + magic = path.mnt->mnt_sb->s_magic; } } else { dev_t dev = sbi->sb->s_dev; @@ -560,10 +559,8 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, err = have_submounts(path.dentry); - if (path.mnt->mnt_mountpoint != path.mnt->mnt_root) { - if (follow_down(&path)) - magic = path.mnt->mnt_sb->s_magic; - } + if (follow_down(&path)) + magic = path.mnt->mnt_sb->s_magic; } param->ismountpoint.out.devid = devid; |