2015-07-14 07:26:05

by Christophe JAILLET

Subject: [PATCH] aic7xxx: replace kmalloc/strcpy by kstrdup

This replaces kmalloc + strcpy by an equivalent call to kstrdup.

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/scsi/aic7xxx/aic79xx_osm.c | 3 +--
drivers/scsi/aic7xxx/aic7xxx_osm.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index ce96a0b..ae78e6d 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1250,9 +1250,8 @@ 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);
+ new_name = kstrdup(buf, GFP_ATOMIC);
if (new_name != NULL) {
- strcpy(new_name, buf);
ahd_set_name(ahd, new_name);
}
host->unique_id = ahd->unit;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index a2f2c77..ba59947 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1114,9 +1114,8 @@ 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);
+ new_name = kstrdup(buf, GFP_ATOMIC);
if (new_name != NULL) {
- strcpy(new_name, buf);
ahc_set_name(ahc, new_name);
}
host->unique_id = ahc->unit;
--
2.1.4

2015-07-14 09:09:19

by Dan Carpenter

Subject: Re: [PATCH] aic7xxx: replace kmalloc/strcpy by kstrdup

On Tue, Jul 14, 2015 at 09:25:16AM +0200, Christophe JAILLET wrote:
> --- a/drivers/scsi/aic7xxx/aic79xx_osm.c
> +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
> @@ -1250,9 +1250,8 @@ 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);
> + new_name = kstrdup(buf, GFP_ATOMIC);
> if (new_name != NULL) {
> - strcpy(new_name, buf);
> ahd_set_name(ahd, new_name);
> }

Remove the curly braces. And below as well.

regards,
dan carpenter

2015-07-14 10:02:23

by Christophe JAILLET

Subject: [PATCH v2] aic7xxx: replace kmalloc/strcpy by kstrdup

This replaces kmalloc + strcpy by an equivalent call to kstrdup.

Signed-off-by: Christophe JAILLET <[email protected]>
---
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);
--
2.1.4

2015-07-14 10:07:54

by Hannes Reinecke

Subject: Re: [PATCH v2] aic7xxx: replace kmalloc/strcpy by kstrdup

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 <[email protected]>
> ---
> 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 <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke zSeries & Storage
[email protected] +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)

2015-07-14 11:27:49

by walter harms

Subject: Re: [PATCH v2] aic7xxx: replace kmalloc/strcpy by kstrdup

Am 14.07.2015 12:07, schrieb Hannes Reinecke:
> 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 <[email protected]>
>> ---
>> 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 <[email protected]>



If i did not miss an other use of buf,
you can replace the sprintf/strdup combo with:

new_name = kasprintf(GFP_ATOMIC, "scsi%d", host->host_no);


just my 2 cents
re,
wh


> Cheers,
>
> Hannes