Skip to contentSkip to conversation

gfs2: fix possible reference leak in gfs2_check_blk_type

PATCH Superseded Zhang Qilong 2 participants 2 messages Oct 30, 2020 – Nov 4, 2020 GFS2 file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gfs2: fix possible reference leak in gfs2_check_blk_type

In the fail path of gfs2_check_blk_type, forgetting to call gfs2_glock_dq_uninit will result in rgd_gh reference leak.

---
 fs/gfs2/rgrp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
fs/gfs2/rgrp.c +3 -1
index ee491bb9c1cc..dd3e888994f7 100644
@@ -2526,8 +2526,10 @@ int gfs2_check_blk_type(struct gfs2_sbd *sdp, u64 no_addr, unsigned int type)
 
 	rbm.rgd = rgd;
 	error = gfs2_rbm_from_block(&rbm, no_addr);
-	if (WARN_ON_ONCE(error))
+	if (WARN_ON_ONCE(error)) {
+		gfs2_glock_dq_uninit(&rgd_gh);
 		goto fail;
+	}
 
 	if (gfs2_testbit(&rbm, false) != type)
 		error = -ESTALE;
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 gfs2: fix possible reference leak in gfs2_check_blk_type

----- Original Message -----

Quoted 24 lines

In the fail path of gfs2_check_blk_type, forgetting to call gfs2_glock_dq_uninit will result in rgd_gh reference leak.

---
 fs/gfs2/rgrp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
fs/gfs2/rgrp.c +3 -1
index ee491bb9c1cc..dd3e888994f7 100644
@@ -2526,8 +2526,10 @@ int gfs2_check_blk_type(struct gfs2_sbd *sdp, u64
 no_addr, unsigned int type)
 
 	rbm.rgd = rgd;
 	error = gfs2_rbm_from_block(&rbm, no_addr);
-	if (WARN_ON_ONCE(error))
+	if (WARN_ON_ONCE(error)) {
+		gfs2_glock_dq_uninit(&rgd_gh);
 		goto fail;
+	}
 
 	if (gfs2_testbit(&rbm, false) != type)
Quoted 3 lines

error = -ESTALE;
--
2.17.1

Hi,

Thanks. This is clearly a bug. Can we do something like this instead? Andreas, which do you prefer?

 fs/gfs2/rgrp.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
fs/gfs2/rgrp.c +4 -6
index 92d799a193b8..b26d6fcb6915 100644
@@ -2529,12 +2529,10 @@ int gfs2_check_blk_type(struct gfs2_sbd *sdp, u64 no_addr, unsigned int type)
 
 	rbm.rgd = rgd;
 	error = gfs2_rbm_from_block(&rbm, no_addr);
-	if (WARN_ON_ONCE(error))
-		goto fail;
-
-	if (gfs2_testbit(&rbm, false) != type)
-		error = -ESTALE;
-
+	if (!WARN_ON_ONCE(error)) {
+		if (gfs2_testbit(&rbm, false) != type)
+			error = -ESTALE;
+	}
 	gfs2_glock_dq_uninit(&rgd_gh);
 fail:
 	return error;

Regards,

Bob Peterson