On Mon, Oct 10, 2016 at 11:21:52AM -0700, Darrick J. Wong wrote: > On Mon, Oct 10, 2016 at 03:21:13AM -0700, Christoph Hellwig wrote: > > On Sun, Oct 09, 2016 at 11:11:22PM -0700, Darrick J. Wong wrote: > > > 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@xxxxxxxxxx> > > > Reported-by: Brian Foster <bfoster@xxxxxxxxxx> > > > --- > > > fs/xfs/libxfs/xfs_refcount.c | 16 ++++++---------- > > > 1 file changed, 6 insertions(+), 10 deletions(-) > > > > > > diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c > > > index 56bfef1..955b1d9 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); Cursor is freed here when everything works... I almost modified this to be: error = xfs_btree_query_range(cur, &low, &high, xfs_refcount_recover_extent, &debris); xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR); xfs_buf_relse(agbp); if (error) goto out_free; so the "out_cursor" branch could go away.... > > > @@ -1675,26 +1675,22 @@ xfs_refcount_recover_cow_leftovers( > > > > > > error = xfs_trans_commit(tp); > > > if (error) > > > + goto out_free; > > > } > > > goto out_free; > > > > don't we need to also delete the cursor after a successful exit? > > Gah. Yeah. Serves me right for trying to code patches on Sunday night. It all looked ok to me - what did I miss? Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
