diff options
| author | Carlos Maiolino <cmaiolino@redhat.com> | 2012-10-01 21:50:54 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2012-10-09 23:21:42 +0200 |
| commit | aa9660196b250b850c9d06046c9f3b1eb965a708 (patch) | |
| tree | 07834a02268c6ee2cb2b24921d049f6cc83ef511 /fs/ext3 | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-aa9660196b250b850c9d06046c9f3b1eb965a708.tar.xz linux-aa9660196b250b850c9d06046c9f3b1eb965a708.zip | |
ext3: fix possible non-initialized variable on htree_dirblock_to_tree()
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>
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 8f4fddac01a6..7f6c9384ee72 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -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))) |