]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"
authorZhu Yanjun <yanjun.zhu@linux.dev>
Thu, 13 Apr 2023 10:11:15 +0000 (18:11 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:11:29 +0000 (23:11 +0900)
[ Upstream commit b2b1ddc457458fecd1c6f385baa9fbda5f0c63ad ]

In the function rxe_create_qp(), rxe_qp_from_init() is called to
initialize qp, internally things like rxe_init_task are not setup until
rxe_qp_init_req().

If an error occurred before this point then the unwind will call
rxe_cleanup() and eventually to rxe_qp_do_cleanup()/rxe_cleanup_task()
which will oops when trying to access the uninitialized spinlock.

If rxe_init_task is not executed, rxe_cleanup_task will not be called.

Reported-by: syzbot+cfcc1a3c85be15a40cba@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?id=fd85757b74b3eb59f904138486f755f71e090df8
Fixes: 8700e3e7c485 ("Soft RoCE driver")
Fixes: 2d4b21e0a291 ("IB/rxe: Prevent from completer to operate on non valid QP")
Signed-off-by: Zhu Yanjun <yanjun.zhu@linux.dev>
Link: https://lore.kernel.org/r/20230413101115.1366068-1-yanjun.zhu@intel.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/sw/rxe/rxe_qp.c

index c243e1cfcd4be625bd40d24661e8ff378dd7e5f1..13283ec06f95e1b7978f05c526d0bc17608bd47a 100644 (file)
@@ -761,9 +761,14 @@ static void rxe_qp_do_cleanup(struct work_struct *work)
                del_timer_sync(&qp->rnr_nak_timer);
        }
 
-       rxe_cleanup_task(&qp->resp.task);
-       rxe_cleanup_task(&qp->req.task);
-       rxe_cleanup_task(&qp->comp.task);
+       if (qp->resp.task.func)
+               rxe_cleanup_task(&qp->resp.task);
+
+       if (qp->req.task.func)
+               rxe_cleanup_task(&qp->req.task);
+
+       if (qp->comp.task.func)
+               rxe_cleanup_task(&qp->comp.task);
 
        /* flush out any receive wr's or pending requests */
        rxe_requester(qp);