On Sun, Dec 20, 2015 at 12:15:33AM +0530, Rahul Pathak wrote:
> Fixing coccicheck warning which recommends to use memdup_user instead
> to reimplement its code, using memdup_user simplifies the code
>
> ./drivers/tty/vt/keyboard.c:1709:9-16: WARNING opportunity for memdup_user
> ./drivers/tty/vt/keyboard.c:1752:9-16: WARNING opportunity for memdup_user
>
> Signed-off-by: Rahul Pathak <rahulpathakli...@gmail.com>
Acked-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
(assuming Greg will pick it up, otherwise I can take it through my
tree).
Thanks.
> ---
> drivers/tty/vt/keyboard.c | 28 ++++++++--------------------
> 1 file changed, 8 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
> index 6f0336f..ec05360 100644
> --- a/drivers/tty/vt/keyboard.c
> +++ b/drivers/tty/vt/keyboard.c
> @@ -1706,16 +1706,10 @@ 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);
> @@ -1749,16 +1743,10 @@ int vt_do_diacrit(unsigned int cmd, void __user *udp,
> int perm)
> return -EINVAL;
>
> if (ct) {
> - buf = kmalloc(ct * sizeof(struct kbdiacruc),
> - GFP_KERNEL);
> - if (buf == NULL)
> - return -ENOMEM;
> -
> - if (copy_from_user(buf, a->kbdiacruc,
> - ct * sizeof(struct kbdiacruc))) {
> - kfree(buf);
> - return -EFAULT;
> - }
> + buf = memdup_user(a->kbdiacruc,
> + sizeof(struct kbdiacruc) * ct);
> + if (IS_ERR(buf))
> + return PTR_ERR(buf);
> }
> spin_lock_irqsave(&kbd_event_lock, flags);
> if (ct)
> --
> 2.1.4
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
