Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] frv: misc __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Viro and committed by
Linus Torvalds
53470aaa 530018bf

+6 -6
+3 -3
arch/frv/kernel/irq.c
··· 625 625 626 626 #define HEX_DIGITS 8 627 627 628 - static unsigned int parse_hex_value (const char *buffer, 628 + static unsigned int parse_hex_value (const char __user *buffer, 629 629 unsigned long count, unsigned long *ret) 630 630 { 631 631 unsigned char hexnum [HEX_DIGITS]; ··· 672 672 return sprintf (page, "%08lx\n", *mask); 673 673 } 674 674 675 - static int prof_cpu_mask_write_proc (struct file *file, const char *buffer, 675 + static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer, 676 676 unsigned long count, void *data) 677 677 { 678 678 unsigned long *mask = (unsigned long *) data, full_count = count, err; ··· 711 711 int i; 712 712 713 713 /* create /proc/irq */ 714 - root_irq_dir = proc_mkdir("irq", 0); 714 + root_irq_dir = proc_mkdir("irq", NULL); 715 715 716 716 /* create /proc/irq/prof_cpu_mask */ 717 717 entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
+1 -1
arch/frv/kernel/process.c
··· 246 246 /* 247 247 * sys_execve() executes a new program. 248 248 */ 249 - asmlinkage int sys_execve(char *name, char **argv, char **envp) 249 + asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp) 250 250 { 251 251 int error; 252 252 char * filename;
+1 -1
arch/frv/kernel/sys_frv.c
··· 32 32 * sys_pipe() is the normal C calling standard for creating 33 33 * a pipe. It's not the way unix traditionally does this, though. 34 34 */ 35 - asmlinkage long sys_pipe(unsigned long * fildes) 35 + asmlinkage long sys_pipe(unsigned long __user * fildes) 36 36 { 37 37 int fd[2]; 38 38 int error;
+1 -1
include/asm-frv/checksum.h
··· 43 43 * here even more important to align src and dst on a 32-bit (or even 44 44 * better 64-bit) boundary 45 45 */ 46 - extern unsigned int csum_partial_copy_from_user(const char *src, char *dst, 46 + extern unsigned int csum_partial_copy_from_user(const char __user *src, char *dst, 47 47 int len, int sum, int *csum_err); 48 48 49 49 #define csum_partial_copy_nocheck(src, dst, len, sum) \