IB/iser: Handle iser_device allocation error gracefully
authorArne Redlich <arne.redlich@xiranet.com>
Tue, 4 Mar 2008 12:11:54 +0000 (14:11 +0200)
committerRoland Dreier <rolandd@cisco.com>
Tue, 11 Mar 2008 04:17:51 +0000 (21:17 -0700)
"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>
Signed-off-by: Erez Zilber <erezz@voltaire.com>
drivers/infiniband/ulp/iser/iser_verbs.c

index 768ba69f2fd95efbfbef6755f8e12f10ae6b82f3..993f0a8ff28f838105fdf7298999e6fcb1404b92 100644 (file)
@@ -244,7 +244,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)
                /* find if there's a match using the node GUID */
                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)
@@ -260,9 +260,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;
 }
@@ -368,6 +368,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;
 
@@ -376,7 +382,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)