Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 10:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

RDMA/i40iw: Handle workqueue allocation failure

Browse Source 
alloc_ordered_workqueue may fail and return NULL.  The fix captures the
failure and handles it properly to avoid potential NULL pointer
dereferences.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: Shiraz, Saleem <shiraz.saleem@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Kangjie Lu 2019-03-15 01:57:14 -05:00 committed by Jason Gunthorpe
parent 4ae2744410
commit e2a438bd71
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/i40iw/i40iw.h
View File

@ -552,7 +552,7 @@ enum i40iw_status_code i40iw_obj_aligned_mem(struct i40iw_device *iwdev,
void i40iw_request_reset(struct i40iw_device *iwdev); void i40iw_request_reset(struct i40iw_device *iwdev);
void i40iw_destroy_rdma_device(struct i40iw_ib_device *iwibdev); void i40iw_destroy_rdma_device(struct i40iw_ib_device *iwibdev);
void i40iw_setup_cm_core(struct i40iw_device *iwdev); int i40iw_setup_cm_core(struct i40iw_device *iwdev);
void i40iw_cleanup_cm_core(struct i40iw_cm_core *cm_core); void i40iw_cleanup_cm_core(struct i40iw_cm_core *cm_core);
void i40iw_process_ceq(struct i40iw_device *, struct i40iw_ceq *iwceq); void i40iw_process_ceq(struct i40iw_device *, struct i40iw_ceq *iwceq);
void i40iw_process_aeq(struct i40iw_device *); void i40iw_process_aeq(struct i40iw_device *);

18
drivers/infiniband/hw/i40iw/i40iw_cm.c
View File

@ -3237,7 +3237,7 @@ void i40iw_receive_ilq(struct i40iw_sc_vsi *vsi, struct i40iw_puda_buf *rbuf)
* core * core
* @iwdev: iwarp device structure * @iwdev: iwarp device structure
*/ */
void i40iw_setup_cm_core(struct i40iw_device *iwdev) int i40iw_setup_cm_core(struct i40iw_device *iwdev)
{ {
struct i40iw_cm_core *cm_core = &iwdev->cm_core; struct i40iw_cm_core *cm_core = &iwdev->cm_core;
@ -3256,9 +3256,19 @@ void i40iw_setup_cm_core(struct i40iw_device *iwdev)
cm_core->event_wq = alloc_ordered_workqueue("iwewq", cm_core->event_wq = alloc_ordered_workqueue("iwewq",
WQ_MEM_RECLAIM); WQ_MEM_RECLAIM);
if (!cm_core->event_wq)
goto error;
cm_core->disconn_wq = alloc_ordered_workqueue("iwdwq", cm_core->disconn_wq = alloc_ordered_workqueue("iwdwq",
WQ_MEM_RECLAIM); WQ_MEM_RECLAIM);
if (!cm_core->disconn_wq)
goto error;
return 0;
error:
i40iw_cleanup_cm_core(&iwdev->cm_core);
return -ENOMEM;
} }
/** /**
@ -3278,8 +3288,10 @@ void i40iw_cleanup_cm_core(struct i40iw_cm_core *cm_core)
del_timer_sync(&cm_core->tcp_timer); del_timer_sync(&cm_core->tcp_timer);
spin_unlock_irqrestore(&cm_core->ht_lock, flags); spin_unlock_irqrestore(&cm_core->ht_lock, flags);
destroy_workqueue(cm_core->event_wq); if (cm_core->event_wq)
destroy_workqueue(cm_core->disconn_wq); destroy_workqueue(cm_core->event_wq);
if (cm_core->disconn_wq)
destroy_workqueue(cm_core->disconn_wq);
} }
/** /**

5
drivers/infiniband/hw/i40iw/i40iw_main.c
View File

@ -1641,7 +1641,10 @@ static int i40iw_open(struct i40e_info *ldev, struct i40e_client *client)
iwdev = &hdl->device; iwdev = &hdl->device;
iwdev->hdl = hdl; iwdev->hdl = hdl;
dev = &iwdev->sc_dev; dev = &iwdev->sc_dev;
i40iw_setup_cm_core(iwdev); if (i40iw_setup_cm_core(iwdev)) {
kfree(iwdev->hdl);
return -ENOMEM;
}
dev->back_dev = (void *)iwdev; dev->back_dev = (void *)iwdev;
iwdev->ldev = &hdl->ldev; iwdev->ldev = &hdl->ldev;