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

Commit 1a418f77 authored by Artemy Kovalyov's avatar Artemy Kovalyov Committed by Jason Gunthorpe
Browse files

IB/core: Set qp->real_qp before it may be accessed 



real_qp should be initialized before ib_destroy_qp() is called.
ib_destroy_qp() may be called in the error flow if ib_create_qp_security()
failed.

Signed-off-by: default avatarArtemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 8f4426aa

drivers/infiniband/core/core_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ static inline struct ib_qp *_ib_create_qp(struct ib_device *dev, 
	qp->device = dev;

	qp->pd = pd;

	qp->uobject = uobj;

	qp->real_qp = qp;

	/*

	 * We don't track XRC QPs for now, because they don't have PD

	 * and more importantly they are created internaly by driver,

drivers/infiniband/core/uverbs_cmd.c

+0 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,6 @@ static int create_qp(struct uverbs_attr_bundle *attrs, 
		if (ret)

			goto err_cb;



		qp->real_qp	  = qp;

		qp->pd		  = pd;

		qp->send_cq	  = attr.send_cq;

		qp->recv_cq	  = attr.recv_cq;

drivers/infiniband/core/verbs.c

+0 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,6 @@ struct ib_qp *ib_create_qp_user(struct ib_pd *pd, 
	if (ret)

		goto err;



	qp->real_qp    = qp;

	qp->qp_type    = qp_init_attr->qp_type;

	qp->rwq_ind_tbl = qp_init_attr->rwq_ind_tbl;