git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
sys_i386.c
diff --git
a/arch/i386/kernel/sys_i386.c
b/arch/i386/kernel/sys_i386.c
index
0c36130
..
fc8001a
100644
(file)
--- a/
arch/i386/kernel/sys_i386.c
+++ b/
arch/i386/kernel/sys_i386.c
@@
-217,7
+217,7
@@
asmlinkage int sys_uname(struct old_utsname __user * name)
if (!name)
return -EFAULT;
down_read(&uts_sem);
if (!name)
return -EFAULT;
down_read(&uts_sem);
- err=copy_to_user(name,
&system_utsname
, sizeof (*name));
+ err=copy_to_user(name,
vx_new_utsname()
, sizeof (*name));
up_read(&uts_sem);
return err?-EFAULT:0;
}
up_read(&uts_sem);
return err?-EFAULT:0;
}
@@
-225,6
+225,7
@@
asmlinkage int sys_uname(struct old_utsname __user * name)
asmlinkage int sys_olduname(struct oldold_utsname __user * name)
{
int error;
asmlinkage int sys_olduname(struct oldold_utsname __user * name)
{
int error;
+ struct new_utsname *ptr;
if (!name)
return -EFAULT;
if (!name)
return -EFAULT;
@@
-233,15
+234,16
@@
asmlinkage int sys_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);
+ ptr = vx_new_utsname();
+ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
- error |= __copy_to_user(&name->nodename,
&system_utsname.
nodename,__OLD_UTS_LEN);
+ error |= __copy_to_user(&name->nodename,
ptr->
nodename,__OLD_UTS_LEN);
error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
- error |= __copy_to_user(&name->release,
&system_utsname.
release,__OLD_UTS_LEN);
+ error |= __copy_to_user(&name->release,
ptr->
release,__OLD_UTS_LEN);
error |= __put_user(0,name->release+__OLD_UTS_LEN);
error |= __put_user(0,name->release+__OLD_UTS_LEN);
- error |= __copy_to_user(&name->version,
&system_utsname.
version,__OLD_UTS_LEN);
+ error |= __copy_to_user(&name->version,
ptr->
version,__OLD_UTS_LEN);
error |= __put_user(0,name->version+__OLD_UTS_LEN);
error |= __put_user(0,name->version+__OLD_UTS_LEN);
- error |= __copy_to_user(&name->machine,
&system_utsname.
machine,__OLD_UTS_LEN);
+ error |= __copy_to_user(&name->machine,
ptr->
machine,__OLD_UTS_LEN);
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);