2016-11-25 12:27:36

by Quentin Lambert

Subject: [PATCH v2] 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 and set the relevant pointers to NULL.

This issue was found with Hector.

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

---
v2: set the point to NULL after having freed it
drivers/scsi/aic94xx/aic94xx_hwi.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

--- a/drivers/scsi/aic94xx/aic94xx_hwi.c
+++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
@@ -228,8 +228,11 @@ 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);
+ asd_ha->seq.tc_index_array = NULL;
return -ENOMEM;
+ }

spin_lock_init(&seq->tc_index_lock);

2016-11-28 13:48:44

by Tomas Henzl

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

On 25.11.2016 13:23, 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 and set the relevant pointers to NULL.
>
> This issue was found with Hector.
>
> Signed-off-by: Quentin Lambert <[email protected]>

Looks good,
Reviewed-by: Tomas Henzl <[email protected]>
Tomas

2016-11-29 16:15:21

by Martin K. Petersen

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

>>>>> "Quentin" == Quentin Lambert <[email protected]> writes:

Quentin> Most error branches following the call to kzalloc contain a
Quentin> call to kfree. This patch add these calls where they are
Quentin> missing and set the relevant pointers to NULL.

Applied to 4.10/scsi-queue.

--
Martin K. Petersen Oracle Linux Engineering