[PATCH v2 03/12] zap_sector: fix memory leak

[PATCH v2 01/12] profile_create_node: set magic before strdup(name) to avoid memory leak · wuguanghao <hidden> · 2021-06-30
[PATCH v2 03/12] zap_sector: fix memory leak · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 03/12] zap_sector: fix memory leak · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
[PATCH v2 06/12] append_pathname: check the value returned by realloc · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 06/12] append_pathname: check the value returned by realloc · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
[PATCH v2 12/12] ext2ed: fix potential NULL pointer dereference in dupstr() · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 12/12] ext2ed: fix potential NULL pointer dereference in dupstr() · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
[PATCH v2 09/12] lib/ss/error.c: check return value malloc in ss_name() · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 09/12] lib/ss/error.c: check return value malloc in ss_name() · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
[PATCH v2 05/12] ss_create_invocation: fix memory leak and check whether NULL pointer · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 05/12] ss_create_invocation: fix memory leak and check whether NULL pointer · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
Re: [PATCH v2 05/12] ss_create_invocation: fix memory leak and check whether NULL pointer · Zhiqiang Liu <hidden> · 2021-07-19
[PATCH v2 02/12] tdb_transaction_recover: fix memory leak · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 02/12] tdb_transaction_recover: fix memory leak · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
[PATCH v2 11/12] misc/lsattr: check whether path is NULL in lsattr_dir_proc() · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 11/12] misc/lsattr: check whether path is NULL in lsattr_dir_proc() · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
Re: [PATCH v2 11/12] misc/lsattr: check whether path is NULL in lsattr_dir_proc() · Zhiqiang Liu <hidden> · 2021-07-17
[PATCH v2 08/12] misc: fix potential segmentation fault problem in scandir() · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 08/12] misc: fix potential segmentation fault problem in scandir() · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
[PATCH v2 04/12] ss_add_info_dir: fix memory leak and check whether · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 04/12] ss_add_info_dir: fix memory leak and check whether · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
Re: [PATCH v2 04/12] ss_add_info_dir: fix memory leak and check whether · Zhiqiang Liu <hidden> · 2021-07-17
[PATCH v2 07/12] argv_parse: check return value of malloc in argv_parse() · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 07/12] argv_parse: check return value of malloc in argv_parse() · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
[PATCH v2 10/12] hashmap: change return value type of ext2fs_hashmap_add() · wuguanghao <hidden> · 2021-06-30
Re: [PATCH v2 10/12] hashmap: change return value type of ext2fs_hashmap_add() · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16
Re: [PATCH v2 01/12] profile_create_node: set magic before strdup(name) to avoid memory leak · "Theodore Y. Ts'o" <tytso@mit.edu> · 2021-07-16

STALE1793d REVIEWED: 1 (0M)

From: wuguanghao <hidden>
Date: 2021-06-30 08:27:35
Subsystem: the rest · Maintainer: Linus Torvalds

In zap_sector(), need free buf before return,
otherwise it will cause memory leak.

Signed-off-by: Wu Guanghao <redacted>
Signed-off-by: Zhiqiang Liu <redacted>
Reviewed-by: Wu Bo <redacted>
---
 misc/mke2fs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index afbcf486..68e36ecc 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c

@@ -585,8 +585,10 @@ static void zap_sector(ext2_filsys fs, int sect, int nsect)
 		else {
 			magic = (unsigned int *) (buf + BSD_LABEL_OFFSET);
 			if ((*magic == BSD_DISKMAGIC) ||
-			    (*magic == BSD_MAGICDISK))
+			    (*magic == BSD_MAGICDISK)) {
+				free(buf);
 				return;
+			}
 		}
 	}

-- 
2.19.1

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help