On Mon, Oct 10, 2016 at 04:37:40PM +1100, Dave Chinner wrote: > On Fri, Oct 07, 2016 at 04:07:25PM -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 | 18 +++++++----------- > > 1 file changed, 7 insertions(+), 11 deletions(-) > > > > > > diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c > > index 56bfef1..87f00df 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,26 +1675,22 @@ xfs_refcount_recover_cow_leftovers( > > > > error = xfs_trans_commit(tp); > > if (error) > > - goto out_cancel; > > + goto out_free; > > } > > - goto out_free; > > + return 0; > > How does the debris list entries get freed in this case? Heh, serves me right for being overeager in reading sandeen's message. --D > > 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
