Patchwork [U-Boot] part_dos: fix crash with big sector size

login
register
mail settings
Submitter Sergei Shtylyov
Date June 3, 2011, 7:37 p.m.
Message ID <201106032337.43523.sshtylyov@ru.mvista.com>
Download mbox | patch
Permalink /patch/98643/
State Accepted
Commit 54193c5d8133f4f35267f412e5c1bbcbc6ac041c
Headers show

Comments

Sergei Shtylyov - June 3, 2011, 7:37 p.m.
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>

---
The same change is probably needed for disk/part_amiga.c but I'm not really
sure if Amiga supports USB... :-)

 disk/part_dos.c |    6 +++---
 disk/part_dos.h |    7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)
Sergei Shtylyov - July 4, 2011, 5:06 p.m.
Hello.

I wrote:

> 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>

    Wolfgang, have you forgotten about this patch? Do I need to resend?

WBR, Sergei
Sergei Shtylyov - July 26, 2011, 6:57 p.m.
Hello.

I wrote:

> 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>

> ---
> The same change is probably needed for disk/part_amiga.c but I'm not really
> sure if Amiga supports USB... :-)

    Damn, the FAT code is also hardwired for 512-byte sectors. I wonder which 
century we are in? :-)

WBR, Sergei
Wolfgang Denk - July 27, 2011, 9:41 p.m.
Dear Sergei Shtylyov,

In message <201106032337.43523.sshtylyov@ru.mvista.com> you wrote:
> 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>
> 
> ---
> The same change is probably needed for disk/part_amiga.c but I'm not really
> sure if Amiga supports USB... :-)
> 
>  disk/part_dos.c |    6 +++---
>  disk/part_dos.h |    7 -------
>  2 files changed, 3 insertions(+), 10 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

Index: u-boot/disk/part_dos.c
===================================================================
--- u-boot.orig/disk/part_dos.c
+++ u-boot/disk/part_dos.c
@@ -87,7 +87,7 @@  static int test_block_type(unsigned char
 
 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
 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 (
 				 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;
 
Index: u-boot/disk/part_dos.h
===================================================================
--- u-boot.orig/disk/part_dos.h
+++ u-boot/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