| Message ID | 20191114211110.GM6219@magnolia (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | xfs: fix some memory leaks in log recovery | expand |
On Thu, Nov 14, 2019 at 01:11:10PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Fix a few places where we xlog_alloc_buffer a buffer, hit an error, and > then bail out without freeing the buffer. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/xfs_log_recover.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c > index f64614c3c13e..165f5181d02d 100644 > --- a/fs/xfs/xfs_log_recover.c > +++ b/fs/xfs/xfs_log_recover.c > @@ -1342,10 +1342,11 @@ xlog_find_tail( > error = xlog_rseek_logrec_hdr(log, *head_blk, *head_blk, 1, buffer, > &rhead_blk, &rhead, &wrapped); > if (error < 0) > - return error; > + goto done; > if (!error) { > xfs_warn(log->l_mp, "%s: couldn't find sync record", __func__); > - return -EFSCORRUPTED; > + error = -EFSCORRUPTED; > + goto done; > } > *tail_blk = BLOCK_LSN(be64_to_cpu(rhead->h_tail_lsn)); > > @@ -5300,7 +5301,8 @@ xlog_do_recovery_pass( > } else { > XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, > log->l_mp); > - return -EFSCORRUPTED; > + error = -EFSCORRUPTED; > + goto bread_err1; > } > } > >
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index f64614c3c13e..165f5181d02d 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -1342,10 +1342,11 @@ xlog_find_tail( error = xlog_rseek_logrec_hdr(log, *head_blk, *head_blk, 1, buffer, &rhead_blk, &rhead, &wrapped); if (error < 0) - return error; + goto done; if (!error) { xfs_warn(log->l_mp, "%s: couldn't find sync record", __func__); - return -EFSCORRUPTED; + error = -EFSCORRUPTED; + goto done; } *tail_blk = BLOCK_LSN(be64_to_cpu(rhead->h_tail_lsn)); @@ -5300,7 +5301,8 @@ xlog_do_recovery_pass( } else { XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); - return -EFSCORRUPTED; + error = -EFSCORRUPTED; + goto bread_err1; } }