2020-10-16 09:07:19

by Jing Xiangfeng

Subject: [PATCH] RDMA/core: Fix error return in _ib_modify_qp()

Fix to return error code PTR_ERR() from the error handling case instead of
0.

Fixes: 51aab12631dd ("RDMA/core: Get xmit slave for LAG")
Signed-off-by: Jing Xiangfeng <[email protected]>
---
drivers/infiniband/core/verbs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 307886737646..bf63c7561e8c 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1685,8 +1685,10 @@ static int _ib_modify_qp(struct ib_qp *qp, struct ib_qp_attr *attr,
slave = rdma_lag_get_ah_roce_slave(qp->device,
&attr->ah_attr,
GFP_KERNEL);
- if (IS_ERR(slave))
+ if (IS_ERR(slave)) {
+ ret = PTR_ERR(slave);
goto out_av;
+ }
attr->xmit_slave = slave;
}
}
--
2.17.1

2020-10-18 10:29:08

by Maor Gottlieb

Subject: Re: [PATCH] RDMA/core: Fix error return in _ib_modify_qp()

On 10/16/2020 10:58 AM, Jing Xiangfeng wrote:
> Fix to return error code PTR_ERR() from the error handling case instead of
> 0.
>
> Fixes: 51aab12631dd ("RDMA/core: Get xmit slave for LAG")
> Signed-off-by: Jing Xiangfeng <[email protected]>
> ---
> drivers/infiniband/core/verbs.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
> index 307886737646..bf63c7561e8c 100644
> --- a/drivers/infiniband/core/verbs.c
> +++ b/drivers/infiniband/core/verbs.c
> @@ -1685,8 +1685,10 @@ static int _ib_modify_qp(struct ib_qp *qp, struct ib_qp_attr *attr,
> slave = rdma_lag_get_ah_roce_slave(qp->device,
> &attr->ah_attr,
> GFP_KERNEL);
> - if (IS_ERR(slave))
> + if (IS_ERR(slave)) {
> + ret = PTR_ERR(slave);
> goto out_av;
> + }
> attr->xmit_slave = slave;
> }
> }

Looks good,
Reviewed-by: Maor Gottlieb <[email protected]>

2020-10-28 21:42:52

by Jason Gunthorpe

Subject: Re: [PATCH] RDMA/core: Fix error return in _ib_modify_qp()

On Fri, Oct 16, 2020 at 03:58:45PM +0800, Jing Xiangfeng wrote:
> Fix to return error code PTR_ERR() from the error handling case instead of
> 0.
>
> Fixes: 51aab12631dd ("RDMA/core: Get xmit slave for LAG")
> Signed-off-by: Jing Xiangfeng <[email protected]>
> Reviewed-by: Maor Gottlieb <[email protected]>
> ---
> drivers/infiniband/core/verbs.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)

Applied to for-next, thanks

Jason