Commit f474a37b authored Mar 05, 2009 by Jean Delvare Committed by James Bottomley Mar 13, 2009

[SCSI] libiscsi: fix iscsi pool error path



Memory freeing in iscsi_pool_free() looks wrong to me. Either q->pool
can be NULL and this should be tested before dereferencing it, or it
can't be NULL and it shouldn't be tested at all. As far as I can see,
the only case where q->pool is NULL is on early error in
iscsi_pool_init(). One possible way to fix the bug is thus to not
call iscsi_pool_free() in this case (nothing needs to be freed anyway)
and then we can get rid of the q->pool check.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 07c00ec4

drivers/scsi/libiscsi.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1944,7 +1944,7 @@ iscsi_pool_init(struct iscsi_pool q, int max, void **items, int item_size)
		num_arrays++;
		q->pool = kzalloc(num_arrays * max * sizeof(void*), GFP_KERNEL);
		if (q->pool == NULL)
		goto enomem;
		return -ENOMEM;

		q->queue = kfifo_init((void)q->pool, max sizeof(void*),
		GFP_KERNEL, NULL);
		@@ -1979,7 +1979,6 @@ void iscsi_pool_free(struct iscsi_pool *q)

		for (i = 0; i < q->max; i++)
		kfree(q->pool[i]);
		if (q->pool)
		kfree(q->pool);
		kfree(q->queue);
		}