IB/mlx5: fix debugfs cleanup

If delay_drop_debugfs_init() fails in any of the operations to create
debugfs, it is calling delay_drop_debugfs_cleanup() as part of its
cleanup. But delay_drop_debugfs_cleanup() checks for 'dbg' and since
we have not yet pointed 'dbg' to the debugfs we need to cleanup, the
cleanup fails and we are left with stray debugfs elements and also a
memory leak.

Fixes: 4a5fd5d2965c ("IB/mlx5: Add necessary delay drop assignment")
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Acked-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index ab3c562d5ba7f7fbfa95cb730576a64a2d038e49..05fb4bdff6a0a53f175cbe5599e58c586acf4571 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -3837,11 +3837,13 @@ static int delay_drop_debugfs_init(struct mlx5_ib_dev *dev)
        if (!dbg)
                return -ENOMEM;
 
+       dev->delay_drop.dbg = dbg;
+
        dbg->dir_debugfs =
                debugfs_create_dir("delay_drop",
                                   dev->mdev->priv.dbg_root);
        if (!dbg->dir_debugfs)
-               return -ENOMEM;
+               goto out_debugfs;
 
        dbg->events_cnt_debugfs =
                debugfs_create_atomic_t("num_timeout_events", 0400,
@@ -3865,8 +3867,6 @@ static int delay_drop_debugfs_init(struct mlx5_ib_dev *dev)
        if (!dbg->timeout_debugfs)
                goto out_debugfs;
 
-       dev->delay_drop.dbg = dbg;
-
        return 0;
 
 out_debugfs: