Skip to contentSkip to conversation

RDMA/rtrs: Fix double free in alloc_clt

PATCH In review Miaoqian Lin 2 participants 2 messages Jan 24, 2022 – Jan 25, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 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")

---
Changes in v2:
- call free_percpu() before put_device() to avoid UAF.

---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +7 -4
index 7c3f98e57889..aff04f566304 100644
@@ -2739,10 +2739,8 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 	 */
 	dev_set_uevent_suppress(&clt->dev, true);
 	err = device_register(&clt->dev);
-	if (err) {
-		put_device(&clt->dev);
-		goto err;
-	}
+	if (err)
+		goto err_register;
 
 	clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj);
 	if (!clt->kobj_paths) {
@@ -2764,6 +2762,11 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 err:
 	free_percpu(clt->pcpu_path);
 	kfree(clt);
+	goto ret;
+err_register:
+	free_percpu(clt->pcpu_path);
+	put_device(&clt->dev);
+ret:
 	return ERR_PTR(err);
 }
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 6 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")

Hi Miaoqian,
this is the complete fix.
https://lore.kernel.org/linux-rdma/Ye00cQ+VUkzh8JCH@unreal/T/#t

Thanks!

Quoted 39 lines

---
Changes in v2:
- call free_percpu() before put_device() to avoid UAF.

---
 drivers/infiniband/ulp/rtrs/rtrs-clt.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +7 -5
index 7c3f98e57889..aff04f566304 100644
@@ -2739,10 +2739,8 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
         */
        dev_set_uevent_suppress(&clt->dev, true);
        err = device_register(&clt->dev);
-       if (err) {
-               put_device(&clt->dev);
-               goto err;
-       }
+       if (err)
+               goto err_register;
 
        clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj);
        if (!clt->kobj_paths) {
@@ -2764,6 +2762,11 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
 err:
        free_percpu(clt->pcpu_path);
        kfree(clt);
+       goto ret;
+err_register:
+       free_percpu(clt->pcpu_path);
+       put_device(&clt->dev);
+ret:
        return ERR_PTR(err);
 }
 
--

2.17.1