RDMA/rxe: Fix BUG: KASAN: null-ptr-deref in rxe_qp_do_cleanup
Subsystems (2)
PATCH v2 1/1 RDMA/rxe: Fix BUG: KASAN: null-ptr-deref in rxe_qp_do_cleanup
From: Zhu Yanjun <[email protected]>
The function rxe_create_qp calls rxe_qp_from_init. If some error occurs, the error handler of function rxe_qp_from_init will set both scq and rcq to NULL.
Then rxe_create_qp calls rxe_put to handle qp. In the end, rxe_qp_do_cleanup is called by rxe_put. rxe_qp_do_cleanup directly accesses scq and rcq before checking them. This will cause null-ptr-deref error.
The call graph is as below:
rxe_create_qp {
...
rxe_qp_from_init {
...
err1:
...
qp->rcq = NULL; <---rcq is set to NULL
qp->scq = NULL; <---scq is set to NULL
...}
qp_init:
rxe_put{
...
rxe_qp_do_cleanup {
...
atomic_dec(&qp->scq->num_wq); <--- scq is accessed
...
atomic_dec(&qp->rcq->num_wq); <--- rcq is accessed
}
}---V1->V2: Describe the error flows.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +6 -4
@@ -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
Quoted 69 lines · On Tue, Jul 5, 2022 at 8:28 AM <[email protected]> wrote:
From: Zhu Yanjun <[email protected]>
The function
rxe_create_qpcallsrxe_qp_from_init. If some error occurs, the error handler of functionrxe_qp_from_initwill set both scq and rcq to NULL.Then
rxe_create_qpcallsrxe_putto handle qp. In the end,rxe_qp_do_cleanupis called byrxe_put.rxe_qp_do_cleanupdirectly accesses scq and rcq before checking them. This will cause null-ptr-deref error.The call graph is as below:
rxe_create_qp{
...rxe_qp_from_init { ... err1: ... qp->rcq = NULL; <---rcq is set to NULL qp->scq = NULL; <---scq is set to NULL ...}
qp_init:rxe_put{ ... rxe_qp_do_cleanup { ... atomic_dec(&qp->scq->num_wq); <--- scq is accessed ... atomic_dec(&qp->rcq->num_wq); <--- rcq is accessed } }Fixes 4703b4f0d94a ("RDMA/rxe: Enforce IBA C11-17")Signed-off-by Zhu Yanjun <[email protected]>---
V1->V2: Describe the error flows.--- drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/infiniband/sw/rxe/rxe_qp.c +6
-5@@ -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); --
Quoted 1 line
2.34.1
Looks good.
Should the check for "rxe_cleanup_task(&qp->comp.task);" also happen in this commit? or would it be covered in a different one?
Quoted 1 line
Quoted 74 lines · Haris Iqbal
Quoted 69 lines · On Tue, Jul 5, 2022 at 8:28 AM <[email protected]> wrote:
From: Zhu Yanjun <[email protected]>
The function
rxe_create_qpcallsrxe_qp_from_init. If some error occurs, the error handler of functionrxe_qp_from_initwill set both scq and rcq to NULL.Then
rxe_create_qpcallsrxe_putto handle qp. In the end,rxe_qp_do_cleanupis called byrxe_put.rxe_qp_do_cleanupdirectly accesses scq and rcq before checking them. This will cause null-ptr-deref error.The call graph is as below:
rxe_create_qp { ... rxe_qp_from_init { ... err1: ... qp->rcq = NULL; <---rcq is set to NULL qp->scq = NULL; <---scq is set to NULL ... }
qp_init:rxe_put{ ... rxe_qp_do_cleanup { ... atomic_dec(&qp->scq->num_wq); <--- scq is accessed ... atomic_dec(&qp->rcq->num_wq); <--- rcq is accessed } }Fixes 4703b4f0d94a ("RDMA/rxe: Enforce IBA C11-17")Signed-off-by Zhu Yanjun <[email protected]>---
V1->V2: Describe the error flows.--- drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/infiniband/sw/rxe/rxe_qp.c +6
-5@@ -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); --Quoted 1 line
2.34.1
Looks good.
Quoted 4 lines
Reviewed-by Md Haris Iqbal <[email protected]>Should the check for "
rxe_cleanup_task(&qp->comp.task);" also happen in this commit? or would it be covered in a different one?
It is in a different commit. I will send it out very soon.
Zhu Yanjun
Quoted 2 lines
Quoted 2 lines
Quoted 76 lines · Yanjun Zhu
Quoted 74 lines · Haris Iqbal
Quoted 69 lines · On Tue, Jul 5, 2022 at 8:28 AM <[email protected]> wrote:
From: Zhu Yanjun <[email protected]>
The function
rxe_create_qpcallsrxe_qp_from_init. If some error occurs, the error handler of functionrxe_qp_from_initwill set both scq and rcq to NULL.Then
rxe_create_qpcallsrxe_putto handle qp. In the end,rxe_qp_do_cleanupis called byrxe_put.rxe_qp_do_cleanupdirectly accesses scq and rcq before checking them. This will cause null-ptr-deref error.The call graph is as below:
rxe_create_qp { ... rxe_qp_from_init { ... err1: ... qp->rcq = NULL; <---rcq is set to NULL qp->scq = NULL; <---scq is set to NULL ... }
qp_init:rxe_put{ ... rxe_qp_do_cleanup { ... atomic_dec(&qp->scq->num_wq); <--- scq is accessed ... atomic_dec(&qp->rcq->num_wq); <--- rcq is accessed } }Fixes 4703b4f0d94a ("RDMA/rxe: Enforce IBA C11-17")Signed-off-by Zhu Yanjun <[email protected]>---
V1->V2: Describe the error flows.--- drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/infiniband/sw/rxe/rxe_qp.c +6
-5@@ -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); --Quoted 1 line
2.34.1
Looks good.
Quoted 6 lines
Quoted 4 lines
Reviewed-by Md Haris Iqbal <[email protected]>Should the check for "
rxe_cleanup_task(&qp->comp.task);" also happen in this commit? or would it be covered in a different one?It is in a different commit. I will send it out very soon.
Okay. Thank you!
Quoted 6 lines
Zhu Yanjun
Quoted 2 lines
Quoted 2 lines
Bob Pearson
Reviewed-byQuoted 77 lines · Haris Iqbal
Quoted 76 lines · Yanjun Zhu
Quoted 74 lines · Haris Iqbal
Quoted 69 lines · On Tue, Jul 5, 2022 at 8:28 AM <[email protected]> wrote:
From: Zhu Yanjun <[email protected]>
The function
rxe_create_qpcallsrxe_qp_from_init. If some error occurs, the error handler of functionrxe_qp_from_initwill set both scq and rcq to NULL.Then
rxe_create_qpcallsrxe_putto handle qp. In the end,rxe_qp_do_cleanupis called byrxe_put.rxe_qp_do_cleanupdirectly accesses scq and rcq before checking them. This will cause null-ptr-deref error.The call graph is as below:
rxe_create_qp { ... rxe_qp_from_init { ... err1: ... qp->rcq = NULL; <---rcq is set to NULL qp->scq = NULL; <---scq is set to NULL ... }
qp_init:rxe_put{ ... rxe_qp_do_cleanup { ... atomic_dec(&qp->scq->num_wq); <--- scq is accessed ... atomic_dec(&qp->rcq->num_wq); <--- rcq is accessed } }Fixes 4703b4f0d94a ("RDMA/rxe: Enforce IBA C11-17")Signed-off-by Zhu Yanjun <[email protected]>---
V1->V2: Describe the error flows.--- drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/infiniband/sw/rxe/rxe_qp.c +6
-5@@ -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); --Quoted 1 line
2.34.1
Looks good.
Quoted 15 lines
Quoted 6 lines
Quoted 4 lines
Reviewed-by Md Haris Iqbal <[email protected]>Should the check for "
rxe_cleanup_task(&qp->comp.task);" also happen in this commit? or would it be covered in a different one?It is in a different commit. I will send it out very soon.
Okay. Thank you!
Quoted 6 lines
Zhu Yanjun
Quoted 2 lines
Quoted 2 lines
Agreed.
Leon Romanovsky
AppliedQuoted 35 lines · On Tue, Jul 05, 2022 at 06:54:14PM -0400, [email protected] wrote:
From: Zhu Yanjun <[email protected]>
The function
rxe_create_qpcallsrxe_qp_from_init. If some error occurs, the error handler of functionrxe_qp_from_initwill set both scq and rcq to NULL.Then
rxe_create_qpcallsrxe_putto handle qp. In the end,rxe_qp_do_cleanupis called byrxe_put.rxe_qp_do_cleanupdirectly accesses scq and rcq before checking them. This will cause null-ptr-deref error.The call graph is as below:
rxe_create_qp{
...rxe_qp_from_init { ... err1: ... qp->rcq = NULL; <---rcq is set to NULL qp->scq = NULL; <---scq is set to NULL ...}
qp_init:rxe_put{ ... rxe_qp_do_cleanup { ... atomic_dec(&qp->scq->num_wq); <--- scq is accessed ... atomic_dec(&qp->rcq->num_wq); <--- rcq is accessed } }
Quoted 8 lines
Fixes 4703b4f0d94a ("RDMA/rxe: Enforce IBA C11-17")Signed-off-by Zhu Yanjun <[email protected]>---
V1->V2: Describe the error flows.--- drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Thanks, applied.