]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ocfs2: Initialize data_ac (might be used uninitialized)
authorMarcus Meissner <meissner@suse.de>
Thu, 5 May 2011 17:44:11 +0000 (10:44 -0700)
committerJoel Becker <jlbec@evilplan.org>
Fri, 13 May 2011 18:26:15 +0000 (11:26 -0700)
CLANG found that there is a path that has data_ac uninitialized,
this place
2917 /* This gets us the dx_root */
2918 ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &meta_ac);
2919 if (ret) {

3
Taking true branch
2920 mlog_errno(ret);
2921 goto out;

4
Control jumps to line 3168
2922 }

Goes to the out: label without data_ac being initialized.

Ciao, Marcus

Signed-Off-By: Marcus Meissner <meissner@suse.de>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
fs/ocfs2/dir.c

index 9fe5b8fd658f0a3db09f1919512a0479a241ecca..8582e3f4f120647d05df81556639e627882b5811 100644 (file)
@@ -2868,7 +2868,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
                bytes = blocks_wanted << sb->s_blocksize_bits;
        struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
        struct ocfs2_inode_info *oi = OCFS2_I(dir);
-       struct ocfs2_alloc_context *data_ac;
+       struct ocfs2_alloc_context *data_ac = NULL;
        struct ocfs2_alloc_context *meta_ac = NULL;
        struct buffer_head *dirdata_bh = NULL;
        struct buffer_head *dx_root_bh = NULL;