xfs: fix some memory leaks in log recovery
authorDarrick J. Wong <darrick.wong@oracle.com>
Thu, 14 Nov 2019 20:51:34 +0000 (12:51 -0800)
committerDarrick J. Wong <darrick.wong@oracle.com>
Sat, 16 Nov 2019 05:15:29 +0000 (21:15 -0800)
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

index 75d5c15b10d0494731d257ecc0e8f47dbd0a6f62..99ec3fba45485a1aff9c665be127d102dced6a26 100644 (file)
@@ -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;
                        }
                }