From patchwork Mon Nov 7 14:01:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] ext4: fix NULL pointer dereference from orig_data in fill_super and remount. Date: Mon, 07 Nov 2011 04:01:51 -0000 From: NamJae Jeon X-Patchwork-Id: 124078 Message-Id: <1320674511-1980-1-git-send-email-linkinjeon@gmail.com> To: tytso@mit.edu Cc: linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, Namjae Jeon Fix NULL pointer dereference from orig_data in fill_super and remount. Signed-off-by: Namjae Jeon Reviewed-by: Srivatsa S. Bhat --- fs/ext4/super.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 9953d80..717b3e8 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3102,7 +3102,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) __releases(kernel_lock) __acquires(kernel_lock) { - char *orig_data = kstrdup(data, GFP_KERNEL); struct buffer_head *bh; struct ext4_super_block *es = NULL; struct ext4_sb_info *sbi; @@ -3125,6 +3124,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO; ext4_group_t first_not_zeroed; + char *orig_data = kstrdup(data, GFP_KERNEL); + if (!orig_data) + return ret; + sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) goto out_free_orig; @@ -4398,6 +4401,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) int i; #endif char *orig_data = kstrdup(data, GFP_KERNEL); + if (!orig_data) + return -ENOMEM; /* Store the original options */ lock_super(sb);