Commit f588c960 authored Sep 15, 2011 by Seth Forshee Committed by Linus Torvalds Sep 15, 2011

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: Pavel Ivanov <paivanof@gmail.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>
Cc: <stable@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cc39c6a9

fs/hfsplus/super.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -525,8 +525,8 @@ out_close_cat_tree:
		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);

fs/hfsplus/wrapper.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -272,9 +272,9 @@ reread:
		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;
		}

Admin message