mac: validate mac_partition is within sector
PATCH 1/1 mac: validate mac_partition is within sector
If md->signature == MAC_DRIVER_MAGIC and md->block_size == 1023, a single 512 byte sector would be read (secsize / 512). However the partition structure would be located past the end of the buffer (secsize % 512).
Signed-off-by Kees Cook <[email protected]>
---
I don't have any way to test this at the moment. Does this look sensible to others? I just noticed it during manual review of the code. I'm unclear how prefetch works in this case, but I suspect this isn't actually exploitable since pagesize > 512. But for correctness, I think the patch is a good idea.
--- block/partitions/mac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
block/partitions/mac.c +7 -3
@@ -32,7 +32,7 @@ int mac_partition(struct parsed_partitions *state)Sector sect;unsigned char *data;int slot, blocks_in_map; -unsigned secsize; +unsigned secsize, datasize, partoffset;#ifdef CONFIG_PPC_PMAC int found_root =0 ;int found_root_goodness =0 ;
@@ -50,10 +50,14 @@ int mac_partition(struct parsed_partitions *state) } secsize =be16_to_cpu (md->block_size);put_dev_sector (sect); - data =read_part_sector (state, secsize/512 , §); + datasize =round_down (secsize,512 ); + data =read_part_sector (state, datasize /512 , §);if (!data)return -1 ; - part = (struct mac_partition *) (data + secsize%512 ); + partoffset = secsize %512 ; +if (partoffset +sizeof (*part) > datasize) +return -1 ; + part = (struct mac_partition *) (data + partoffset);if (be16_to_cpu (part->signature) !=MAC_PARTITION_MAGIC ) {put_dev_sector (sect);return 0 ;/* not a MacOS disk */
Signature · 6 lines
1.9.1 -- Kees Cook Chrome OS Security