hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs/partitions: Validate map_count in Mac partition tables 

Validate number of blocks in map and remove redundant variable.

Signed-off-by: Timo Warns <warns@pre-sense.de>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Timo Warns 2011-02-17 22:27:40 +01:00 committed by Linus Torvalds
parent ee71508702
commit fa7ea87a05
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/partitions/mac.c
View File

@ -29,10 +29,9 @@ static inline void mac_fix_string(char *stg, int len)
int mac_partition(struct parsed_partitions *state) int mac_partition(struct parsed_partitions *state)
{ {
int slot = 1;
Sector sect; Sector sect;
unsigned char *data; unsigned char *data;
int blk, blocks_in_map; int slot, blocks_in_map;
unsigned secsize; unsigned secsize;
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
int found_root = 0; int found_root = 0;
@ -59,10 +58,14 @@ int mac_partition(struct parsed_partitions *state)
put_dev_sector(sect); put_dev_sector(sect);
return 0; /* not a MacOS disk */ return 0; /* not a MacOS disk */
} }
strlcat(state->pp_buf, " [mac]", PAGE_SIZE);
blocks_in_map = be32_to_cpu(part->map_count); blocks_in_map = be32_to_cpu(part->map_count);
for (blk = 1; blk <= blocks_in_map; ++blk) { if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
int pos = blk * secsize; put_dev_sector(sect);
return 0;
}
strlcat(state->pp_buf, " [mac]", PAGE_SIZE);
for (slot = 1; slot <= blocks_in_map; ++slot) {
int pos = slot * secsize;
put_dev_sector(sect); put_dev_sector(sect);
data = read_part_sector(state, pos/512, &sect); data = read_part_sector(state, pos/512, &sect);
if (!data) if (!data)
@ -113,13 +116,11 @@ int mac_partition(struct parsed_partitions *state)
} }
if (goodness > found_root_goodness) { if (goodness > found_root_goodness) {
found_root = blk; found_root = slot;
found_root_goodness = goodness; found_root_goodness = goodness;
} }
} }
#endif /* CONFIG_PPC_PMAC */ #endif /* CONFIG_PPC_PMAC */
++slot;
} }
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
if (found_root_goodness) if (found_root_goodness)