From: Dave Chinner <dchinner@redhat.com>
Date: Tue, 12 Jun 2012 04:20:26 +0000 (+1000)
Subject: xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=76d095388b040229ea1aad7dea45be0cfa20f589;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near

When we fail to find an matching extent near the requested extent
specification during a left-right distance search in
xfs_alloc_ag_vextent_near, we fail to free the original cursor that
we used to look up the XFS_BTNUM_CNT tree and hence leak it.

Reported-by: Chris J Arges <chris.j.arges@canonical.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
---

diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index a996e398692b..9d1aeb7e2734 100644
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -1080,6 +1080,7 @@ restart:
 			goto restart;
 		}
 
+		xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
 		trace_xfs_alloc_size_neither(args);
 		args->agbno = NULLAGBLOCK;
 		return 0;