[PATCH] namespaces: utsname: switch to using uts namespaces
Replace references to system_utsname to the per-process uts namespace where appropriate. This includes things like uname. Changes: Per Eric Biederman's comments, use the per-process uts namespace for ELF_PLATFORM, sunrpc, and parts of net/ipv4/ipconfig.c [jdike@addtoit.com: UML fix] [clg@fr.ibm.com: cleanup] [akpm@osdl.org: build fix] Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Cc: Kirill Korotaev <dev@openvz.org> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: Andrey Savochkin <saw@sw.ru> Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
0bdd7aab7f
commit
e9ff3990f0
@ -884,7 +884,7 @@ asmlinkage int irix_getdomainname(char __user *name, int len)
|
||||
down_read(&uts_sem);
|
||||
if (len > __NEW_UTS_LEN)
|
||||
len = __NEW_UTS_LEN;
|
||||
err = copy_to_user(name, system_utsname.domainname, len) ? -EFAULT : 0;
|
||||
err = copy_to_user(name, utsname()->domainname, len) ? -EFAULT : 0;
|
||||
up_read(&uts_sem);
|
||||
|
||||
return err;
|
||||
@ -1127,11 +1127,11 @@ struct iuname {
|
||||
asmlinkage int irix_uname(struct iuname __user *buf)
|
||||
{
|
||||
down_read(&uts_sem);
|
||||
if (copy_from_user(system_utsname.sysname, buf->sysname, 65)
|
||||
|| copy_from_user(system_utsname.nodename, buf->nodename, 65)
|
||||
|| copy_from_user(system_utsname.release, buf->release, 65)
|
||||
|| copy_from_user(system_utsname.version, buf->version, 65)
|
||||
|| copy_from_user(system_utsname.machine, buf->machine, 65)) {
|
||||
if (copy_from_user(utsname()->sysname, buf->sysname, 65)
|
||||
|| copy_from_user(utsname()->nodename, buf->nodename, 65)
|
||||
|| copy_from_user(utsname()->release, buf->release, 65)
|
||||
|| copy_from_user(utsname()->version, buf->version, 65)
|
||||
|| copy_from_user(utsname()->machine, buf->machine, 65)) {
|
||||
return -EFAULT;
|
||||
}
|
||||
up_read(&uts_sem);
|
||||
|
Reference in New Issue
Block a user