Commit fd6e1c14 authored Apr 01, 2009 by Jean Delvare Committed by James Bottomley Apr 03, 2009

[SCSI] libiscsi: fix iscsi pool error path



Le lundi 30 mars 2009, Chris Wright a écrit :
> q->queue could be ERR_PTR(-ENOMEM) which will break unwinding
> on error.  Make iscsi_pool_free more defensive.
>

Making the freeing of q->queue dependent on q->pool being set looks
really weird (although it is correct at the moment. But this seems
to be fixable in a much simpler way.

With the benefit that only the error case is slowed down. In both
cases we have a problem if q->queue contains an error value but it's
not -ENOMEM. Apparently this can't happen today, but it doesn't feel
right to assume this will always be true. Maybe it's the right time
to fix this as well.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 5b2639d5

drivers/scsi/libiscsi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1999,8 +1999,10 @@ iscsi_pool_init(struct iscsi_pool q, int max, void **items, int item_size)

		q->queue = kfifo_init((void)q->pool, max sizeof(void*),
		GFP_KERNEL, NULL);
		if (q->queue == ERR_PTR(-ENOMEM))
		if (IS_ERR(q->queue)) {
		q->queue = NULL;
		goto enomem;
		}

		for (i = 0; i < max; i++) {
		q->pool[i] = kzalloc(item_size, GFP_KERNEL);

Admin message