xfs: fix some memory leaks in log recovery

commit 050552cbe06a3a9c3f977dcf11ff998ae1d5c2d5 upstream.

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>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 02f2147952b37d590a4ea101459a4ef497597fb5..248101876e1ec2f2f11aa80ad2f64ef0e92ca221 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1347,10 +1347,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));
 
@@ -5318,7 +5319,8 @@ xlog_do_recovery_pass(
                        } else {
                                XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW,
                                                log->l_mp);
-                               return -EFSCORRUPTED;
+                               error = -EFSCORRUPTED;
+                               goto bread_err1;
                        }
                }