[PATCH v2 1/2] RDMA/bnxt_re: Fix some error handling paths in bnxt_re_probe()

From: Christophe JAILLET
Date: Fri Nov 01 2024 - 12:12:49 EST


If bnxt_re_add_device() fails, 'en_info' still needs to be freed, as
already done in the .remove() function.

The commit in Fixes incorrectly removed this call, certainly because it
was expecting the .remove() function was called anyway. But if the probe
fails, the remove function is not called.

There is no need to call bnxt_re_remove() as it was done before, kfree()
is enough.

Fixes: a5e099e0c464 ("RDMA/bnxt_re: Fix an error path in bnxt_re_add_device")
Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
---
Compile tested only

Changes in v2:
- use kfree() instead of calling bnxt_re_remove()

v1: https://lore.kernel.org/all/580de136ad9b85b0d70709e912cfddd21b7e3f6f.1729930153.git.christophe.jaillet@xxxxxxxxxx/
---
drivers/infiniband/hw/bnxt_re/main.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 6715c96a3eee..465cec4a1bd4 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -2025,7 +2025,15 @@ static int bnxt_re_probe(struct auxiliary_device *adev,
auxiliary_set_drvdata(adev, en_info);

rc = bnxt_re_add_device(adev, BNXT_RE_COMPLETE_INIT);
+ if (rc)
+ goto err;
+ mutex_unlock(&bnxt_re_mutex);
+ return 0;
+
+err:
mutex_unlock(&bnxt_re_mutex);
+ kfree(en_info);
+
return rc;
}

--
2.47.0