Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fd2c903b89a6c3cec9388eb24a134ebc1be20747

Authored by Al Viro
Committed by Linus Torvalds
1 parent 12ea59e810
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] m32r: more __user annotations 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

arch/m32r/kernel/sys_m32r.c
Diff comments   View file @ fd2c903
... ... @@ -31,7 +31,7 @@
31 31 /*
32 32 * sys_tas() - test-and-set
33 33 */
34   -asmlinkage int sys_tas(int *addr)
  34 +asmlinkage int sys_tas(int __user *addr)
35 35 {
36 36 int oldval;
37 37  
... ... @@ -90,7 +90,7 @@
90 90  
91 91 error = do_pipe(fd);
92 92 if (!error) {
93   - if (copy_to_user((void *)r0, (void *)fd, 2*sizeof(int)))
  93 + if (copy_to_user((void __user *)r0, fd, 2*sizeof(int)))
94 94 error = -EFAULT;
95 95 }
96 96 return error;
... ... @@ -201,7 +201,7 @@
201 201 }
202 202 }
203 203  
204   -asmlinkage int sys_uname(struct old_utsname * name)
  204 +asmlinkage int sys_uname(struct old_utsname __user * name)
205 205 {
206 206 int err;
207 207 if (!name)