aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2007-03-07 23:41:07 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-08 10:38:21 -0500
commitbca271136f06514253aa28c24c04fc23b88e971e (patch)
tree00b8bd4d3d929f682e6bffa12079d366d61deb11
parent0ce3c83a9c22f59937b86c80b478dfbffe54dbab (diff)
[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: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/hostfs/hostfs_kern.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index e965eb11d76f..6f10e43746f9 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -966,6 +966,9 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
966 goto out_put; 966 goto out_put;
967 967
968 HOSTFS_I(root_inode)->host_filename = name; 968 HOSTFS_I(root_inode)->host_filename = name;
969 /* Avoid that in the error path, iput(root_inode) frees again name through
970 * hostfs_destroy_inode! */
971 name = NULL;
969 972
970 err = -ENOMEM; 973 err = -ENOMEM;
971 sb->s_root = d_alloc_root(root_inode); 974 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)
977 /* No iput in this case because the dput does that for us */ 980 /* No iput in this case because the dput does that for us */
978 dput(sb->s_root); 981 dput(sb->s_root);
979 sb->s_root = NULL; 982 sb->s_root = NULL;
980 goto out_free; 983 goto out;
981 } 984 }
982 985
983 return(0); 986 return(0);