Commit f588c960 authored by Seth Forshee's avatar Seth Forshee Committed by 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: default avatarPavel Ivanov <paivanof@gmail.com>
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarChristoph Hellwig <hch@tuxera.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cc39c6a9
...@@ -525,8 +525,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) ...@@ -525,8 +525,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
out_close_ext_tree: out_close_ext_tree:
hfs_btree_close(sbi->ext_tree); hfs_btree_close(sbi->ext_tree);
out_free_vhdr: out_free_vhdr:
kfree(sbi->s_vhdr); kfree(sbi->s_vhdr_buf);
kfree(sbi->s_backup_vhdr); kfree(sbi->s_backup_vhdr_buf);
out_unload_nls: out_unload_nls:
unload_nls(sbi->nls); unload_nls(sbi->nls);
unload_nls(nls); unload_nls(nls);
......
...@@ -272,9 +272,9 @@ int hfsplus_read_wrapper(struct super_block *sb) ...@@ -272,9 +272,9 @@ int hfsplus_read_wrapper(struct super_block *sb)
return 0; return 0;
out_free_backup_vhdr: out_free_backup_vhdr:
kfree(sbi->s_backup_vhdr); kfree(sbi->s_backup_vhdr_buf);
out_free_vhdr: out_free_vhdr:
kfree(sbi->s_vhdr); kfree(sbi->s_vhdr_buf);
out: out:
return error; return error;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment