]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ext3: fix possible non-initialized variable on htree_dirblock_to_tree()
authorCarlos Maiolino <cmaiolino@redhat.com>
Mon, 1 Oct 2012 19:50:54 +0000 (16:50 -0300)
committerJan Kara <jack@suse.cz>
Tue, 9 Oct 2012 21:21:42 +0000 (23:21 +0200)
This is a backport of ext4 commit 90b0a9732 which fixes a possible
non-initialized variable on htree_dirblock_to_tree().
Ext3 has the same non initialized variable, but, in any case it will be
initialized by ext3_get_blocks_handle(), which will avoid the bug to be
triggered, but, the non-initialized variable by htree_dirblock_to_tree() is
still a bug.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/ext3/namei.c

index 8f4fddac01a679456c8ef867d0a2e33f6592cbee..7f6c9384ee72b6a1ce6dc9ff78ea5a685bcf83da 100644 (file)
@@ -559,7 +559,7 @@ static int htree_dirblock_to_tree(struct file *dir_file,
 {
        struct buffer_head *bh;
        struct ext3_dir_entry_2 *de, *top;
-       int err, count = 0;
+       int err = 0, count = 0;
 
        dxtrace(printk("In htree dirblock_to_tree: block %d\n", block));
        if (!(bh = ext3_bread (NULL, dir, block, 0, &err)))