AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] Check return values of __copy_to_user in uname emulation

Browse Source 
Quietens some new warnings
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Andi Kleen 2006-09-26 10:52:40 +02:00 committed by Andi Kleen
parent 758333458a
commit 26c13f2b5b
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/x86_64/ia32/sys_ia32.c
View File

@ -780,7 +780,7 @@ asmlinkage long sys32_mmap2(unsigned long addr, unsigned long len,
asmlinkage long sys32_olduname(struct oldold_utsname __user * name) asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
{ {
int error; int err;
if (!name) if (!name)
return -EFAULT; return -EFAULT;
@ -789,27 +789,31 @@ asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
down_read(&uts_sem); down_read(&uts_sem);
error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN); err = __copy_to_user(&name->sysname,&system_utsname.sysname,
__put_user(0,name->sysname+__OLD_UTS_LEN); __OLD_UTS_LEN);
__copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN); err |= __put_user(0,name->sysname+__OLD_UTS_LEN);
__put_user(0,name->nodename+__OLD_UTS_LEN); err |= __copy_to_user(&name->nodename,&system_utsname.nodename,
__copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN); __OLD_UTS_LEN);
__put_user(0,name->release+__OLD_UTS_LEN); err |= __put_user(0,name->nodename+__OLD_UTS_LEN);
__copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN); err |= __copy_to_user(&name->release,&system_utsname.release,
__put_user(0,name->version+__OLD_UTS_LEN); __OLD_UTS_LEN);
err |= __put_user(0,name->release+__OLD_UTS_LEN);
err |= __copy_to_user(&name->version,&system_utsname.version,
__OLD_UTS_LEN);
err |= __put_user(0,name->version+__OLD_UTS_LEN);
{ {
char *arch = "x86_64"; char *arch = "x86_64";
if (personality(current->personality) == PER_LINUX32) if (personality(current->personality) == PER_LINUX32)
arch = "i686"; arch = "i686";
__copy_to_user(&name->machine,arch,strlen(arch)+1); err |= __copy_to_user(&name->machine,arch,strlen(arch)+1);
} }
up_read(&uts_sem); up_read(&uts_sem);
error = error ? -EFAULT : 0; err = err ? -EFAULT : 0;
return error; return err;
} }
long sys32_uname(struct old_utsname __user * name) long sys32_uname(struct old_utsname __user * name)