[PATCH fs/ramfs] inode.c: Fix incorrect variable freeing.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Davidlohr Bueso
Date: Sunday, June 20, 2010 - 12:27 pm

Hi,

In ramfs_fill_super(), if fsi's memory allocation fails, it will go to 'fail', 
which immediately tries to free the variable, potentially producing an Oops. 
This patch addresses this issue.

Thanks.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
 fs/ramfs/inode.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index a5ebae7..40af7a2 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -219,7 +219,7 @@ int ramfs_fill_super(struct super_block *sb, void *data, int silent)
 	sb->s_fs_info = fsi;
 	if (!fsi) {
 		err = -ENOMEM;
-		goto fail;
+		goto fail2;
 	}
 
 	err = ramfs_parse_options(data, &fsi->mount_opts);
@@ -247,11 +247,13 @@ int ramfs_fill_super(struct super_block *sb, void *data, int silent)
 	}
 
 	return 0;
-fail:
-	kfree(fsi);
+fail2:
 	sb->s_fs_info = NULL;
 	iput(inode);
 	return err;
+fail:
+	kfree(fsi);
+	goto fail2;
 }
 
 int ramfs_get_sb(struct file_system_type *fs_type,
-- 
1.7.0.4




--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH fs/ramfs] inode.c: Fix incorrect variable freeing., Davidlohr Bueso, (Sun Jun 20, 12:27 pm)