lkml.org 
[lkml]   [2008]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [PATCH 2/2] IB/iSER: handle iser_device allocation error gracefully
    Date
    "iser_device" allocation failure is "handled" with a BUG_ON() right
    before dereferencing the NULL-pointer - fix this!

    Signed-off-by: Arne Redlich <arne.redlich@xiranet.com>
    ---
    drivers/infiniband/ulp/iser/iser_verbs.c | 13 +++++++++----
    1 files changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
    index 1c0f968..cf70d15 100644
    --- a/drivers/infiniband/ulp/iser/iser_verbs.c
    +++ b/drivers/infiniband/ulp/iser/iser_verbs.c
    @@ -243,7 +243,7 @@ struct iser_device *iser_device_find_by_ib_device(struct rdma_cm_id *cma_id)

    list_for_each_entry(device, &ig.device_list, ig_list)
    if (device->ib_device->node_guid == cma_id->device->node_guid)
    - goto out;
    + goto inc_refcnt;

    device = kzalloc(sizeof *device, GFP_KERNEL);
    if (device == NULL)
    @@ -258,9 +258,9 @@ struct iser_device *iser_device_find_by_ib_device(struct rdma_cm_id *cma_id)
    }
    list_add(&device->ig_list, &ig.device_list);

    -out:
    - BUG_ON(device == NULL);
    +inc_refcnt:
    device->refcount++;
    +out:
    mutex_unlock(&ig.device_list_mutex);
    return device;
    }
    @@ -366,6 +366,12 @@ static void iser_addr_handler(struct rdma_cm_id *cma_id)
    int ret;

    device = iser_device_find_by_ib_device(cma_id);
    + if (!device) {
    + iser_err("device lookup/creation failed\n");
    + iser_connect_error(cma_id);
    + return;
    + }
    +
    ib_conn = (struct iser_conn *)cma_id->context;
    ib_conn->device = device;

    @@ -374,7 +380,6 @@ static void iser_addr_handler(struct rdma_cm_id *cma_id)
    iser_err("resolve route failed: %d\n", ret);
    iser_connect_error(cma_id);
    }
    - return;
    }

    static void iser_route_handler(struct rdma_cm_id *cma_id)
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-03-03 12:01    [W:0.034 / U:0.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site