IB/iSER: handle iser_device allocation error gracefully
Subsystems (2)
"iser_device" allocation failure is "handled" with a BUG_ON() right before dereferencing the NULL-pointer - fix this!
Signed-off-by Arne Redlich <[email protected]>
--- drivers/infiniband/ulp/iser/iser_verbs.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/iser/iser_verbs.c +9 -4
@@ -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)
Signature · 1 line
1.5.4.1
Quoted 3 lines · Arne Redlich
"
iser_device" allocation failure is "handled" with aBUG_ON()right before dereferencing the NULL-pointer - fix this!
I agree with this patch. I'm resending it because it depends on the 1st patch that has changed, so the 2nd patch can be applied over the new 1st patch.
Quoted 44 lines
Signed-off-by Arne Redlich <[email protected]>--- drivers/infiniband/ulp/iser/iser_verbs.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)drivers/infiniband/ulp/iser/iser_verbs.c +9
-3@@ -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;
drivers/infiniband/ulp/iser/iser_verbs.c static void iser_addr_handler(struct rdma_cm_id *cma_id) · line 385
Quoted 7 lines
drivers/infiniband/ulp/iser/iser_verbs.c +0
-1@@ -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)
iser_device" allocation failure is "handled" with a BUG_ON() right before dereferencing the NULL-pointer - fix this!
Signed-off-by Arne Redlich <[email protected]>
Signed-off-by Erez Zilber <[email protected]>
--- drivers/infiniband/ulp/iser/iser_verbs.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/iser/iser_verbs.c +9 -4
@@ -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)
Signature · 1 line
1.5.3.6
Roland Dreier
Appliedthanks applied