vt: use copy_to_user instead of __put_user in GIO_UNIMAP ioctl

A nice big linear transfer, no need to flip stac/PAN/etc every half-entry.
Also, yay __put_user() after checking only read.

Signed-off-by: Adam Borowski <kilobyte@angband.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 1361f2a8b8321313ea006070e73465cc58fa9d06..c6a692f63a9b2f66a3380fd1766c73615bf5703b 100644 (file)
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -740,11 +740,11 @@ EXPORT_SYMBOL(con_copy_unimap);
  */
 int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct unipair __user *list)
 {
-       int i, j, k;
+       int i, j, k, ret = 0;
        ushort ect;
        u16 **p1, *p2;
        struct uni_pagedir *p;
-       struct unipair *unilist, *plist;
+       struct unipair *unilist;
 
        unilist = kmalloc_array(ct, sizeof(struct unipair), GFP_KERNEL);
        if (!unilist)
@@ -775,13 +775,11 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni
                }
        }
        console_unlock();
-       for (i = min(ect, ct), plist = unilist; i; i--, list++, plist++) {
-               __put_user(plist->unicode, &list->unicode);
-               __put_user(plist->fontpos, &list->fontpos);
-       }
-       __put_user(ect, uct);
+       if (copy_to_user(list, unilist, min(ect, ct) * sizeof(struct unipair)))
+               ret = -EFAULT;
+       put_user(ect, uct);
        kfree(unilist);
-       return ((ect <= ct) ? 0 : -ENOMEM);
+       return ret ? ret : (ect <= ct) ? 0 : -ENOMEM;
 }
 
 /*