From 8375a881f905be4ee66db24e111b3a70947a12ec Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Sat, 2 Aug 2014 22:18:29 -0400 Subject: [PATCH] e2fuzz: fix fs handle cleanup when closing fails Fix the handling of 'fs' when closing the FS fails so that we don't dereference a NULL pointer. Adapt to use ext2fs_close_free while we're at it. Signed-off-by: Darrick J. Wong Fixes-Coverity-Bug: 1229241 Signed-off-by: Theodore Ts'o --- misc/e2fuzz.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/misc/e2fuzz.c b/misc/e2fuzz.c index 644c9c5..8c989dd 100644 --- a/misc/e2fuzz.c +++ b/misc/e2fuzz.c @@ -279,23 +279,20 @@ int process_fs(const char *fsname) close(fd); /* Clean up */ - ret = ext2fs_close(fs); + ret = ext2fs_close_free(&fs); if (ret) { - fs = NULL; fprintf(stderr, "%s: error while closing filesystem\n", fsname); - goto fail2; + return 1; } return 0; fail3: close(fd); -fail2: if (corrupt_map != fs->block_map) ext2fs_free_block_bitmap(corrupt_map); fail: - if (fs) - ext2fs_close(fs); + ext2fs_close_free(&fs); return 1; } -- 1.8.3.1