Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of git://git...

[cascardo/linux.git] / drivers / input / joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 6cb5a3e..5d11fea 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -444,14 +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;
-               goto out;
-       }
+       abspam = memdup_user(argp, len);
+       if (IS_ERR(abspam))
+               return PTR_ERR(abspam);
 
        for (i = 0; i < joydev->nabs; i++) {
                if (abspam[i] > ABS_MAX) {
@@ -480,14 +475,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;
-               goto out;
-       }
+       keypam = memdup_user(argp, len);
+       if (IS_ERR(keypam))
+               return PTR_ERR(keypam);
 
        for (i = 0; i < joydev->nkey; i++) {
                if (keypam[i] > KEY_MAX || keypam[i] < BTN_MISC) {