RDMA/irdma: Fix a window for use-after-free
authorMustafa Ismail <mustafa.ismail@intel.com>
Tue, 5 Jul 2022 23:08:13 +0000 (18:08 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:53 +0000 (14:23 +0200)
[ Upstream commit 8ecef7890b3aea78c8bbb501a4b5b8134367b821 ]

During a destroy CQ an interrupt may cause processing of a CQE after CQ
resources are freed by irdma_cq_free_rsrc(). Fix this by moving the call
to irdma_cq_free_rsrc() after the irdma_sc_cleanup_ceqes(), which is
called under the cq_lock.

Fixes: b48c24c2d710 ("RDMA/irdma: Implement device supported verb APIs")
Link: https://lore.kernel.org/r/20220705230815.265-6-shiraz.saleem@intel.com
Signed-off-by: Bartosz Sobczak <bartosz.sobczak@intel.com>
Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/hw/irdma/verbs.c

index 0eef464..cac4fb2 100644 (file)
@@ -1759,11 +1759,11 @@ static int irdma_destroy_cq(struct ib_cq *ib_cq, struct ib_udata *udata)
        spin_unlock_irqrestore(&iwcq->lock, flags);
 
        irdma_cq_wq_destroy(iwdev->rf, cq);
-       irdma_cq_free_rsrc(iwdev->rf, iwcq);
 
        spin_lock_irqsave(&iwceq->ce_lock, flags);
        irdma_sc_cleanup_ceqes(cq, ceq);
        spin_unlock_irqrestore(&iwceq->ce_lock, flags);
+       irdma_cq_free_rsrc(iwdev->rf, iwcq);
 
        return 0;
 }