[PATCH] tty/vt/keyboard: use memdup_user to simplify code

[PATCH] tty/vt/keyboard: use memdup_user to simplify code

[Saurabh Sengar]

use memdup_user rather than duplicating implementation.
found by coccinelle

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
 drivers/tty/vt/keyboard.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 6f0336f..f973bfc 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -1706,16 +1706,12 @@ int vt_do_diacrit(unsigned int cmd, void __user *udp, int perm)
 			return -EINVAL;
 
 		if (ct) {
-			dia = kmalloc(sizeof(struct kbdiacr) * ct,
-								GFP_KERNEL);
-			if (!dia)
-				return -ENOMEM;
 
-			if (copy_from_user(dia, a->kbdiacr,
-					sizeof(struct kbdiacr) * ct)) {
-				kfree(dia);
-				return -EFAULT;
-			}
+			dia = memdup_user(a->kbdiacr,
+					sizeof(struct kbdiacr) * ct);
+			if (IS_ERR(dia))
+				return PTR_ERR(dia);
+
 		}
 
 		spin_lock_irqsave(&kbd_event_lock, flags);
-- 
1.9.1

Re: [PATCH] tty/vt/keyboard: use memdup_user to simplify code

[Saurabh Sengar]

On 28 October 2015 at 11:56, Saurabh Sengar <saurabh.truth@gmail.com> wrote:
> use memdup_user rather than duplicating implementation.
> found by coccinelle
>
> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> ---
>  drivers/tty/vt/keyboard.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
> index 6f0336f..f973bfc 100644
> --- a/drivers/tty/vt/keyboard.c
> +++ b/drivers/tty/vt/keyboard.c
> @@ -1706,16 +1706,12 @@ int vt_do_diacrit(unsigned int cmd, void __user *udp, int perm)
>                         return -EINVAL;
>
>                 if (ct) {
> -                       dia = kmalloc(sizeof(struct kbdiacr) * ct,
> -                                                               GFP_KERNEL);
> -                       if (!dia)
> -                               return -ENOMEM;
>
> -                       if (copy_from_user(dia, a->kbdiacr,
> -                                       sizeof(struct kbdiacr) * ct)) {
> -                               kfree(dia);
> -                               return -EFAULT;
> -                       }
> +                       dia = memdup_user(a->kbdiacr,
> +                                       sizeof(struct kbdiacr) * ct);
> +                       if (IS_ERR(dia))
> +                               return PTR_ERR(dia);
> +
>                 }
>
>                 spin_lock_irqsave(&kbd_event_lock, flags);
> --
> 1.9.1
>

Hi,

Is this patch rejected for some reason or is still in queue?