disk: part_dos: check harder for partition table.
PATCH 1/1 disk: part_dos: check harder for partition table.
From: Egbert Eich <[email protected]>
Devices that used to have a whole disk FAT filesystem but got then partitioned will most likely still have a FAT or FAT32 signature in the first sector as this sector does not get overwritten by a partitioning tool (otherwise the tool would risk to kill the mbr).
The current partition search algorithm will erronosly detect such a device as a raw FAT device.
Instead of looking for the FAT or FAT32 signatures immediately we use the same algorithm as used by the Linux kernel and first check for a valid boot indicator flag on each of the 4 partitions. If the value of this flag is invalid for the first entry we then do the raw partition check.
If the flag for any higher partition is wrong we assume the device is neiter a MBR nor PBR device.
--- disk/part_dos.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)
disk/part_dos.c +13 -3
@@ -74,13 +74,23 @@ static void print_one_part(dos_partition_t *p, int ext_part_sector,static int test_block_type (unsigned char *buffer) { +int slot; +struct dos_partition *p; +if ((buffer[DOS_PART_MAGIC_OFFSET +0 ] !=0x55 ) || (buffer[DOS_PART_MAGIC_OFFSET +1 ] !=0xaa ) ) {return (-1 ); }/* no DOS Signature at all */ -if (strncmp ((char *)&buffer[DOS_PBR_FSTYPE_OFFSET ],"FAT" ,3 )==0 || -strncmp ((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET ],"FAT32" ,5 )==0 ) { -return DOS_PBR ;/* is PBR */ + p = (struct dos_partition *)&buffer[DOS_PART_TBL_OFFSET ]; +for (slot =0 ; slot <3 ; slot++) { +if (p->boot_ind !=0 && p->boot_ind !=0x80 ) { +if (!slot && + (strncmp ((char *)&buffer[DOS_PBR_FSTYPE_OFFSET ],"FAT" ,3 )==0 || +strncmp ((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET ],"FAT32" ,5 )==0 )) { +return DOS_PBR ;/* is PBR */ + }else +return -1 ; + } }return DOS_MBR ;/* Is MBR */ }
Signature · 1 line
1.7.7
PATCH 1/1 disk/part_dos: check harder for partition table
From: Egbert Eich <[email protected]>
Devices that used to have a whole disk FAT filesystem but got then partitioned will most likely still have a FAT or FAT32 signature in the first sector as this sector does not get overwritten by a partitioning tool (otherwise the tool would risk to kill the mbr).
The current partition search algorithm will erronously detect such a device as a raw FAT device.
Instead of looking for the FAT or FAT32 signatures immediately we use the same algorithm as used by the Linux kernel and first check for a valid boot indicator flag on each of the 4 partitions. If the value of this flag is invalid for the first entry we then do the raw partition check.
If the flag for any higher partition is wrong we assume the device is neiter a MBR nor PBR device.
v2: Coding style cleanup.
--- disk/part_dos.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-)
disk/part_dos.c +15 -3
@@ -74,13 +74,25 @@ static void print_one_part(dos_partition_t *p, int ext_part_sector,static int test_block_type (unsigned char *buffer) { +int slot; +struct dos_partition *p; +if ((buffer[DOS_PART_MAGIC_OFFSET +0 ] !=0x55 ) || (buffer[DOS_PART_MAGIC_OFFSET +1 ] !=0xaa ) ) {return (-1 ); }/* no DOS Signature at all */ -if (strncmp ((char *)&buffer[DOS_PBR_FSTYPE_OFFSET ],"FAT" ,3 )==0 || -strncmp ((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET ],"FAT32" ,5 )==0 ) { -return DOS_PBR ;/* is PBR */ + p = (struct dos_partition *)&buffer[DOS_PART_TBL_OFFSET ]; +for (slot =0 ; slot <3 ; slot++) { +if (p->boot_ind !=0 && p->boot_ind !=0x80 ) { +if (!slot && + (strncmp ((char *)&buffer[DOS_PBR_FSTYPE_OFFSET ], +"FAT" ,3 ) ==0 || +strncmp ((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET ], +"FAT32" ,5 ) ==0 )) { +return DOS_PBR ;/* is PBR */ + }else +return -1 ; + } }return DOS_MBR ;/* Is MBR */ }
Signature · 1 line
1.7.7
PATCH 1/1 disk: part_dos: check harder for partition table.
In reply to egbert.eich at googlemail.comDear egbert.eich at googlemail.com,
Quoted 6 lines · In message <[email protected]> you wrote:
From: Egbert Eich <[email protected]>
Devices that used to have a whole disk FAT filesystem but got then partitioned will most likely still have a FAT or FAT32 signature in the first sector as this sector does not get overwritten by a partitioning tool (otherwise the tool would risk to kill the mbr).
Patch version missing. Patch change history missing. Checkpatch errors and warnings. Please fix!
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de People are always a lot more complicated than you think. It's very important to remember that. - Terry Pratchett, _Truckers_
PATCH v2 1/1 disk/part_dos: check harder for partition table
In reply to egbert.eich at googlemail.comFrom: Egbert Eich <[email protected]>
Devices that used to have a whole disk FAT filesystem but got then partitioned will most likely still have a FAT or FAT32 signature in the first sector as this sector does not get overwritten by a partitioning tool (otherwise the tool would risk to kill the mbr).
The current partition search algorithm will erronously detects such a device as a raw FAT device.
Instead of looking for the FAT or FAT32 signatures immediately we use the same algorithm as used by the Linux kernel and first check for a valid boot indicator flag on each of the 4 partitions. If the value of this flag is invalid for the first entry we then do the raw partition check.
If the flag for any higher partition is wrong we assume the device is neiter a MBR nor PBR device.
---
Changes for v2:
- Coding style fixes.
disk/part_dos.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
disk/part_dos.c +16 -3
@@ -74,13 +74,26 @@ static void print_one_part(dos_partition_t *p, int ext_part_sector,static int test_block_type (unsigned char *buffer) { +int slot; +struct dos_partition *p; +if ((buffer[DOS_PART_MAGIC_OFFSET +0 ] !=0x55 ) || (buffer[DOS_PART_MAGIC_OFFSET +1 ] !=0xaa ) ) {return (-1 ); }/* no DOS Signature at all */ -if (strncmp ((char *)&buffer[DOS_PBR_FSTYPE_OFFSET ],"FAT" ,3 )==0 || -strncmp ((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET ],"FAT32" ,5 )==0 ) { -return DOS_PBR ;/* is PBR */ + p = (struct dos_partition *)&buffer[DOS_PART_TBL_OFFSET ]; +for (slot =0 ; slot <3 ; slot++) { +if (p->boot_ind !=0 && p->boot_ind !=0x80 ) { +if (!slot && + (strncmp ((char *)&buffer[DOS_PBR_FSTYPE_OFFSET ], +"FAT" ,3 ) ==0 || +strncmp ((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET ], +"FAT32" ,5 ) ==0 )) { +return DOS_PBR ;/* is PBR */ + }else { +return -1 ; + } + } }return DOS_MBR ;/* Is MBR */ }
Signature · 1 line
1.8.1.4
PATCH v2 1/1 disk/part_dos: check harder for partition table
Quoted 18 lines · egbert.eich at gmail.com
From: Egbert Eich <[email protected]>
Devices that used to have a whole disk FAT filesystem but got then partitioned will most likely still have a FAT or FAT32 signature in the first sector as this sector does not get overwritten by a partitioning tool (otherwise the tool would risk to kill the mbr).
The current partition search algorithm will erronously detects such a device as a raw FAT device.
Instead of looking for the FAT or FAT32 signatures immediately we use the same algorithm as used by the Linux kernel and first check for a valid boot indicator flag on each of the 4 partitions. If the value of this flag is invalid for the first entry we then do the raw partition check.
If the flag for any higher partition is wrong we assume the device is neiter a MBR nor PBR device.
Quoted 1 line
Signed-off-by Egbert Eich <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130502/5ebcb908/attachment.pgp>