Skip to contentSkip to conversation

utsname: completely overwrite prior information

RFC PATCH In review Vegard Nossum 2 participants 3 messages Sep 12, 2008 – Sep 13, 2008

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 utsname: completely overwrite prior information

Quoted 1 line

From 25c69de4760e20cf7562cf92a55b65a71546093e Mon Sep 17 00:00:00 2001

From: Vegard Nossum <[email protected]>
Date: Thu, 11 Sep 2008 19:59:50 +0200
Subject: [PATCH] utsname: completely overwrite prior information

On sethostname() and setdomainname(), previous information may be retained if it was longer than than the new hostname/domainname.

This can be demonstrated trivially by calling sethostname() first with a long name, then with a short name, and then calling uname() to retrieve the full buffer that contains the hostname (and possibly parts of the old hostname), one just has to look past the terminating zero.

I don't know if we should really care that much (hence the RFC); the only scenarios I can possibly think of is administrator putting something sensitive in the hostname (or domain name) by accident, and changing it back will not undo the mistake entirely, though it's not like we can recover gracefully from "rm -rf /" either... The other scenario is namespaces (CLONE_NEWUTS) where some information may be unintentionally "inherited" from the previous namespace (a program wants to hide the original name and does clone + sethostname, but some information is still left).

I think the patch may be defended on grounds of the principle of least surprise. But I am not adamant :-)

(I guess the question now is whether userspace should be able to write embedded NULs into the buffer or not...)

At least the observation has been made and the patch has been presented.

---
 kernel/sys.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
kernel/sys.c +4 -2
index 038a7bc..78b4515 100644
@@ -1352,7 +1352,8 @@ asmlinkage long sys_sethostname(char __user *name, int len)
 	errno = -EFAULT;
 	if (!copy_from_user(tmp, name, len)) {
 		memcpy(utsname()->nodename, tmp, len);
-		utsname()->nodename[len] = 0;
+		memset(utsname()->nodename + len, 0,
+			sizeof(utsname()->nodename) - len);
 		errno = 0;
 	}
 	up_write(&uts_sem);
@@ -1398,7 +1399,8 @@ asmlinkage long sys_setdomainname(char __user *name, int len)
 	errno = -EFAULT;
 	if (!copy_from_user(tmp, name, len)) {
 		memcpy(utsname()->domainname, tmp, len);
-		utsname()->domainname[len] = 0;
+		memset(utsname()->domainname + len, 0,
+			sizeof(utsname()->domainname) - len);
 		errno = 0;
 	}
 	up_write(&uts_sem);
Signature · 1 line
1.5.5.1
#1 lore raw
Quoted 24 lines · On Fri, 12 Sep 2008 22:36:24 +0200 Vegard Nossum <[email protected]>…
Quoted 1 line

From 25c69de4760e20cf7562cf92a55b65a71546093e Mon Sep 17 00:00:00 2001

From: Vegard Nossum <[email protected]>
Date: Thu, 11 Sep 2008 19:59:50 +0200
Subject: [PATCH] utsname: completely overwrite prior information

On sethostname() and setdomainname(), previous information may be retained if it was longer than than the new hostname/domainname.

This can be demonstrated trivially by calling sethostname() first with a long name, then with a short name, and then calling uname() to retrieve the full buffer that contains the hostname (and possibly parts of the old hostname), one just has to look past the terminating zero.

I don't know if we should really care that much (hence the RFC); the only scenarios I can possibly think of is administrator putting something sensitive in the hostname (or domain name) by accident, and changing it back will not undo the mistake entirely, though it's not like we can recover gracefully from "rm -rf /" either... The other scenario is namespaces (CLONE_NEWUTS) where some information may be unintentionally "inherited" from the previous namespace (a program wants to hide the original name and does clone + sethostname, but some information is still left).

Quoted 9 lines

I think the patch may be defended on grounds of the principle of least surprise. But I am not adamant :-)

(I guess the question now is whether userspace should be able to write embedded NULs into the buffer or not...)

At least the observation has been made and the patch has been presented.

fair enuf. Did you check allthe other fields in 'struct new_utsname'?

kernel/sys.c asmlinkage long sys_sethostname(char __user *name, int len) · line 1356

Quoted 10 lines

index 038a7bc..78b4515 100644

