Skip to contentSkip to conversation

RDMA/rxe: Fix BUG: KASAN: null-ptr-deref in rxe_qp_do_cleanup

PATCH Superseded [email protected] 2 participants 3 messages Jul 4, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/rxe: Fix BUG: KASAN: null-ptr-deref in rxe_qp_do_cleanup

From: Zhu Yanjun <[email protected]>

In some error handlers, both scq and rcq are set to NULL before calling rxe_qp_do_cleanup.

Fixes 4703b4f0d94a ("RDMA/rxe: Enforce IBA C11-17")
---
 drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +6 -4
index 22e9b85344c3..b79e1b43454e 100644
@@ -804,13 +804,15 @@ static void rxe_qp_do_cleanup(struct work_struct *work)
 	if (qp->rq.queue)
 		rxe_queue_cleanup(qp->rq.queue);
 
-	atomic_dec(&qp->scq->num_wq);
-	if (qp->scq)
+	if (qp->scq) {
+		atomic_dec(&qp->scq->num_wq);
 		rxe_put(qp->scq);
+	}
 
-	atomic_dec(&qp->rcq->num_wq);
-	if (qp->rcq)
+	if (qp->rcq) {
+		atomic_dec(&qp->rcq->num_wq);
 		rxe_put(qp->rcq);
+	}
 
 	if (qp->pd)
 		rxe_put(qp->pd);
Signature · 1 line
2.34.1
#1 lore raw
Quoted 4 lines · On Mon, Jul 04, 2022 at 09:22:12PM -0400, [email protected] wrote:

From: Zhu Yanjun <[email protected]>

In some error handlers, both scq and rcq are set to NULL before calling rxe_qp_do_cleanup.

Describe the error flows in the commit message please

Jason

author
#2 lore raw
Quoted 6 lines · Jason Gunthorpe
Quoted 4 lines · On Mon, Jul 04, 2022 at 09:22:12PM -0400, [email protected] wrote:

From: Zhu Yanjun <[email protected]>

In some error handlers, both scq and rcq are set to NULL before calling rxe_qp_do_cleanup.

Describe the error flows in the commit message please

Got it. I will send the latest commit very soon.

Zhu Yanjun

Quoted 2 lines

Jason