Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161831AbaKNSuF (ORCPT ); Fri, 14 Nov 2014 13:50:05 -0500 Received: from mailrelay012.isp.belgacom.be ([195.238.6.179]:18277 "EHLO mailrelay012.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161184AbaKNSuD (ORCPT ); Fri, 14 Nov 2014 13:50:03 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtcNACtOZlRXQzQ2/2dsb2JhbABbgw6BLrlDBQF1mhWBHhcBAQEBAX2EMC8jgRo3iEUBwXWQUoY+imQdhDUFhkCYDI0SiWiBRwFugUc8MIJLAQEB From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Joe Perches , Greg Kroah-Hartman , One Thousand Gnomes , Fabian Frederick , Anil Gurumurthy , Sudarsana Kalluru , "James E.J. Bottomley" , linux-scsi@vger.kernel.org Subject: [PATCH V4 linux-next RESEND 2] bfa: replace 2 kzalloc/copy_from_user by memdup_user Date: Fri, 14 Nov 2014 19:49:58 +0100 Message-Id: <1415990998-29659-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch also removes unnecessary printk(KERN_INFO Signed-off-by: Fabian Frederick --- V4: remove blank line after memdup_user V3: memdup_user first argument is already void __user * (thanks to Joe Perches) typo in title V2: Remove printk(KERN_INFO (suggested by Alan) drivers/scsi/bfa/bfad_debugfs.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c index 8e83d04..74a307c 100644 --- 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) { -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/