Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a20c664 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ad9759d4

fs/xfs/xfs_log_recover.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

			}

		}