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

Commit e8ef090a authored by Yishai Hadas's avatar Yishai Hadas Committed by Jason Gunthorpe
Browse files

IB/mlx5: Destroy the DEVX object upon error flow 



Upon DEVX object creation the object must be destroyed upon a follows
error flow.

Fixes: 7efce369 ("IB/mlx5: Add obj create and destroy functionality")
Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Reviewed-by: default avatarArtemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a9360abd

drivers/infiniband/hw/mlx5/devx.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -723,6 +723,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 
		attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_HANDLE);

		attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_HANDLE);

	struct mlx5_ib_ucontext *c = to_mucontext(uobj->context);

	struct mlx5_ib_ucontext *c = to_mucontext(uobj->context);

	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);

	struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);

	u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];

	struct devx_obj *obj;

	struct devx_obj *obj;

	int err;

	int err;
@@ -754,10 +755,12 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 




	err = uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_OUT, cmd_out, cmd_out_len);

	err = uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_OUT, cmd_out, cmd_out_len);

	if (err)

	if (err)

		goto obj_free;

		goto obj_destroy;





	return 0;

	return 0;





obj_destroy:

	mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out, sizeof(out));

obj_free:

obj_free:

	kfree(obj);

	kfree(obj);

	return err;

	return err;