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

Commit f341a769 authored by Xiongfeng Wang's avatar Xiongfeng Wang Committed by Greg Kroah-Hartman
Browse files

IB/mthca: fix return value of error branch in mthca_init_cq() 

[ Upstream commit 6830ff853a5764c75e56750d59d0bbb6b26f1835 ]

We return 'err' in the error branch, but this variable may be set as zero
by the above code. Fix it by setting 'err' as a negative value before we
goto the error label.

Fixes: 74c2174e ("IB uverbs: add mthca user CQ support")
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Link: https://lore.kernel.org/r/1605837422-42724-1-git-send-email-wangxiongfeng2@huawei.com


Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c0961991

drivers/infiniband/hw/mthca/mthca_cq.c

+6 −4
Original line number Diff line number Diff line
@@ -808,8 +808,10 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, 
	}



	mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);

	if (IS_ERR(mailbox))

	if (IS_ERR(mailbox)) {

		err = PTR_ERR(mailbox);

		goto err_out_arm;

	}



	cq_context = mailbox->buf;
@@ -851,9 +853,9 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, 
	}



	spin_lock_irq(&dev->cq_table.lock);

	if (mthca_array_set(&dev->cq_table.cq,

			    cq->cqn & (dev->limits.num_cqs - 1),

			    cq)) {

	err = mthca_array_set(&dev->cq_table.cq,

			      cq->cqn & (dev->limits.num_cqs - 1), cq);

	if (err) {

		spin_unlock_irq(&dev->cq_table.lock);

		goto err_out_free_mr;

	}