public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-27 01:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: don't leak uuid table on rmmod

Browse source 
Don't leak the UUID table when the module is unloaded.
(Found with kmemleak.)

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Darrick J. Wong 2015-11-03 13:06:34 +11:00 • committed by Dave Chinner
parent 47e1bf6405
commit af3b63822e
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/xfs/xfs_mount.c
View file

@ -47,6 +47,16 @@ static DEFINE_MUTEX(xfs_uuid_table_mutex);
static int xfs_uuid_table_size; static int xfs_uuid_table_size;
static uuid_t *xfs_uuid_table; static uuid_t *xfs_uuid_table;
void
xfs_uuid_table_free(void)
{
if (xfs_uuid_table_size == 0)
return;
kmem_free(xfs_uuid_table);
xfs_uuid_table = NULL;
xfs_uuid_table_size = 0;
}
/* /*
* See if the UUID is unique among mounted XFS filesystems. * See if the UUID is unique among mounted XFS filesystems.
* Mount fails if UUID is nil or a FS with the same UUID is already mounted. * Mount fails if UUID is nil or a FS with the same UUID is already mounted.

1
fs/xfs/xfs_mount.h
View file

@ -312,6 +312,7 @@ typedef struct xfs_perag {
int pagb_count; /* pagb slots in use */ int pagb_count; /* pagb slots in use */
} xfs_perag_t; } xfs_perag_t;
extern void xfs_uuid_table_free(void);
extern int xfs_log_sbcount(xfs_mount_t *); extern int xfs_log_sbcount(xfs_mount_t *);
extern __uint64_t xfs_default_resblks(xfs_mount_t *mp); extern __uint64_t xfs_default_resblks(xfs_mount_t *mp);
extern int xfs_mountfs(xfs_mount_t *mp); extern int xfs_mountfs(xfs_mount_t *mp);

1
fs/xfs/xfs_super.c
View file

@ -1896,6 +1896,7 @@ exit_xfs_fs(void)
xfs_mru_cache_uninit(); xfs_mru_cache_uninit();
xfs_destroy_workqueues(); xfs_destroy_workqueues();
xfs_destroy_zones(); xfs_destroy_zones();
xfs_uuid_table_free();
} }
module_init(init_xfs_fs); module_init(init_xfs_fs);