From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753763AbbGNKHy (ORCPT ); Tue, 14 Jul 2015 06:07:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46387 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951AbbGNKHx (ORCPT ); Tue, 14 Jul 2015 06:07:53 -0400 Message-ID: <55A4DF76.80800@suse.de> Date: Tue, 14 Jul 2015 12:07:50 +0200 From: Hannes Reinecke User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Christophe JAILLET , JBottomley@odin.com CC: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH v2] aic7xxx: replace kmalloc/strcpy by kstrdup References: <4159f01e6450cee8093e7d6a0d979bbeab8243d0.1436858599.git.christophe.jaillet@wanadoo.fr> <1436868133-32096-1-git-send-email-christophe.jaillet@wanadoo.fr> In-Reply-To: <1436868133-32096-1-git-send-email-christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/14/2015 12:02 PM, Christophe JAILLET wrote: > This replaces kmalloc + strcpy by an equivalent call to kstrdup. > > Signed-off-by: Christophe JAILLET > --- > v2: remove useless curly braces > > drivers/scsi/aic7xxx/aic79xx_osm.c | 6 ++---- > drivers/scsi/aic7xxx/aic7xxx_osm.c | 6 ++---- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c > index ce96a0b..ea4086e 100644 > --- a/drivers/scsi/aic7xxx/aic79xx_osm.c > +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c > @@ -1250,11 +1250,9 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa > ahd_set_unit(ahd, ahd_linux_unit++); > ahd_unlock(ahd, &s); > sprintf(buf, "scsi%d", host->host_no); > - new_name = kmalloc(strlen(buf) + 1, GFP_ATOMIC); > - if (new_name != NULL) { > - strcpy(new_name, buf); > + new_name = kstrdup(buf, GFP_ATOMIC); > + if (new_name != NULL) > ahd_set_name(ahd, new_name); > - } > host->unique_id = ahd->unit; > ahd_linux_initialize_scsi_bus(ahd); > ahd_intr_enable(ahd, TRUE); > diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c > index a2f2c77..f0ac966 100644 > --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c > +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c > @@ -1114,11 +1114,9 @@ ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *templa > ahc_set_unit(ahc, ahc_linux_unit++); > ahc_unlock(ahc, &s); > sprintf(buf, "scsi%d", host->host_no); > - new_name = kmalloc(strlen(buf) + 1, GFP_ATOMIC); > - if (new_name != NULL) { > - strcpy(new_name, buf); > + new_name = kstrdup(buf, GFP_ATOMIC); > + if (new_name != NULL) > ahc_set_name(ahc, new_name); > - } > host->unique_id = ahc->unit; > ahc_linux_initialize_scsi_bus(ahc); > ahc_intr_enable(ahc, TRUE); > Alright, if you insist ... Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg)