| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1401469656-10332-1-git-send-email-fabf@skynet.be>
Date: Fri, 30 May 2014 19:07:36 +0200
From: Fabian Frederick <fabf@...net.be>
To: linux-kernel@...r.kernel.org
Cc: Fabian Frederick <fabf@...net.be>, linux-scsi@...r.kernel.org,
Anil Gurumurthy <anil.gurumurthy@...gic.com>,
"James E.J. Bottomley" <JBottomley@...allels.com>
Subject: [RFC 1/1] drivers/scsi/bfa/bfad_debugfs.c: replace 2 kzalloc/copy_from_user to memdup_user
(memdup_user can be used to replace kmalloc/copy_from_user. Not sure if it's ok with kzalloc ...)
Cc: linux-scsi@...r.kernel.org
Cc: Anil Gurumurthy <anil.gurumurthy@...gic.com>
Cc: "James E.J. Bottomley" <JBottomley@...allels.com>
Signed-off-by: Fabian Frederick <fabf@...net.be>
---
drivers/scsi/bfa/bfad_debugfs.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c
index 8e83d04..07b9e36 100644
--- a/drivers/scsi/bfa/bfad_debugfs.c
+++ b/drivers/scsi/bfa/bfad_debugfs.c
@@ -260,17 +260,12 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,
unsigned long flags;
void *kern_buf;
- kern_buf = kzalloc(nbytes, GFP_KERNEL);
+ kern_buf = memdup_user((void __user *)buf, nbytes);
- 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;
+ if (IS_ERR(kern_buf)) {
+ printk(KERN_INFO "bfad[%d]: Failed to copy buffer\n",
+ bfad->inst_no);
+ return PTR_ERR(kern_buf);
}
rc = sscanf(kern_buf, "%x:%x", &addr, &len);
@@ -336,17 +331,12 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,
unsigned long flags;
void *kern_buf;
- kern_buf = kzalloc(nbytes, GFP_KERNEL);
+ kern_buf = memdup_user((void __user *)buf, nbytes);
- 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;
+ if (IS_ERR(kern_buf)) {
+ printk(KERN_INFO "bfad[%d]: Failed to copy buffer\n",
+ bfad->inst_no);
+ return PTR_ERR(kern_buf);
}
rc = sscanf(kern_buf, "%x:%x", &addr, &val);
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists