tty: vt: use memdup_user to reuse the code
PATCH 1/1 tty: vt: use memdup_user to reuse the code
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
--- drivers/tty/vt/keyboard.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
drivers/tty/vt/keyboard.c +8 -20
@@ -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)
Signature · 1 line
2.1.4
Quoted 7 lines · Rahul Pathak
Fixing coccicheck warning which recommends to use
memdup_userinstead to reimplement its code, usingmemdup_usersimplifies 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 formemdup_userSigned-off-by Rahul Pathak <[email protected]>
(assuming Greg will pick it up, otherwise I can take it through my tree).
Thanks.
Quoted 53 lines
--- drivers/tty/vt/keyboard.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)drivers/tty/vt/keyboard.c +8
-20@@ -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)Signature · 1 line
2.1.4
Signature · 1 line
Dmitry
Greg KH
maintainerQuoted 11 lines · Rahul Pathak
Fixing coccicheck warning which recommends to use
memdup_userinstead to reimplement its code, usingmemdup_usersimplifies 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 formemdup_userSigned-off-by Rahul Pathak <[email protected]>Acked-by Dmitry Torokhov <[email protected]>--- drivers/tty/vt/keyboard.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
Someone else sent half of this patch already, can you redo it against my tty-testing branch of the tty.git tree and resend it?
thanks,
greg k-h
Hello Greg,
Yes I will do this.
Thanks
Rahul
Quoted 19 lines · Greg KH
Quoted 11 lines · Rahul Pathak
Fixing coccicheck warning which recommends to use
memdup_userinstead to reimplement its code, usingmemdup_usersimplifies 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 formemdup_userSigned-off-by Rahul Pathak <[email protected]>Acked-by Dmitry Torokhov <[email protected]>--- drivers/tty/vt/keyboard.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)Someone else sent half of this patch already, can you redo it against my tty-testing branch of the tty.git tree and resend it?
thanks,
greg k-h