Skip to contentSkip to conversation

RDMA/rtrs: Fix double free in alloc_clt

PATCH Superseded Miaoqian Lin 3 participants 3 messages Jan 20, 2022 – Jan 23, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/rtrs: Fix double free in alloc_clt

Callback function rtrs_clt_dev_release() in put_device() calls kfree(clt); to free memory. We shouldn't call kfree(clt) again.

Fixes 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +4 -1
index 7c3f98e57889..61723f48fbd4 100644
@@ -2741,7 +2741,7 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 	err = device_register(&clt->dev);
 	if (err) {
 		put_device(&clt->dev);
-		goto err;
+		goto err_free_cpu;
 	}
 
 	clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj);
@@ -2764,6 +2764,9 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 err:
 	free_percpu(clt->pcpu_path);
 	kfree(clt);
+	clt->pcpu_path = NULL;
+err_free_cpu:
+	free_percpu(clt->pcpu_path);
 	return ERR_PTR(err);
 }
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 4 lines · Miaoqian Lin

Callback function rtrs_clt_dev_release() in put_device() calls kfree(clt); to free memory. We shouldn't call kfree(clt) again.

right, there is a bug, but the fix is not right.

Quoted 20 lines
Fixes 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1 -1
index 7c3f98e57889..61723f48fbd4 100644
@@ -2741,7 +2741,7 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
        err = device_register(&clt->dev);
        if (err) {
                put_device(&clt->dev);
-               goto err;
+               goto err_free_cpu;
        }
 
        clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj);

drivers/infiniband/ulp/rtrs/rtrs-clt.c static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num, · line 2769

Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3 -0
@@ -2764,6 +2764,9 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 err:
        free_percpu(clt->pcpu_path);
        kfree(clt);
+       clt->pcpu_path = NULL;
+err_free_cpu:
+       free_percpu(clt->pcpu_path);

this still lead to use after free, because clt could be free already. the right fix should move the free_percpu() to the release call back before kfree(clt);

Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +0 -1
        return ERR_PTR(err);
 }
 
--

2.17.1

#2 lore raw
In reply to Miaoqian Lin
Quoted 23 lines · Miaoqian Lin

Callback function rtrs_clt_dev_release() in put_device() calls kfree(clt); to free memory. We shouldn't call kfree(clt) again.

Fixes 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1 -1
index 7c3f98e57889..61723f48fbd4 100644
@@ -2741,7 +2741,7 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 	err = device_register(&clt->dev);
 	if (err) {
 		put_device(&clt->dev);
-		goto err;
+		goto err_free_cpu;
 	}
 
 	clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj);

drivers/infiniband/ulp/rtrs/rtrs-clt.c static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num, · line 2767

Quoted 4 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1 -0
@@ -2764,6 +2764,9 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 err:
 	free_percpu(clt->pcpu_path);
 	kfree(clt);
+	clt->pcpu_path = NULL;

Like Jinpu said, it will crash, you are trying to access clt after kfree.

Thanks

Quoted 8 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2 -0
+err_free_cpu:
+	free_percpu(clt->pcpu_path);
 	return ERR_PTR(err);
 }
 
Signature · 1 line
2.17.1