From: Eric Sandeen Date: Mon, 24 Aug 2015 01:52:42 +0000 (+1000) Subject: libxfs: fix memory leasks in libxfs_umount() X-Git-Tag: v4.2.0-rc3~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4334e2e8aaa2063e8ce46db20691eabb1f545f7d;p=thirdparty%2Fxfsprogs-dev.git libxfs: fix memory leasks in libxfs_umount() libxfs_umount was failing to free a handful of resources; fix that up. Call it from xfs_copy as well, while we're at it; every other libxfs_mount has a libxfs_umount counterpart, at least on a clean exit. [dchinner: fix superblock buffer leak uncovered by adding libxfs_umount() to xfs_copy. ] Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index e13f468c3..2f4f5cbb3 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -696,6 +696,7 @@ main(int argc, char **argv) sbp = libxfs_readbuf(mbuf.m_ddev_targp, XFS_SB_DADDR, 1 << (sb->sb_sectlog - BBSHIFT), 0, &xfs_sb_buf_ops); + libxfs_putbuf(sbp); mp = libxfs_mount(&mbuf, sb, xargs.ddev, xargs.logdev, xargs.rtdev, 0); if (mp == NULL) { @@ -1165,6 +1166,8 @@ main(int argc, char **argv) } check_errors(); + libxfs_umount(mp); + return 0; } diff --git a/libxfs/init.c b/libxfs/init.c index 2859f94a9..c7f9dc8bd 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -832,6 +832,15 @@ libxfs_umount(xfs_mount_t *mp) pag = radix_tree_delete(&mp->m_perag_tree, agno); kmem_free(pag); } + + kmem_free(mp->m_attr_geo); + kmem_free(mp->m_dir_geo); + + kmem_free(mp->m_rtdev_targp); + if (mp->m_logdev_targp != mp->m_ddev_targp) + kmem_free(mp->m_logdev_targp); + kmem_free(mp->m_ddev_targp); + } /*