projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8bc3b1e
)
ext4 crypto: fix sparse warnings in fs/ext4/ioctl.c
author
Fabian Frederick
<
[email protected]
>
Mon, 8 Jun 2015 16:23:21 +0000
(12:23 -0400)
committer
Theodore Ts'o
<
[email protected]
>
Mon, 8 Jun 2015 16:23:21 +0000
(12:23 -0400)
[ Added another sparse fix for EXT4_IOC_GET_ENCRYPTION_POLICY while
we're at it. --tytso ]
Signed-off-by: Fabian Frederick <
[email protected]
>
Signed-off-by: Theodore Ts'o <
[email protected]
>
fs/ext4/ioctl.c
patch
|
blob
|
history
diff --git
a/fs/ext4/ioctl.c
b/fs/ext4/ioctl.c
index 2cb9e178d1c557f62c35d1d0f7bd0d911665738a..7ce85824211b924ff6f2eebd2786c5b569371bea 100644
(file)
--- 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