From: Eric Sandeen <sandeen@redhat.com>
Date: Mon, 14 Apr 2014 06:12:29 +0000 (+1000)
Subject: libxlog: fix memory leak in xlog_recover_add_to_trans
X-Git-Tag: v3.2.0-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0284875fca4eeec5d821343513e33bc243ab135b;p=thirdparty%2Fxfsprogs-dev.git

libxlog: fix memory leak in xlog_recover_add_to_trans

Free the memory in error path of xlog_recover_add_to_trans().
Normally this memory is freed in recovery pass2, but is leaked
in the error path.

Userspace version of kernel commits 519ccb8 & aaaae98

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index 3f2292100..d1fa53534 100644
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -1131,6 +1131,7 @@ xlog_recover_add_to_trans(
 		"bad number of regions (%d) in inode log format",
 				  in_f->ilf_size);
 			ASSERT(0);
+			kmem_free(ptr);
 			return XFS_ERROR(EIO);
 		}