| From: Kamal Heib <kamalheib1@gmail.com> |
| Date: Tue, 10 Jul 2018 11:56:50 +0300 |
| Subject: RDMA/mlx5: Fix memory leak in mlx5_ib_create_srq() error path |
| |
| commit d63c46734c545ad0488761059004a65c46efdde3 upstream. |
| |
| Fix memory leak in the error path of mlx5_ib_create_srq() by making sure |
| to free the allocated srq. |
| |
| Fixes: c2b37f76485f ("IB/mlx5: Fix integer overflows in mlx5_ib_create_srq") |
| Signed-off-by: Kamal Heib <kamalheib1@gmail.com> |
| Acked-by: Leon Romanovsky <leonro@mellanox.com> |
| Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> |
| [bwh: Backported to 3.16: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/infiniband/hw/mlx5/srq.c | 18 ++++++++++++------ |
| 1 file changed, 12 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/infiniband/hw/mlx5/srq.c |
| +++ b/drivers/infiniband/hw/mlx5/srq.c |
| @@ -261,18 +261,24 @@ struct ib_srq *mlx5_ib_create_srq(struct |
| |
| desc_size = sizeof(struct mlx5_wqe_srq_next_seg) + |
| srq->msrq.max_gs * sizeof(struct mlx5_wqe_data_seg); |
| - if (desc_size == 0 || srq->msrq.max_gs > desc_size) |
| - return ERR_PTR(-EINVAL); |
| + if (desc_size == 0 || srq->msrq.max_gs > desc_size) { |
| + err = -EINVAL; |
| + goto err_srq; |
| + } |
| desc_size = roundup_pow_of_two(desc_size); |
| desc_size = max_t(size_t, 32, desc_size); |
| - if (desc_size < sizeof(struct mlx5_wqe_srq_next_seg)) |
| - return ERR_PTR(-EINVAL); |
| + if (desc_size < sizeof(struct mlx5_wqe_srq_next_seg)) { |
| + err = -EINVAL; |
| + goto err_srq; |
| + } |
| srq->msrq.max_avail_gather = (desc_size - sizeof(struct mlx5_wqe_srq_next_seg)) / |
| sizeof(struct mlx5_wqe_data_seg); |
| srq->msrq.wqe_shift = ilog2(desc_size); |
| buf_size = srq->msrq.max * desc_size; |
| - if (buf_size < desc_size) |
| - return ERR_PTR(-EINVAL); |
| + if (buf_size < desc_size) { |
| + err = -EINVAL; |
| + goto err_srq; |
| + } |
| |
| if (pd->uobject) |
| err = create_srq_user(pd, srq, &in, udata, buf_size, &inlen); |