Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
207db493 · Linus Torvalds · a9729d97 · a4475157 · 207db493
Commit 207db493 authored Oct 01, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

arch/sparc64/solaris/misc.c arch/sparc64/solaris/misc.c +3 -3

No files found.
--- a/arch/sparc64/solaris/misc.c
+++ b/arch/sparc64/solaris/misc.c
@@ -148,10 +148,10 @@ static int __set_utsfield(char __user *to, int to_size,
 	if (copy_to_user(to, from, len))
 		return -EFAULT;
+	off = len < to_size? len: len - 1;
 	if (dotchop) {
-		off = (strnchr(from, len, '.') - from);
+		const char *p = strnchr(from, len, '.');
-	} else{
+		if (p) off = p - from;
-		off = len - 1;
 	}
 	if (__put_user('\0', to + off))