提交 f588c960 编写于 作者: S Seth Forshee 提交者: Linus Torvalds

hfsplus: Fix kfree of wrong pointers in hfsplus_fill_super() error path

Commit 6596528e ("hfsplus: ensure bio requests are not smaller than
the hardware sectors") changed the pointers used for volume header
allocations but failed to free the correct pointers in the error path
path of hfsplus_fill_super() and hfsplus_read_wrapper.

The second hunk came from a separate patch by Pavel Ivanov.
Reported-by: NPavel Ivanov <paivanof@gmail.com>
Signed-off-by: NSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: NChristoph Hellwig <hch@tuxera.com>
Cc: <stable@kernel.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 cc39c6a9
......@@ -525,8 +525,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
out_close_ext_tree:
hfs_btree_close(sbi->ext_tree);
out_free_vhdr:
kfree(sbi->s_vhdr);
kfree(sbi->s_backup_vhdr);
kfree(sbi->s_vhdr_buf);
kfree(sbi->s_backup_vhdr_buf);
out_unload_nls:
unload_nls(sbi->nls);
unload_nls(nls);
......
......@@ -272,9 +272,9 @@ int hfsplus_read_wrapper(struct super_block *sb)
return 0;
out_free_backup_vhdr:
kfree(sbi->s_backup_vhdr);
kfree(sbi->s_backup_vhdr_buf);
out_free_vhdr:
kfree(sbi->s_vhdr);
kfree(sbi->s_vhdr_buf);
out:
return error;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册