| From foo@baz Sun Jun 17 12:07:33 CEST 2018 |
| From: Dag Moxnes <dag.moxnes@oracle.com> |
| Date: Wed, 25 Apr 2018 13:22:01 +0200 |
| Subject: rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp |
| |
| From: Dag Moxnes <dag.moxnes@oracle.com> |
| |
| [ Upstream commit 91a825290ca4eae88603bc811bf74a45f94a3f46 ] |
| |
| The function rds_ib_setup_qp is calling rds_ib_get_client_data and |
| should correspondingly call rds_ib_dev_put. This call was lost in |
| the non-error path with the introduction of error handling done in |
| commit 3b12f73a5c29 ("rds: ib: add error handle") |
| |
| Signed-off-by: Dag Moxnes <dag.moxnes@oracle.com> |
| Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com> |
| Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/rds/ib_cm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/net/rds/ib_cm.c |
| +++ b/net/rds/ib_cm.c |
| @@ -547,7 +547,7 @@ static int rds_ib_setup_qp(struct rds_co |
| rdsdebug("conn %p pd %p cq %p %p\n", conn, ic->i_pd, |
| ic->i_send_cq, ic->i_recv_cq); |
| |
| - return ret; |
| + goto out; |
| |
| sends_out: |
| vfree(ic->i_sends); |
| @@ -572,6 +572,7 @@ send_cq_out: |
| ic->i_send_cq = NULL; |
| rds_ibdev_out: |
| rds_ib_remove_conn(rds_ibdev, conn); |
| +out: |
| rds_ib_dev_put(rds_ibdev); |
| |
| return ret; |
