summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorIra Weiny2016-07-28 21:21:12 +0200
committerDoug Ledford2016-08-03 04:46:21 +0200
commit53445bb32d244b1b32e8d88346a551130fb35544 (patch)
treed693acb239cf1e977333da876a912c38ed16943f /drivers/infiniband
parentIB/hfi1: Rename TID mmu_rb_* functions (diff)
downloadkernel-qcow2-linux-53445bb32d244b1b32e8d88346a551130fb35544.tar.gz
kernel-qcow2-linux-53445bb32d244b1b32e8d88346a551130fb35544.tar.xz
kernel-qcow2-linux-53445bb32d244b1b32e8d88346a551130fb35544.zip
IB/hfi1: Prevent null pointer dereference
If a context has not been assigned or assignment failed, pq may be NULL. Move the unregister within the protection of the null check. Reviewed-by: Dean Luick <dean.luick@intel.com> Signed-off-by: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/hfi1/user_sdma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index 586f07807b27..6b8d1e8b6286 100644
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -472,8 +472,8 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd)
hfi1_cdbg(SDMA, "[%u:%u:%u] Freeing user SDMA queues", uctxt->dd->unit,
uctxt->ctxt, fd->subctxt);
pq = fd->pq;
- hfi1_mmu_rb_unregister(&pq->sdma_rb_root);
if (pq) {
+ hfi1_mmu_rb_unregister(&pq->sdma_rb_root);
spin_lock_irqsave(&uctxt->sdma_qlock, flags);
if (!list_empty(&pq->list))
list_del_init(&pq->list);