osf_getdomainname(): use copy_to_user()

commit 9ba3eb5103cf56f0daaf07de4507df76e7813ed7 upstream.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index cb34a25a0168f96736f537b41f24f7a607b172aa..81311ad5de59342e5290732ab3799a663247f67c 100644 (file)
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -560,25 +560,20 @@ SYSCALL_DEFINE0(getdtablesize)
  */
 SYSCALL_DEFINE2(osf_getdomainname, char __user *, name, int, namelen)
 {
-       unsigned len;
-       int i;
+       int len, err = 0;
+       char *kname;
 
-       if (!access_ok(VERIFY_WRITE, name, namelen))
-               return -EFAULT;
-
-       len = namelen;
-       if (len > 32)
-               len = 32;
+       if (namelen > 32)
+               namelen = 32;
 
        down_read(&uts_sem);
-       for (i = 0; i < len; ++i) {
-               __put_user(utsname()->domainname[i], name + i);
-               if (utsname()->domainname[i] == '\0')
-                       break;
-       }
+       kname = utsname()->domainname;
+       len = strnlen(kname, namelen);
+       if (copy_to_user(name, kname, min(len + 1, namelen)))
+               err = -EFAULT;
        up_read(&uts_sem);
 
-       return 0;
+       return err;
 }
 
 /*