RDMA/nes: Resurrect error path dead code
Adrian Bunk pointed out that a Coverity scan found some apparently dead code in nes_verbs.c that really shouldn't have been dead. The function nes_create_cq() was missing the assignment err = 1; just prior to an iteration that conditionally set err = 0 if a PBL was found for a given virtual CQ. I also noticed we should have been returning -EFAULT on a couple related error paths. Signed-off-by: Chien Tung <ctung@neteffect.com> Signed-off-by: Glenn Streiff <gstreiff@neteffect.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
82d416fffb
commit
9300c0c067
|
@ -1327,7 +1327,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
|
||||||
(long long unsigned int)req.user_wqe_buffers);
|
(long long unsigned int)req.user_wqe_buffers);
|
||||||
nes_free_resource(nesadapter, nesadapter->allocated_qps, qp_num);
|
nes_free_resource(nesadapter, nesadapter->allocated_qps, qp_num);
|
||||||
kfree(nesqp->allocated_buffer);
|
kfree(nesqp->allocated_buffer);
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-EFAULT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1674,6 +1674,7 @@ static struct ib_cq *nes_create_cq(struct ib_device *ibdev, int entries,
|
||||||
}
|
}
|
||||||
nes_debug(NES_DBG_CQ, "CQ Virtual Address = %08lX, size = %u.\n",
|
nes_debug(NES_DBG_CQ, "CQ Virtual Address = %08lX, size = %u.\n",
|
||||||
(unsigned long)req.user_cq_buffer, entries);
|
(unsigned long)req.user_cq_buffer, entries);
|
||||||
|
err = 1;
|
||||||
list_for_each_entry(nespbl, &nes_ucontext->cq_reg_mem_list, list) {
|
list_for_each_entry(nespbl, &nes_ucontext->cq_reg_mem_list, list) {
|
||||||
if (nespbl->user_base == (unsigned long )req.user_cq_buffer) {
|
if (nespbl->user_base == (unsigned long )req.user_cq_buffer) {
|
||||||
list_del(&nespbl->list);
|
list_del(&nespbl->list);
|
||||||
|
@ -1686,7 +1687,7 @@ static struct ib_cq *nes_create_cq(struct ib_device *ibdev, int entries,
|
||||||
if (err) {
|
if (err) {
|
||||||
nes_free_resource(nesadapter, nesadapter->allocated_cqs, cq_num);
|
nes_free_resource(nesadapter, nesadapter->allocated_cqs, cq_num);
|
||||||
kfree(nescq);
|
kfree(nescq);
|
||||||
return ERR_PTR(err);
|
return ERR_PTR(-EFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
pbl_entries = nespbl->pbl_size >> 3;
|
pbl_entries = nespbl->pbl_size >> 3;
|
||||||
|
|
Loading…
Reference in a new issue