Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f588c960fcaa6fa8bf82930bb819c9aca4eb9347

Authored by Seth Forshee
Committed by Linus Torvalds
1 parent cc39c6a9bb
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Commit 6596528e391a ("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>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -525,8 +525,8 @@
525 525 out_close_ext_tree:
526 526 hfs_btree_close(sbi->ext_tree);
527 527 out_free_vhdr:
528   - kfree(sbi->s_vhdr);
529   - kfree(sbi->s_backup_vhdr);
  528 + kfree(sbi->s_vhdr_buf);
  529 + kfree(sbi->s_backup_vhdr_buf);
530 530 out_unload_nls:
531 531 unload_nls(sbi->nls);
532 532 unload_nls(nls);
fs/hfsplus/wrapper.c
Diff comments   View file @ f588c96
... ... @@ -272,9 +272,9 @@
272 272 return 0;
273 273  
274 274 out_free_backup_vhdr:
275   - kfree(sbi->s_backup_vhdr);
  275 + kfree(sbi->s_backup_vhdr_buf);
276 276 out_free_vhdr:
277   - kfree(sbi->s_vhdr);
  277 + kfree(sbi->s_vhdr_buf);
278 278 out:
279 279 return error;
280 280 }