From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Mon, 10 Oct 2016 06:23:07 +0000 (+1100)
Subject: xfs: rework refcount cow recovery error handling
X-Git-Tag: Ubuntu-5.2.0-15.16~8234^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6f97077ff6ef28e0f3b361b6ba9c95a222ef384b;p=mirror_ubuntu-eoan-kernel.git

xfs: rework refcount cow recovery error handling

The error handling in xfs_refcount_recover_cow_leftovers is confused
and can potentially leak memory, so rework it to release resources
correctly on error.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reported-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 56bfef116423..b177ef33cd4c 100644
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -1643,7 +1643,7 @@ xfs_refcount_recover_cow_leftovers(
 	error = xfs_btree_query_range(cur, &low, &high,
 			xfs_refcount_recover_extent, &debris);
 	if (error)
-		goto out_error;
+		goto out_cursor;
 	xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
 	xfs_buf_relse(agbp);
 
@@ -1675,14 +1675,8 @@ xfs_refcount_recover_cow_leftovers(
 
 		error = xfs_trans_commit(tp);
 		if (error)
-			goto out_cancel;
+			goto out_free;
 	}
-	goto out_free;
-
-out_defer:
-	xfs_defer_cancel(&dfops);
-out_cancel:
-	xfs_trans_cancel(tp);
 
 out_free:
 	/* Free the leftover list */
@@ -1690,11 +1684,15 @@ out_free:
 		list_del(&rr->rr_list);
 		kmem_free(rr);
 	}
-
 	return error;
 
-out_error:
+out_cursor:
 	xfs_btree_del_cursor(cur, XFS_BTREE_ERROR);
 	xfs_buf_relse(agbp);
-	return error;
+	goto out_free;
+
+out_defer:
+	xfs_defer_cancel(&dfops);
+	xfs_trans_cancel(tp);
+	goto out_free;
 }