[PATCH 4/5] vt: use memdup_user in PIO_UNIMAP ioctl

2017-06-03 Thread Adam Borowski
Again, a nice linear transfer that simplifies the code.

Signed-off-by: Adam Borowski 
---
 drivers/tty/vt/consolemap.c | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index c6a692f63a9b..a5f88cf0f61d 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -540,14 +540,9 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct 
unipair __user *list)
if (!ct)
return 0;
 
-   unilist = kmalloc_array(ct, sizeof(struct unipair), GFP_KERNEL);
-   if (!unilist)
-   return -ENOMEM;
-
-   for (i = ct, plist = unilist; i; i--, plist++, list++) {
-   __get_user(plist->unicode, >unicode);
-   __get_user(plist->fontpos, >fontpos);
-   }
+   unilist = memdup_user(list, ct * sizeof(struct unipair));
+   if (IS_ERR(unilist))
+   return PTR_ERR(unilist);
 
console_lock();
 
-- 
2.11.0



[PATCH 4/5] vt: use memdup_user in PIO_UNIMAP ioctl

2017-06-03 Thread Adam Borowski
Again, a nice linear transfer that simplifies the code.

Signed-off-by: Adam Borowski 
---
 drivers/tty/vt/consolemap.c | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index c6a692f63a9b..a5f88cf0f61d 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -540,14 +540,9 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct 
unipair __user *list)
if (!ct)
return 0;
 
-   unilist = kmalloc_array(ct, sizeof(struct unipair), GFP_KERNEL);
-   if (!unilist)
-   return -ENOMEM;
-
-   for (i = ct, plist = unilist; i; i--, plist++, list++) {
-   __get_user(plist->unicode, >unicode);
-   __get_user(plist->fontpos, >fontpos);
-   }
+   unilist = memdup_user(list, ct * sizeof(struct unipair));
+   if (IS_ERR(unilist))
+   return PTR_ERR(unilist);
 
console_lock();
 
-- 
2.11.0