| From b76d2b612cd5c0c6fb82340f9ec241ca75b942f9 Mon Sep 17 00:00:00 2001 |
| From: Jean Delvare <jdelvare@suse.de> |
| Date: Wed, 1 Apr 2009 13:11:29 -0500 |
| Subject: SCSI: libiscsi: fix iscsi pool error path again |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=utf-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jean Delvare <jdelvare@suse.de> |
| |
| upstream commit: fd6e1c14b73dbab89cb76af895d5612e4a8b5522 |
| |
| 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> |
| [chrisw: this is a fixlet to f474a37b, also in -stable] |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| drivers/scsi/libiscsi.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/scsi/libiscsi.c |
| +++ b/drivers/scsi/libiscsi.c |
| @@ -1866,8 +1866,10 @@ iscsi_pool_init(struct iscsi_pool *q, in |
| |
| 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); |
