Commit 9b71ca20 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds

drivers/char/vt.c: use memdup_user

Use memdup_user when user data is immediately copied into the
allocated region.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression from,to,size,flag;
position p;
identifier l1,l2;
@@

-  to = \(kmalloc@p\|kzalloc@p\)(size,flag);
+  to = memdup_user(from,size);
   if (
-      to==NULL
+      IS_ERR(to)
                 || ...) {
   <+... when != goto l1;
-  -ENOMEM
+  PTR_ERR(to)
   ...+>
   }
-  if (copy_from_user(to, from, size) != 0) {
-    <+... when != goto l2;
-    -EFAULT
-    ...+>
-  }
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc0fd7b5
...@@ -3967,13 +3967,9 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op) ...@@ -3967,13 +3967,9 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op)
font.charcount = op->charcount; font.charcount = op->charcount;
font.height = op->height; font.height = op->height;
font.width = op->width; font.width = op->width;
font.data = kmalloc(size, GFP_KERNEL); font.data = memdup_user(op->data, size);
if (!font.data) if (IS_ERR(font.data))
return -ENOMEM; return PTR_ERR(font.data);
if (copy_from_user(font.data, op->data, size)) {
kfree(font.data);
return -EFAULT;
}
acquire_console_sem(); acquire_console_sem();
if (vc->vc_sw->con_font_set) if (vc->vc_sw->con_font_set)
rc = vc->vc_sw->con_font_set(vc, &font, op->flags); rc = vc->vc_sw->con_font_set(vc, &font, op->flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment