On Fri, Sep 09, 2016 at 06:30:44PM +0800, Salil Mehta wrote: > From: Lijun Ou <oulijun@xxxxxxxxxx> > > Some pointers have not be checked when they are null, > so we add check for them. > > Signed-off-by: Lijun Ou <oulijun@xxxxxxxxxx> > Signed-off-by: Dongdong Huang(Donald) <hdd.huang@xxxxxxxxxx> > Reviewed-by: Wei Hu (Xavier) <xavier.huwei@xxxxxxxxxx> > Signed-off-by: Salil Mehta <salil.mehta@xxxxxxxxxx> I may admit that I didn't check your code to read the implementations of get_send_wqe() and hns_roce_v1_poll_one(), but based on my assumption that the code is similar to mlx4. These failures can't occur. Can you throw a light on how did you find them and check it? > --- > drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > index f0d6315..e3e154c 100644 > --- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > @@ -92,6 +92,12 @@ int hns_roce_v1_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, > } > > wqe = get_send_wqe(qp, ind & (qp->sq.wqe_cnt - 1)); > + if (unlikely(!wqe)) { > + dev_err(dev, "get send wqe failed\n"); > + ret = -EINVAL; > + *bad_wr = wr; > + goto out; > + } > qp->sq.wrid[(qp->sq.head + nreq) & (qp->sq.wqe_cnt - 1)] = > wr->wr_id; > > @@ -1558,6 +1564,11 @@ static int hns_roce_v1_poll_one(struct hns_roce_cq *hr_cq, > sq_wqe = get_send_wqe(*cur_qp, roce_get_field(cqe->cqe_byte_4, > CQE_BYTE_4_WQE_INDEX_M, > CQE_BYTE_4_WQE_INDEX_S)); > + if (unlikely(!sq_wqe)) { > + dev_err(dev, "Get send wqe failed!\n"); > + return -EFAULT; > + } > + > switch (sq_wqe->flag & HNS_ROCE_WQE_OPCODE_MASK) { > case HNS_ROCE_WQE_OPCODE_SEND: > wc->opcode = IB_WC_SEND; > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html
Attachment:
signature.asc
Description: PGP signature