Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b348e204 authored by Zhu Yanjun's avatar Zhu Yanjun Committed by Greg Kroah-Hartman
Browse files

RDMA/rxe: Fix error unwind in rxe_create_qp() 

[ Upstream commit fd5382c5805c4bcb50fd25b7246247d3f7114733 ]

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

If an error occures 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.

Move the spinlock initializations earlier before any failures.

Fixes: 8700e3e7 ("Soft RoCE driver")
Link: https://lore.kernel.org/r/20220731063621.298405-1-yanjun.zhu@linux.dev


Reported-by: default avatar <syzbot+833061116fa28df97f3b@syzkaller.appspotmail.com>
Signed-off-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 38403d14

drivers/infiniband/sw/rxe/rxe_qp.c

+8 −4
Original line number Diff line number Diff line
@@ -211,6 +211,14 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp, 
	spin_lock_init(&qp->grp_lock);

	spin_lock_init(&qp->state_lock);



	spin_lock_init(&qp->req.task.state_lock);

	spin_lock_init(&qp->resp.task.state_lock);

	spin_lock_init(&qp->comp.task.state_lock);



	spin_lock_init(&qp->sq.sq_lock);

	spin_lock_init(&qp->rq.producer_lock);

	spin_lock_init(&qp->rq.consumer_lock);



	atomic_set(&qp->ssn, 0);

	atomic_set(&qp->skb_out, 0);

}
@@ -268,7 +276,6 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp, 
	qp->req.opcode		= -1;

	qp->comp.opcode		= -1;



	spin_lock_init(&qp->sq.sq_lock);

	skb_queue_head_init(&qp->req_pkts);



	rxe_init_task(rxe, &qp->req.task, qp,
@@ -318,9 +325,6 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp, 
		}

	}



	spin_lock_init(&qp->rq.producer_lock);

	spin_lock_init(&qp->rq.consumer_lock);



	skb_queue_head_init(&qp->resp_pkts);



	rxe_init_task(rxe, &qp->resp.task, qp,