2 files changed, 12 insertions, 8 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;
 }
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index bf5f14ee73de..c608c947e6c3 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -707,19 +707,21 @@ asmlinkage long 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;
 }