linux-kernel - [PATCH] RDMA/rxe: Prevent from double freeing rxe_map

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20211224054446.958913-1-lizhijian@cn.fujitsu.com>
Date:   Fri, 24 Dec 2021 13:44:46 +0800
From:   Li Zhijian <lizhijian@...fujitsu.com>
To:     <zyjzyj2000@...il.com>, <jgg@...pe.ca>
CC:     <linux-rdma@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <yanjun.zhu@...ux.dev>, Li Zhijian <lizhijian@...fujitsu.com>
Subject: [PATCH] RDMA/rxe: Prevent from double freeing rxe_map_set

a same rxe_map_set could be freed twice:
rxe_reg_user_mr()
  -> rxe_mr_init_user()
    -> rxe_mr_free_map_set() # 1st
  -> rxe_drop_ref()
   ...
    -> rxe_mr_cleanup()
      -> rxe_mr_free_map_set() # 2nd

Signed-off-by: Li Zhijian <lizhijian@...fujitsu.com>
---
 drivers/infiniband/sw/rxe/rxe_mr.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index 53271df10e47..c02385a1be55 100644
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -65,10 +65,12 @@ static void rxe_mr_init(int access, struct rxe_mr *mr)
 	mr->map_shift = ilog2(RXE_BUF_PER_MAP);
 }
 
-static void rxe_mr_free_map_set(int num_map, struct rxe_map_set *set)
+static void rxe_mr_free_map_set(int num_map, struct rxe_map_set **setp)
 {
 	int i;
+	struct rxe_map_set *set = *setp;
 
+	*setp = NULL;
 	for (i = 0; i < num_map; i++)
 		kfree(set->map[i]);
 
@@ -140,7 +142,7 @@ static int rxe_mr_alloc(struct rxe_mr *mr, int num_buf, int both)
 	if (both) {
 		ret = rxe_mr_alloc_map_set(num_map, &mr->next_map_set);
 		if (ret) {
-			rxe_mr_free_map_set(mr->num_map, mr->cur_map_set);
+			rxe_mr_free_map_set(mr->num_map, &mr->cur_map_set);
 			goto err_out;
 		}
 	}
@@ -238,7 +240,7 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
 	return 0;
 
 err_cleanup_map:
-	rxe_mr_free_map_set(mr->num_map, mr->cur_map_set);
+	rxe_mr_free_map_set(mr->num_map, &mr->cur_map_set);
 err_release_umem:
 	ib_umem_release(umem);
 err_out:
@@ -706,8 +708,8 @@ void rxe_mr_cleanup(struct rxe_pool_entry *arg)
 	ib_umem_release(mr->umem);
 
 	if (mr->cur_map_set)
-		rxe_mr_free_map_set(mr->num_map, mr->cur_map_set);
+		rxe_mr_free_map_set(mr->num_map, &mr->cur_map_set);
 
 	if (mr->next_map_set)
-		rxe_mr_free_map_set(mr->num_map, mr->next_map_set);
+		rxe_mr_free_map_set(mr->num_map, &mr->next_map_set);
 }
-- 
2.31.1