Unverified Commit 9866a4dd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15619 partitions: mac: fix handling of bogus partition table 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/GS5O5SCZOPVAGNJJ7IP36U4EUNBOT2WA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPC5K 
 
Link:https://gitee.com/openeuler/kernel/pulls/15619

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 0b5d04ae bbb361fc

block/partitions/mac.c

+15 −3
Original line number Diff line number Diff line
@@ -51,13 +51,25 @@ int mac_partition(struct parsed_partitions *state) 
	}

	secsize = be16_to_cpu(md->block_size);

	put_dev_sector(sect);



	/*

	 * If the "block size" is not a power of 2, things get weird - we might

	 * end up with a partition straddling a sector boundary, so we wouldn't

	 * be able to read a partition entry with read_part_sector().

	 * Real block sizes are probably (?) powers of two, so just require

	 * that.

	 */

	if (!is_power_of_2(secsize))

		return -1;

	datasize = round_down(secsize, 512);

	data = read_part_sector(state, datasize / 512, &sect);

	if (!data)

		return -1;

	partoffset = secsize % 512;

	if (partoffset + sizeof(*part) > datasize)

	if (partoffset + sizeof(*part) > datasize) {

		put_dev_sector(sect);

		return -1;

	}

	part = (struct mac_partition *) (data + partoffset);

	if (be16_to_cpu(part->signature) != MAC_PARTITION_MAGIC) {

		put_dev_sector(sect);
@@ -110,8 +122,8 @@ int mac_partition(struct parsed_partitions *state) 
				int i, l;



				goodness++;

				l = strlen(part->name);

				if (strcmp(part->name, "/") == 0)

				l = strnlen(part->name, sizeof(part->name));

				if (strncmp(part->name, "/", sizeof(part->name)) == 0)

					goodness++;

				for (i = 0; i <= l - 4; ++i) {

					if (strncasecmp(part->name + i, "root",