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

Commit bca27113 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: hostfs: fix double free 



Fix double free in the error path - when name is assigned into root_inode we
do not own it any more and we must not kfree() it - see patch for details.

Thanks to William Stearns for the initial report.

CC: William Stearns <wstearns@pobox.com>
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ce3c83a

fs/hostfs/hostfs_kern.c

+4 −1
Original line number Diff line number Diff line
@@ -966,6 +966,9 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) 
		goto out_put;



	HOSTFS_I(root_inode)->host_filename = name;

	/* Avoid that in the error path, iput(root_inode) frees again name through

	 * hostfs_destroy_inode! */

	name = NULL;



	err = -ENOMEM;

	sb->s_root = d_alloc_root(root_inode);
@@ -977,7 +980,7 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) 
                /* No iput in this case because the dput does that for us */

                dput(sb->s_root);

                sb->s_root = NULL;

		goto out_free;

		goto out;

        }



	return(0);