Commit 5c36fe3d87b3f0c85894a49193c66096a3d6b26f
Committed by
Linus Torvalds
Linus Torvalds
1 parent
b5654f5e7f
Exists in
master
and in
20 other branches
hfsplus: refuse to mount volumes larger than 2TB
As found in <http://bugs.debian.org/550010>, hfsplus is using type u32
rather than sector_t for some sector number calculations.
In particular, hfsplus_get_block() does:
u32 ablock, dblock, mask;
...
map_bh(bh_result, sb, (dblock << HFSPLUS_SB(sb).fs_shift) + HFSPLUS_SB(sb).blockoffset + (iblock & mask));
I am not confident that I can find and fix all cases where a sector number
may be truncated. For now, avoid data loss by refusing to mount HFS+
volumes with more than 2^32 sectors (2TB).
[akpm@linux-foundation.org: fix 32 and 64-bit issues]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Eric Sesterhenn <snakebyte@gmx.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff
fs/hfsplus/wrapper.c
| ... | ... | @@ -99,6 +99,10 @@ |
| 99 | 99 | |
| 100 | 100 | if (hfsplus_get_last_session(sb, &part_start, &part_size)) |
| 101 | 101 | return -EINVAL; |
| 102 | + if ((u64)part_start + part_size > 0x100000000ULL) { | |
| 103 | + pr_err("hfs: volumes larger than 2TB are not supported yet\n"); | |
| 104 | + return -EINVAL; | |
| 105 | + } | |
| 102 | 106 | while (1) { |
| 103 | 107 | bh = sb_bread512(sb, part_start + HFSPLUS_VOLHEAD_SECTOR, vhdr); |
| 104 | 108 | if (!bh) |