Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[cascardo/linux.git] / drivers / s390 / char / tape_3590.c

diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index d3d1936..e352047 100644 (file)
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -312,15 +312,10 @@ static int tape_3592_ioctl_kekl_set(struct tape_device *device,
                return -ENOSYS;
        if (!crypt_enabled(device))
                return -EUNATCH;
-       ext_kekls = kmalloc(sizeof(*ext_kekls), GFP_KERNEL);
-       if (!ext_kekls)
-               return -ENOMEM;
-       if (copy_from_user(ext_kekls, (char __user *)arg, sizeof(*ext_kekls))) {
-               rc = -EFAULT;
-               goto out;
-       }
+       ext_kekls = memdup_user((char __user *)arg, sizeof(*ext_kekls));
+       if (IS_ERR(ext_kekls))
+               return PTR_ERR(ext_kekls);
        rc = tape_3592_kekl_set(device, ext_kekls);
-out:
        kfree(ext_kekls);
        return rc;
 }