From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965002AbaE3RHi (ORCPT ); Fri, 30 May 2014 13:07:38 -0400 Received: from mailrelay004.isp.belgacom.be ([195.238.6.170]:22341 "EHLO mailrelay004.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754082AbaE3RHg (ORCPT ); Fri, 30 May 2014 13:07:36 -0400 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AskNAI65iFNXQxV9/2dsb2JhbABZgwerRgaYGoEJF3SCUy8jgRo3iEYB1nYXhVWIfR2EKgEDmX6LG4gSgXiBQjs From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , linux-scsi@vger.kernel.org, Anil Gurumurthy , "James E.J. Bottomley" Subject: [RFC 1/1] drivers/scsi/bfa/bfad_debugfs.c: replace 2 kzalloc/copy_from_user to memdup_user Date: Fri, 30 May 2014 19:07:36 +0200 Message-Id: <1401469656-10332-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.8.4.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (memdup_user can be used to replace kmalloc/copy_from_user. Not sure if it's ok with kzalloc ...) Cc: linux-scsi@vger.kernel.org Cc: Anil Gurumurthy Cc: "James E.J. Bottomley" Signed-off-by: Fabian Frederick --- 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