[lkml]   [2009]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[patch 28/58] SCSI: libiscsi: fix iscsi pool error path again
    2.6.27-stable review patch.  If anyone has any objections, please let us know.


    From: Jean Delvare <>

    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 <>
    Signed-off-by: James Bottomley <>
    [chrisw: this is a fixlet to f474a37b, also in -stable]
    Signed-off-by: Chris Wright <>
    Signed-off-by: Greg Kroah-Hartman <>
    drivers/scsi/libiscsi.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/scsi/libiscsi.c
    +++ b/drivers/scsi/libiscsi.c
    @@ -1811,8 +1811,10 @@ iscsi_pool_init(struct iscsi_pool *q, in

    q->queue = kfifo_init((void*)q->pool, max * sizeof(void*),
    - 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);

    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to
    More majordomo info at
    Please read the FAQ at

     \ /
      Last update: 2009-04-30 00:35    [W:0.022 / U:45.224 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site