Skip to contentSkip to conversation

ovl: free stack of paths in ovl_fill_super

PATCH RESEND In review Konstantin Khlebnikov 2 participants 3 messages Aug 24, 2015 – Oct 12, 2015

Subsystems (2)
Stable branch Overlay filesystem
lore
Share & tools
lore

Konstantin Khlebnikov

author
#0 lore raw

PATCH RESEND 1/2 ovl: free stack of paths in ovl_fill_super

This fixes small memory leak after mount.

Kmemleak report:

unreferenced object 0xffff88003683fe00 (size 16):
comm "mount", pid 2029, jiffies 4294909563 (age 33.380s) hex dump (first 16 bytes):

    20 27 1f bb 00 88 ff ff 40 4b 0f 36 02 88 ff ff   '[email protected]....
  backtrace:
    [<ffffffff811f8cd4>] create_object+0x124/0x2c0
    [<ffffffff817a059b>] kmemleak_alloc+0x7b/0xc0
    [<ffffffff811dffe6>] __kmalloc+0x106/0x340
    [<ffffffffa01b7a29>] ovl_fill_super+0x389/0x9a0 [overlay]
    [<ffffffff81200ac4>] mount_nodev+0x54/0xa0
    [<ffffffffa01b7118>] ovl_mount+0x18/0x20 [overlay]
    [<ffffffff81201ab3>] mount_fs+0x43/0x170
    [<ffffffff81220d34>] vfs_kern_mount+0x74/0x170
    [<ffffffff812233ad>] do_mount+0x22d/0xdf0
    [<ffffffff812242cb>] SyS_mount+0x7b/0xc0
    [<ffffffff817b6bee>] entry_SYSCALL_64_fastpath+0x12/0x76
    [<ffffffffffffffff>] 0xffffffffffffffff
Signed-off-by Konstantin Khlebnikov <[email protected]>
Fixes a78d9f0d5d5c ("ovl: support multiple lower layers")
Cc [email protected] # v4.0
---
 fs/overlayfs/super.c |    1 +
 1 file changed, 1 insertion(+)
fs/overlayfs/super.c +1 -0
index 7466ff339c66..3f90c43c3c4a 100644
@@ -1048,6 +1048,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
 		oe->lowerstack[i].dentry = stack[i].dentry;
 		oe->lowerstack[i].mnt = ufs->lower_mnt[i];
 	}
+	kfree(stack);
 
 	root_dentry->d_fsdata = oe;
author
#1 lore raw

PATCH RESEND 2/2 ovl: free lower_mnt array in ovl_put_super

This fixes memory leak after umount.

Kmemleak report:

unreferenced object 0xffff8800ba791010 (size 8):
comm "mount", pid 2394, jiffies 4294996294 (age 53.920s) hex dump (first 8 bytes):

    20 1c 13 02 00 88 ff ff                           .......
  backtrace:
    [<ffffffff811f8cd4>] create_object+0x124/0x2c0
    [<ffffffff817a059b>] kmemleak_alloc+0x7b/0xc0
    [<ffffffff811dffe6>] __kmalloc+0x106/0x340
    [<ffffffffa0152bfc>] ovl_fill_super+0x55c/0x9b0 [overlay]
    [<ffffffff81200ac4>] mount_nodev+0x54/0xa0
    [<ffffffffa0152118>] ovl_mount+0x18/0x20 [overlay]
    [<ffffffff81201ab3>] mount_fs+0x43/0x170
    [<ffffffff81220d34>] vfs_kern_mount+0x74/0x170
    [<ffffffff812233ad>] do_mount+0x22d/0xdf0
    [<ffffffff812242cb>] SyS_mount+0x7b/0xc0
    [<ffffffff817b6bee>] entry_SYSCALL_64_fastpath+0x12/0x76
    [<ffffffffffffffff>] 0xffffffffffffffff
Signed-off-by Konstantin Khlebnikov <[email protected]>
Fixes dd662667e6d3 ("ovl: add mutli-layer infrastructure")
Cc [email protected] # v4.0
---
 fs/overlayfs/super.c |    1 +
 1 file changed, 1 insertion(+)
fs/overlayfs/super.c +1 -0
index 3f90c43c3c4a..8d04b86e0680 100644
@@ -544,6 +544,7 @@ static void ovl_put_super(struct super_block *sb)
 	mntput(ufs->upper_mnt);
 	for (i = 0; i < ufs->numlower; i++)
 		mntput(ufs->lower_mnt[i]);
+	kfree(ufs->lower_mnt);
 
 	kfree(ufs->config.lowerdir);
 	kfree(ufs->config.upperdir);