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

Commit b4ab9e29 authored by Fabian Frederick's avatar Fabian Frederick Committed by Theodore Ts'o
Browse files

ext4 crypto: fix sparse warnings in fs/ext4/ioctl.c 



[ Added another sparse fix for EXT4_IOC_GET_ENCRYPTION_POLICY while
  we're at it. --tytso ]

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 8bc3b1e6

fs/ext4/ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -675,8 +675,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
			if (err)

				return err;

		}

		if (copy_to_user((void *) arg, sbi->s_es->s_encrypt_pw_salt,

				 16))

		if (copy_to_user((void __user *) arg,

				 sbi->s_es->s_encrypt_pw_salt, 16))

			return -EFAULT;

		return 0;

	}
@@ -690,7 +690,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		err = ext4_get_policy(inode, &policy);

		if (err)

			return err;

		if (copy_to_user((void *)arg, &policy, sizeof(policy)))

		if (copy_to_user((void __user *)arg, &policy, sizeof(policy)))

			return -EFAULT;

		return 0;

#else