| From: Matan Barak <matanb@mellanox.com> |
| Date: Thu, 10 Nov 2016 11:30:55 +0200 |
| Subject: IB/mlx4: Fix create CQ error flow |
| |
| commit 593ff73bcfdc79f79a8a0df55504f75ad3e5d1a9 upstream. |
| |
| Currently, if ib_copy_to_udata fails, the CQ |
| won't be deleted from the radix tree and the HW (HW2SW). |
| |
| Fixes: 225c7b1feef1 ('IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adapters') |
| Signed-off-by: Matan Barak <matanb@mellanox.com> |
| Signed-off-by: Daniel Jurgens <danielj@mellanox.com> |
| Reviewed-by: Mark Bloch <markb@mellanox.com> |
| Signed-off-by: Leon Romanovsky <leon@kernel.org> |
| Signed-off-by: Doug Ledford <dledford@redhat.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/infiniband/hw/mlx4/cq.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/infiniband/hw/mlx4/cq.c |
| +++ b/drivers/infiniband/hw/mlx4/cq.c |
| @@ -239,11 +239,14 @@ struct ib_cq *mlx4_ib_create_cq(struct i |
| if (context) |
| if (ib_copy_to_udata(udata, &cq->mcq.cqn, sizeof (__u32))) { |
| err = -EFAULT; |
| - goto err_dbmap; |
| + goto err_cq_free; |
| } |
| |
| return &cq->ibcq; |
| |
| +err_cq_free: |
| + mlx4_cq_free(dev->dev, &cq->mcq); |
| + |
| err_dbmap: |
| if (context) |
| mlx4_ib_db_unmap_user(to_mucontext(context), &cq->db); |
