iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vt: use copy_to_user instead of __put_user in GIO_UNIMAP ioctl

Browse Source 
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>
This commit is contained in:
Adam Borowski 2017-06-03 09:35:07 +02:00 committed by Greg Kroah-Hartman
parent 6987dc8a70
commit 915f0a8d28
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/tty/vt/consolemap.c
View File

@ -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 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; ushort ect;
u16 **p1, *p2; u16 **p1, *p2;
struct uni_pagedir *p; struct uni_pagedir *p;
struct unipair *unilist, *plist; struct unipair *unilist;
unilist = kmalloc_array(ct, sizeof(struct unipair), GFP_KERNEL); unilist = kmalloc_array(ct, sizeof(struct unipair), GFP_KERNEL);
if (!unilist) if (!unilist)
@ -775,13 +775,11 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni
} }
} }
console_unlock(); console_unlock();
for (i = min(ect, ct), plist = unilist; i; i--, list++, plist++) { if (copy_to_user(list, unilist, min(ect, ct) * sizeof(struct unipair)))
__put_user(plist->unicode, &list->unicode); ret = -EFAULT;
__put_user(plist->fontpos, &list->fontpos); put_user(ect, uct);
}
__put_user(ect, uct);
kfree(unilist); kfree(unilist);
return ((ect <= ct) ? 0 : -ENOMEM); return ret ? ret : (ect <= ct) ? 0 : -ENOMEM;
} }
/* /*