bfa: replace 2 kzalloc/copy_from_user by memdup_user

[linux-2.6-block.git] / drivers / scsi / bfa / bfad_debugfs.c

diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c
index 8e83d0474fe7c57560714dd488d4db1fcc1f4d15..74a307c0a2407c45af6ad42796d4944a3bec2bed 100644 (file)
--- a/drivers/scsi/bfa/bfad_debugfs.c
+++ b/drivers/scsi/bfa/bfad_debugfs.c
@@ -260,18 +260,9 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,
        unsigned long flags;
        void *kern_buf;
 
-       kern_buf = kzalloc(nbytes, GFP_KERNEL);
-
-       if (!kern_buf) {
-               printk(KERN_INFO "bfad[%d]: Failed to allocate buffer\n",
-                               bfad->inst_no);
-               return -ENOMEM;
-       }
-
-       if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
-               kfree(kern_buf);
-               return -ENOMEM;
-       }
+       kern_buf = memdup_user(buf, nbytes);
+       if (IS_ERR(kern_buf))
+               return PTR_ERR(kern_buf);
 
        rc = sscanf(kern_buf, "%x:%x", &addr, &len);
        if (rc < 2) {
@@ -336,18 +327,9 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,
        unsigned long flags;
        void *kern_buf;
 
-       kern_buf = kzalloc(nbytes, GFP_KERNEL);
-
-       if (!kern_buf) {
-               printk(KERN_INFO "bfad[%d]: Failed to allocate buffer\n",
-                               bfad->inst_no);
-               return -ENOMEM;
-       }
-
-       if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
-               kfree(kern_buf);
-               return -ENOMEM;
-       }
+       kern_buf = memdup_user(buf, nbytes);
+       if (IS_ERR(kern_buf))
+               return PTR_ERR(kern_buf);
 
        rc = sscanf(kern_buf, "%x:%x", &addr, &val);
        if (rc < 2) {