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

Commit 9300c0c0 authored by Chien Tung's avatar Chien Tung Committed by Roland Dreier
Browse files

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: default avatarChien Tung <ctung@neteffect.com>
Signed-off-by: default avatarGlenn Streiff <gstreiff@neteffect.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 82d416ff

drivers/infiniband/hw/nes/nes_verbs.c

+3 −2
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, 
								  (long long unsigned int)req.user_wqe_buffers);

							nes_free_resource(nesadapter, nesadapter->allocated_qps, qp_num);

							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",

				(unsigned long)req.user_cq_buffer, entries);

		err = 1;

		list_for_each_entry(nespbl, &nes_ucontext->cq_reg_mem_list, list) {

			if (nespbl->user_base == (unsigned long )req.user_cq_buffer) {

				list_del(&nespbl->list);
@@ -1686,7 +1687,7 @@ static struct ib_cq *nes_create_cq(struct ib_device *ibdev, int entries, 
		if (err) {

			nes_free_resource(nesadapter, nesadapter->allocated_cqs, cq_num);

			kfree(nescq);

			return ERR_PTR(err);

			return ERR_PTR(-EFAULT);

		}



		pbl_entries = nespbl->pbl_size >> 3;