diff options
author | 2006-09-19 15:13:45 -0400 | |
---|---|---|
committer | 2006-09-19 15:13:45 -0400 | |
commit | 23b6b0e3e8306ce3d00e0c87196bfaad335b9096 (patch) | |
tree | 3e690e564ac42444937b0d66b624c0e292d4a88a /arch/sparc/kernel/sys_sparc.c | |
parent | [PATCH] Remove powerpc specific parts of 3c509 driver (diff) | |
parent | x86: save/restore eflags in context switch (diff) | |
download | linux-dev-23b6b0e3e8306ce3d00e0c87196bfaad335b9096.tar.xz linux-dev-23b6b0e3e8306ce3d00e0c87196bfaad335b9096.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/sparc/kernel/sys_sparc.c')
-rw-r--r-- | arch/sparc/kernel/sys_sparc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c index 94ff58c9d4a9..896863fb208a 100644 --- a/arch/sparc/kernel/sys_sparc.c +++ b/arch/sparc/kernel/sys_sparc.c @@ -470,19 +470,21 @@ asmlinkage int sys_getdomainname(char __user *name, int len) { int nlen, err; - if (len < 0 || len > __NEW_UTS_LEN) + if (len < 0) return -EINVAL; down_read(&uts_sem); nlen = strlen(system_utsname.domainname) + 1; - if (nlen < len) - len = nlen; + err = -EINVAL; + if (nlen > len) + goto out; err = -EFAULT; - if (!copy_to_user(name, system_utsname.domainname, len)) + if (!copy_to_user(name, system_utsname.domainname, nlen)) err = 0; +out: up_read(&uts_sem); return err; } |