2016-11-19 17:44:13

by Quentin Lambert

Subject: [PATCH] scsi: aic94xx: Add a missing call to kfree

Most error branches following the call to kzalloc contain
a call to kfree. This patch add these calls where they are
missing.

This issue was found with Hector.

Signed-off-by: Quentin Lambert <[email protected]>

---
drivers/scsi/aic94xx/aic94xx_hwi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/scsi/aic94xx/aic94xx_hwi.c
+++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
@@ -228,8 +228,10 @@ static int asd_init_scbs(struct asd_ha_s
bitmap_bytes = (asd_ha->seq.tc_index_bitmap_bits+7)/8;
bitmap_bytes = BITS_TO_LONGS(bitmap_bytes*8)*sizeof(unsigned long);
asd_ha->seq.tc_index_bitmap = kzalloc(bitmap_bytes, GFP_KERNEL);
- if (!asd_ha->seq.tc_index_bitmap)
+ if (!asd_ha->seq.tc_index_bitmap) {
+ kfree(asd_ha->seq.tc_index_array);
return -ENOMEM;
+ }

spin_lock_init(&seq->tc_index_lock);

2016-11-22 15:51:30

by Tomas Henzl

Subject: Re: [PATCH] scsi: aic94xx: Add a missing call to kfree

On 19.11.2016 18:40, Quentin Lambert wrote:
> Most error branches following the call to kzalloc contain
> a call to kfree. This patch add these calls where they are
> missing.
>
> This issue was found with Hector.

Hi Quentin,
most error branches also do set the freed pointer to NULL,
please do the same.

tomash

> Signed-off-by: Quentin Lambert <[email protected]>
>
> ---
> drivers/scsi/aic94xx/aic94xx_hwi.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> --- a/drivers/scsi/aic94xx/aic94xx_hwi.c
> +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
> @@ -228,8 +228,10 @@ static int asd_init_scbs(struct asd_ha_s
> bitmap_bytes = (asd_ha->seq.tc_index_bitmap_bits+7)/8;
> bitmap_bytes = BITS_TO_LONGS(bitmap_bytes*8)*sizeof(unsigned long);
> asd_ha->seq.tc_index_bitmap = kzalloc(bitmap_bytes, GFP_KERNEL);
> - if (!asd_ha->seq.tc_index_bitmap)
> + if (!asd_ha->seq.tc_index_bitmap) {
> + kfree(asd_ha->seq.tc_index_array);
> return -ENOMEM;
> + }
>
> spin_lock_init(&seq->tc_index_lock);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html