From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org
Subject: [PATCH 01/18] Input: joydev - use memdup_user() to duplicate memory from user-space
Date: Fri, 2 Oct 2015 15:40:12 +0200 [thread overview]
Message-ID: <1443793229-22363-2-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1443793229-22363-1-git-send-email-javier@osg.samsung.com>
The memdup_user() helper function can be used to duplicate a memory region
from user-space to kernel-space. There is no need to open code the same
logic using kmalloc() and copy_from_user() instead. This was found with
make coccicheck that reported the following warning:
drivers/input/joydev.c:447:10-17: WARNING opportunity for memdup_user
drivers/input/joydev.c:483:10-17: WARNING opportunity for memdup_user
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---
drivers/input/joydev.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 6cb5a3e5f9a1..e3dcd4abae18 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -444,12 +444,9 @@ static int joydev_handle_JSIOCSAXMAP(struct joydev *joydev,
len = min(len, sizeof(joydev->abspam));
/* Validate the map. */
- abspam = kmalloc(len, GFP_KERNEL);
- if (!abspam)
- return -ENOMEM;
-
- if (copy_from_user(abspam, argp, len)) {
- retval = -EFAULT;
+ abspam = memdup_user(argp, len);
+ if (IS_ERR(abspam)) {
+ retval = PTR_ERR(abspam);
goto out;
}
@@ -480,12 +477,9 @@ static int joydev_handle_JSIOCSBTNMAP(struct joydev *joydev,
len = min(len, sizeof(joydev->keypam));
/* Validate the map. */
- keypam = kmalloc(len, GFP_KERNEL);
- if (!keypam)
- return -ENOMEM;
-
- if (copy_from_user(keypam, argp, len)) {
- retval = -EFAULT;
+ keypam = memdup_user(argp, len);
+ if (IS_ERR(keypam)) {
+ retval = PTR_ERR(keypam);
goto out;
}
--
2.4.3
next prev parent reply other threads:[~2015-10-02 13:40 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-02 13:40 [PATCH 00/18] Input - Fix make coccicheck warnings Javier Martinez Canillas
2015-10-02 13:40 ` Javier Martinez Canillas [this message]
2015-10-02 18:21 ` [PATCH 01/18] Input: joydev - use memdup_user() to duplicate memory from user-space Dmitry Torokhov
2015-10-02 13:40 ` [PATCH 02/18] Input: ads7846 - use PTR_ERR_OR_ZERO() Javier Martinez Canillas
2015-10-02 18:21 ` Dmitry Torokhov
2015-10-02 13:40 ` [PATCH 03/18] Input: cyttsp " Javier Martinez Canillas
2015-10-02 18:21 ` Dmitry Torokhov
2015-10-02 13:40 ` [PATCH 04/18] Input: kxtj9 - remove unneeded retval variable Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 05/18] Input: retu-pwrbutton - simplify function return logic Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 06/18] Input: zforce " Javier Martinez Canillas
2015-10-02 13:54 ` Heiko Stübner
2015-10-02 18:15 ` Dmitry Torokhov
2015-10-02 13:40 ` [PATCH 07/18] Input: cap11xx " Javier Martinez Canillas
2015-10-02 13:41 ` Daniel Mack
2015-10-02 18:09 ` Dmitry Torokhov
2015-10-02 18:17 ` Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 08/18] Input: goldfish " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 09/18] Input: jornada720_ts " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 10/18] Input: intel-mid-touch " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 11/18] Input: da9034-ts " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 12/18] Input: pxa27x_keypad " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 13/18] Input: atmel_mxt_ts " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 14/18] Input: synaptics_i2c " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 15/18] Input: auo-pixcir-ts " Javier Martinez Canillas
2015-10-02 18:19 ` Dmitry Torokhov
2015-10-02 13:40 ` [PATCH 16/18] Input: elan_i2c " Javier Martinez Canillas
2015-10-02 16:46 ` Benson Leung
2015-10-02 13:40 ` [PATCH 17/18] Input: cypress_ps2 " Javier Martinez Canillas
2015-10-02 13:40 ` [PATCH 18/18] Input: tps6507x-ts " Javier Martinez Canillas
2015-10-02 18:20 ` Dmitry Torokhov
2015-10-02 18:25 ` [PATCH 00/18] Input - Fix make coccicheck warnings Dmitry Torokhov
2015-10-03 11:13 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443793229-22363-2-git-send-email-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).