1 files changed, 6 insertions, 17 deletions
diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c
index 1081091bbfaf..43c5dc3516e5 100644
--- a/drivers/isdn/sc/ioctl.c
+++ b/drivers/isdn/sc/ioctl.c
@@ -215,19 +215,13 @@ int sc_ioctl(int card, scs_ioctl *data)
                pr_debug("%s: DCBIOSETSPID: ioctl received\n",
                                sc_adapter[card]->devicename);
-                spid = kmalloc(SCIOC_SPIDSIZE, GFP_KERNEL);
-                if(!spid) {
-                        kfree(rcvmsg);
-                        return -ENOMEM;
-                }
                /*
                 * Get the spid from user space
                 */
-                if (copy_from_user(spid, data->dataptr, SCIOC_SPIDSIZE)) {
+                spid = memdup_user(data->dataptr, SCIOC_SPIDSIZE);
+                if (IS_ERR(spid)) {
                        kfree(rcvmsg);
-                        kfree(spid);
+                        return PTR_ERR(spid);
-                        return -EFAULT;
                }
                pr_debug("%s: SCIOCSETSPID: setting channel %d spid to %s\n", 
@@ -296,18 +290,13 @@ int sc_ioctl(int card, scs_ioctl *data)
                pr_debug("%s: SCIOSETDN: ioctl received\n",
                                sc_adapter[card]->devicename);
-                dn = kmalloc(SCIOC_DNSIZE, GFP_KERNEL);
-                if (!dn) {
-                        kfree(rcvmsg);
-                        return -ENOMEM;
-                }
                /*
                 * Get the spid from user space
                 */
-                if (copy_from_user(dn, data->dataptr, SCIOC_DNSIZE)) {
+                dn = memdup_user(data->dataptr, SCIOC_DNSIZE);
+                if (IS_ERR(dn)) {
                        kfree(rcvmsg);
-                        kfree(dn);
+                        return PTR_ERR(dn);
-                        return -EFAULT;
                }
                pr_debug("%s: SCIOCSETDN: setting channel %d dn to %s\n",