diff options
| author | Fabian Frederick <fabf@skynet.be> | 2015-06-08 18:23:21 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-06-08 18:23:21 +0200 |
| commit | b4ab9e29820bf2e8842281a6b5e645e59c9992a5 (patch) | |
| tree | 49e3d62e9a29578874ad35dcb7d5b38a119e3743 /fs/ext4 | |
| parent | ext4: BUG_ON assertion repeated for inode1, not done for inode2 (diff) | |
| download | linux-b4ab9e29820bf2e8842281a6b5e645e59c9992a5.tar.xz linux-b4ab9e29820bf2e8842281a6b5e645e59c9992a5.zip | |
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: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 2cb9e178d1c5..7ce85824211b 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -675,8 +675,8 @@ encryption_policy_out: 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 @@ encryption_policy_out: 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 |