Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ff3990 authored by Serge E. Hallyn's avatar Serge E. Hallyn Committed by Linus Torvalds
Browse files

[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: default avatarSerge 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: default avatarCedric Le Goater <clg@fr.ibm.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0bdd7aab

arch/alpha/kernel/osf_sys.c

+13 −13
Original line number Diff line number Diff line
@@ -402,15 +402,15 @@ osf_utsname(char __user *name) 


	down_read(&uts_sem);

	error = -EFAULT;

	if (copy_to_user(name + 0, system_utsname.sysname, 32))

	if (copy_to_user(name + 0, utsname()->sysname, 32))

		goto out;

	if (copy_to_user(name + 32, system_utsname.nodename, 32))

	if (copy_to_user(name + 32, utsname()->nodename, 32))

		goto out;

	if (copy_to_user(name + 64, system_utsname.release, 32))

	if (copy_to_user(name + 64, utsname()->release, 32))

		goto out;

	if (copy_to_user(name + 96, system_utsname.version, 32))

	if (copy_to_user(name + 96, utsname()->version, 32))

		goto out;

	if (copy_to_user(name + 128, system_utsname.machine, 32))

	if (copy_to_user(name + 128, utsname()->machine, 32))

		goto out;



	error = 0;
@@ -449,8 +449,8 @@ osf_getdomainname(char __user *name, int namelen) 


	down_read(&uts_sem);

	for (i = 0; i < len; ++i) {

		__put_user(system_utsname.domainname[i], name + i);

		if (system_utsname.domainname[i] == '\0')

		__put_user(utsname()->domainname[i], name + i);

		if (utsname()->domainname[i] == '\0')

			break;

	}

	up_read(&uts_sem);
@@ -607,12 +607,12 @@ osf_sigstack(struct sigstack __user *uss, struct sigstack __user *uoss) 
asmlinkage long

osf_sysinfo(int command, char __user *buf, long count)

{

	static char * sysinfo_table[] = {

		system_utsname.sysname,

		system_utsname.nodename,

		system_utsname.release,

		system_utsname.version,

		system_utsname.machine,

	char *sysinfo_table[] = {

		utsname()->sysname,

		utsname()->nodename,

		utsname()->release,

		utsname()->version,

		utsname()->machine,

		"alpha",	/* instruction set architecture */

		"dummy",	/* hardware serial number */

		"dummy",	/* hardware manufacturer */

arch/i386/kernel/sys_i386.c

+16 −11
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ asmlinkage int sys_uname(struct old_utsname __user * name) 
	if (!name)

		return -EFAULT;

	down_read(&uts_sem);

	err=copy_to_user(name, &system_utsname, sizeof (*name));

	err = copy_to_user(name, utsname(), sizeof (*name));

	up_read(&uts_sem);

	return err?-EFAULT:0;

}
@@ -226,15 +226,20 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name) 
  

  	down_read(&uts_sem);

	

	error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);

	error = __copy_to_user(&name->sysname, &utsname()->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, &utsname()->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, &utsname()->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, &utsname()->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, &utsname()->machine,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->machine + __OLD_UTS_LEN);

	

	up_read(&uts_sem);

arch/ia64/sn/kernel/sn2/sn_hwperf.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int sn_topology_show(struct seq_file *s, void *d) 
			"coherency_domain %d, "

			"region_size %d\n",



			partid, system_utsname.nodename,

			partid, utsname()->nodename,

			shubtype ? "shub2" : "shub1", 

			(u64)nasid_mask << nasid_shift, nasid_msb, nasid_shift,

			system_size, sharing_size, coher, region_size);

arch/m32r/kernel/sys_m32r.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ asmlinkage int sys_uname(struct old_utsname * name) 
	if (!name)

		return -EFAULT;

	down_read(&uts_sem);

	err=copy_to_user(name, &system_utsname, sizeof (*name));

	err = copy_to_user(name, utsname(), sizeof (*name));

	up_read(&uts_sem);

	return err?-EFAULT:0;

}

arch/mips/kernel/linux32.c

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ asmlinkage long sys32_newuname(struct new_utsname __user * name) 
	int ret = 0;



	down_read(&uts_sem);

	if (copy_to_user(name,&system_utsname,sizeof *name))

	if (copy_to_user(name, utsname(), sizeof *name))

		ret = -EFAULT;

	up_read(&uts_sem);