diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-06-03 09:37:43 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-27 23:41:33 +0200 |
| commit | 54193c5d8133f4f35267f412e5c1bbcbc6ac041c (patch) | |
| tree | ffbad593301b722229711c4e7589de8ae8fc227b | |
| parent | 4204298db0c5fcf14de852c9b2c6ac3324b106b1 (diff) | |
| download | olio-uboot-2014.01-54193c5d8133f4f35267f412e5c1bbcbc6ac041c.tar.xz olio-uboot-2014.01-54193c5d8133f4f35267f412e5c1bbcbc6ac041c.zip | |
part_dos: fix crash with big sector size
Apple iPod nanos have sector sizes of 2 or 4 KiB, which crashes U-Boot when it
tries to read the MBR into 512-byte buffer situated on stack. Instead use the
variable length arrays to be safe with any large sector size.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
| -rw-r--r-- | disk/part_dos.c | 6 | ||||
| -rw-r--r-- | disk/part_dos.h | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/disk/part_dos.c b/disk/part_dos.c index 2de1bb83b..b5bcb3735 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -87,7 +87,7 @@ static int test_block_type(unsigned char *buffer) int test_part_dos (block_dev_desc_t *dev_desc) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; if ((dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) || (buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) || @@ -102,7 +102,7 @@ int test_part_dos (block_dev_desc_t *dev_desc) static void print_partition_extended (block_dev_desc_t *dev_desc, int ext_part_sector, int relative, int part_num) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; dos_partition_t *pt; int i; @@ -166,7 +166,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part int relative, int part_num, int which_part, disk_partition_t *info) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; dos_partition_t *pt; int i; diff --git a/disk/part_dos.h b/disk/part_dos.h index 195a32cb3..de755425e 100644 --- a/disk/part_dos.h +++ b/disk/part_dos.h @@ -25,13 +25,6 @@ #define _DISK_PART_DOS_H -#ifdef CONFIG_ISO_PARTITION -/* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS - have 2048 byte blocks */ -#define DEFAULT_SECTOR_SIZE 2048 -#else -#define DEFAULT_SECTOR_SIZE 512 -#endif #define DOS_PART_TBL_OFFSET 0x1be #define DOS_PART_MAGIC_OFFSET 0x1fe #define DOS_PBR_FSTYPE_OFFSET 0x36 |