kernel/sys.c +2 -1
@@ -1352,7 +1352,8 @@ asmlinkage long sys_sethostname(char __user *name, int len)
 	errno = -EFAULT;
 	if (!copy_from_user(tmp, name, len)) {
 		memcpy(utsname()->nodename, tmp, len);
-		utsname()->nodename[len] = 0;
+		memset(utsname()->nodename + len, 0,
+			sizeof(utsname()->nodename) - len);

We could do the memset before the memcpy. It's more work, but less text. Whatever.

While we're there, the code generation in there is a bit sloppy. How's this look?

From: Andrew Morton <[email protected]>

utsname() is quite expensive to calculate. Cache it in a local.

text data bss dec hex filename

before:  11136     720      16   11872    2e60 kernel/sys.o
after:   11096     720      16   11832    2e38 kernel/sys.o
Cc Vegard Nossum <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc "Serge E. Hallyn" <[email protected]>

---

 kernel/sys.c |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
kernel/sys.c renamed from kernel/sys.c~kernel-sysc-improve-code-generation +12 -8
diff -puN kernel/sys.c~kernel-sysc-improve-code-generation kernel/sys.c
@@ -1415,9 +1415,10 @@ asmlinkage long sys_sethostname(char __u
 	down_write(&uts_sem);
 	errno = -EFAULT;
 	if (!copy_from_user(tmp, name, len)) {
-		memcpy(utsname()->nodename, tmp, len);
-		memset(utsname()->nodename + len, 0,
-			sizeof(utsname()->nodename) - len);
+		struct new_utsname *u = utsname();
+
+		memcpy(u->nodename, tmp, len);
+		memset(u->nodename + len, 0, sizeof(u->nodename) - len);
 		errno = 0;
 	}
 	up_write(&uts_sem);
@@ -1429,15 +1430,17 @@ asmlinkage long sys_sethostname(char __u
 asmlinkage long sys_gethostname(char __user *name, int len)
 {
 	int i, errno;
+	struct new_utsname *u;
 
 	if (len < 0)
 		return -EINVAL;
 	down_read(&uts_sem);
-	i = 1 + strlen(utsname()->nodename);
+	u = utsname();
+	i = 1 + strlen(u->nodename);
 	if (i > len)
 		i = len;
 	errno = 0;
-	if (copy_to_user(name, utsname()->nodename, i))
+	if (copy_to_user(name, u->nodename, i))
 		errno = -EFAULT;
 	up_read(&uts_sem);
 	return errno;
@@ -1462,9 +1465,10 @@ asmlinkage long sys_setdomainname(char _
 	down_write(&uts_sem);
 	errno = -EFAULT;
 	if (!copy_from_user(tmp, name, len)) {
-		memcpy(utsname()->domainname, tmp, len);
-		memset(utsname()->domainname + len, 0,
-			sizeof(utsname()->domainname) - len);
+		struct new_utsname *u = utsname();
+
+		memcpy(u->domainname, tmp, len);
+		memset(u->domainname + len, 0, sizeof(u->domainname) - len);
 		errno = 0;
 	}
 	up_write(&uts_sem);

_

#2 lore raw
Quoted 1 line · Andrew Morton

fair enuf. Did you check allthe other fields in 'struct new_utsname'?

As far as I can tell, only nodename (hostname) and domainname may be changed by userspace.

Quoted 14 lines

kernel/sys.c asmlinkage long sys_sethostname(char __user *name, int len) · line 1356

Quoted 11 lines

index 038a7bc..78b4515 100644

kernel/sys.c +2 -1
@@ -1352,7 +1352,8 @@ asmlinkage long sys_sethostname(char __user *name, int len)
      errno = -EFAULT;
      if (!copy_from_user(tmp, name, len)) {
              memcpy(utsname()->nodename, tmp, len);
-             utsname()->nodename[len] = 0;
+             memset(utsname()->nodename + len, 0,
+                     sizeof(utsname()->nodename) - len);

We could do the memset before the memcpy. It's more work, but less text. Whatever.

Whatever :-)

Quoted 8 lines

While we're there, the code generation in there is a bit sloppy. How's this look?

From: Andrew Morton <[email protected]>

utsname() is quite expensive to calculate. Cache it in a local.

Quoted 8 lines
         text    data     bss     dec     hex filename
before:  11136     720      16   11872    2e60 kernel/sys.o
after:   11096     720      16   11832    2e38 kernel/sys.o
Cc Vegard Nossum <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc "Serge E. Hallyn" <[email protected]>

I agree with this change. FWIW: Acked-by: Vegard Nossum <[email protected]>

There seems to be a few more places throughout the kernel which needlessly call utsname() more than once. I will keep it in mind.

Thanks,

Vegard

Signature · 4 lines
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
	-- E. W. Dijkstra, EWD1036