Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f598f9f1 authored by Al Viro's avatar Al Viro
Browse files

Sanitize autofs_dev_ioctl_ismountpoint() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b1e4594b

fs/autofs4/dev-ioctl.c

+4 −7
Original line number Diff line number Diff line
@@ -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,11 +559,9 @@ 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;

	}

	}



	param->ismountpoint.out.devid = devid;

	param->ismountpoint.out.magic = magic;