[PATCH] xfs_db: free field list when failing out of fuzz

[PATCH] xfs_db: free field list when failing out of fuzz

[Darrick J. Wong]

Fix a missed opportunity to free the field list when we fail out of the
fuzz command by refactoring the error clauses to use a common cleanup
clause.

Fixes-coverity-id: 1416141
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 db/fuzz.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/db/fuzz.c b/db/fuzz.c
index a9b1577..76dbf94 100644
--- a/db/fuzz.c
+++ b/db/fuzz.c
@@ -400,7 +400,7 @@ fuzz_struct(
 			break;
 	if (fc->fn == NULL) {
 		dbprintf(_("Unknown fuzz command '%s'.\n"), argv[1]);
-		return;
+		goto out_free;
 	}
 
 	/* if we're a root field type, go down 1 layer to get field list */
@@ -412,9 +412,8 @@ fuzz_struct(
 
 	/* run down the field list and set offsets into the data */
 	if (!flist_parse(fields, fl, iocur_top->data, 0)) {
-		flist_free(fl);
 		dbprintf(_("parsing error\n"));
-		return;
+		goto out_free;
 	}
 
 	sfl = fl;
@@ -447,8 +446,7 @@ fuzz_struct(
 	success = fc->fn(iocur_top->data, sfl->offset, bit_length);
 	if (!success) {
 		dbprintf(_("unable to fuzz field '%s'\n"), argv[0]);
-		flist_free(fl);
-		return;
+		goto out_free;
 	}
 
 	/* Write the fuzzed value back */
@@ -456,5 +454,6 @@ fuzz_struct(
 
 	flist_print(fl);
 	print_flist(fl);
+out_free:
 	flist_free(fl);
 }

Re: [PATCH] xfs_db: free field list when failing out of fuzz

[Christoph Hellwig]

On Sat, Aug 05, 2017 at 09:11:22AM -0700, Darrick J. Wong wrote:
> Fix a missed opportunity to free the field list when we fail out of the
> fuzz command by refactoring the error clauses to use a common cleanup
> clause.
> 
> Fixes-coverity-id: 1416141
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>