chainloader: Fix wrong break condition (must be AND not OR)
PATCH 1/1 chainloader: Fix wrong break condition (must be AND not OR)
The definition of bpb's num_total_sectors_16 and num_total_sectors_32 is that either the 16-bit field is non-zero and is used (in which case eg mkfs.fat sets the 32-bit field to zero), or it is zero and the 32-bit field is used. Therefore, a BPB is invalid only if *both* fields are zero; having one field as zero and the other as non-zero is the case to be expected.
This affects all users of grub_chainloader_patch_bpb which are in chainloader.c, freedos.c, and ntldr.c
Tested with lDebug booted in qemu via grub2's
FreeDOS direct loading support, refer to
https://bitbucket.org/ecm/ldosboot + https://bitbucket.org/ecm/ldebug
--- grub-core/loader/i386/pc/chainloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0
b/grub-core/loader/i386/pc/chainloader.c
index c79c4fe0f..18220b7aa 100644
grub-core/loader/i386/pc/chainloader.c +0 -0
@@ -117,7 +117,7 @@ grub_chainloader_patch_bpb (void *bs, grub_device_t
dev, grub_uint8_t dl)
if (bpb->num_reserved_sectors == 0)
break;
- if (bpb->num_total_sectors_16 == 0 || bpb->num_total_sectors_32 == 0)
+ if (bpb->num_total_sectors_16 == 0 && bpb->num_total_sectors_32 == 0)
break;
if (bpb->num_fats == 0)
Signature · 1 line
2.11.0
Quoted 6 lines · C. Masloch
The definition of bpb's
num_total_sectors_16andnum_total_sectors_32is that either the 16-bit field is non-zero and is used (in which case eg mkfs.fat sets the 32-bit field to zero), or it is zero and the 32-bit field is used. Therefore, a BPB is invalid only if *both* fields are zero; having one field as zero and the other as non-zero is the case to be expected.
Could you provide reference to the spec which says that?
Quoted 2 lines
This affects all users of
grub_chainloader_patch_bpbwhich are inchainloader.c,freedos.c, andntldr.c
I am happy that you fix that issue but
https://en.wikipedia.org/wiki/Design_of_the_FAT_file_system#BPB331_OFS_15h
shows that life is more complicated.
Could you take that into account?
Quoted 3 lines
Tested with lDebug booted in qemu via grub2's
FreeDOS direct loading support, refer to
https://bitbucket.org/ecm/ldosboot + https://bitbucket.org/ecm/ldebug
Could you put your SOB here?
Daniel
Quoted 9 lines · Daniel Kiper
Quoted 6 lines · C. Masloch
The definition of bpb's
num_total_sectors_16andnum_total_sectors_32is that either the 16-bit field is non-zero and is used (in which case eg mkfs.fat sets the 32-bit field to zero), or it is zero and the 32-bit field is used. Therefore, a BPB is invalid only if *both* fields are zero; having one field as zero and the other as non-zero is the case to be expected.Could you provide reference to the spec which says that?
Here's a few descriptions pointing to that fact:
https://www.win.tue.nl/~aeb/linux/fs/fat/fat-1.html
Quoted 1 line
The old 2-byte fields "total number of sectors" and "number of
sectors per FAT" are now zero; this information is now found in the new 4-byte fields.
(Here given in the FAT32 EBPB section but the total sectors 16/32 bit fields semantic is true of FAT12 and FAT16 too.)
https://wiki.osdev.org/FAT#BPB_.28BIOS_Parameter_Block.29
Quoted 1 line
19 | 2 | The total sectors in the logical volume. If this value is 0,
it means there are more than 65535 sectors in the volume, and the actual count is stored in "Large Sectors (bytes 32-35).
Quoted 1 line
32 | 4 | Large amount of sector on media. This field is set if there
are more than 65535 sectors in the volume.
(Doesn't specify what the "large" field is set to when unused, but as mentioned mkfs.fat sets it to zero then.)
https://technet.microsoft.com/en-us/library/cc976796.aspx
Quoted 10 lines
0x13| WORD |0x0000|
Small Sectors . The number of sectors on the volume represented in 16 bits (< 65,536). For volumes larger than 65,536 sectors, this field has a value of zero and the Large Sectors field is used instead.
0x20| DWORD |0x01F03E00|
Large Sectors . If the value of the Small Sectors field is zero, this field contains the total number of sectors in the FAT16 volume. If the value of the Small Sectors field is not zero, the value of this field is zero.
https://staff.washington.edu/dittrich/misc/fatgen103.pdf page 10
Quoted 9 lines
BPB_TotSec16| 19 | 2 |
This field is the old 16-bit total count of sectors on the volume. This count includes the count of all sectors in all four regions of the volume. This field can be 0; if it is 0, thenBPB_TotSec32must be non-zero. For FAT32 volumes, this field must be 0. For FAT12 and FAT16 volumes, this field contains the sector count, andBPB_TotSec32is 0 if the total sector count “fits” (is less than0x10000).
Quoted 7 lines
BPB_TotSec32| 32 | 4 |
This field is the new 32-bit total count of sectors on the volume. This count includes the count of all sectors in all four regions of the volume. This field can be 0; if it is 0, thenBPB_TotSec16must be non-zero. For FAT32 volumes, this field must be non-zero. For FAT12/FAT16 volumes, this field contains the sector count ifBPB_TotSec16is 0 (count is greater than or equal to0x10000).
(This specifies that an unused BPB_TotSec32 field is set to zero.)
Quoted 8 lines
Quoted 2 lines
This affects all users of
grub_chainloader_patch_bpbwhich are inchainloader.c,freedos.c, andntldr.cI am happy that you fix that issue but
https://en.wikipedia.org/wiki/Design_of_the_FAT_file_system#BPB331_OFS_15h
shows that life is more complicated.Could you take that into account?
MS-DOS 3.20 and 3.30 BPBs aren't supported anyway. The special case for using a partition table entry's partition length field isn't applicable here. (If it were, the function simply shouldn't check these fields.) And this is the first I've read of that DR-DOS extension. (And again, the simple solution to that one is also not to check the fields for zeros.)
Quoted 5 lines
Quoted 3 lines
Tested with lDebug booted in qemu via grub2's
FreeDOS direct loading support, refer to
https://bitbucket.org/ecm/ldosboot + https://bitbucket.org/ecm/ldebugCould you put your SOB here?
Like this?
(Should I submit a PATCH v2 for this?)
Quoted 76 lines · C. Masloch
Quoted 9 lines · Daniel Kiper
Quoted 6 lines · C. Masloch
The definition of bpb's
num_total_sectors_16andnum_total_sectors_32is that either the 16-bit field is non-zero and is used (in which case eg mkfs.fat sets the 32-bit field to zero), or it is zero and the 32-bit field is used. Therefore, a BPB is invalid only if *both* fields are zero; having one field as zero and the other as non-zero is the case to be expected.Could you provide reference to the spec which says that?
Here's a few descriptions pointing to that fact:
https://www.win.tue.nl/~aeb/linux/fs/fat/fat-1.html
Quoted 1 line
The old 2-byte fields "total number of sectors" and "number of
sectors per FAT" are now zero; this information is now found in the new 4-byte fields.
(Here given in the FAT32 EBPB section but the total sectors 16/32 bit fields semantic is true of FAT12 and FAT16 too.)
https://wiki.osdev.org/FAT#BPB_.28BIOS_Parameter_Block.29
Quoted 1 line
19 | 2 | The total sectors in the logical volume. If this value is 0,
it means there are more than 65535 sectors in the volume, and the actual count is stored in "Large Sectors (bytes 32-35).
Quoted 1 line
32 | 4 | Large amount of sector on media. This field is set if there
are more than 65535 sectors in the volume.
(Doesn't specify what the "large" field is set to when unused, but as mentioned mkfs.fat sets it to zero then.)
https://technet.microsoft.com/en-us/library/cc976796.aspx
Quoted 10 lines
0x13| WORD |0x0000|
Small Sectors . The number of sectors on the volume represented in 16 bits (< 65,536). For volumes larger than 65,536 sectors, this field has a value of zero and the Large Sectors field is used instead.
0x20| DWORD |0x01F03E00|
Large Sectors . If the value of the Small Sectors field is zero, this field contains the total number of sectors in the FAT16 volume. If the value of the Small Sectors field is not zero, the value of this field is zero.https://staff.washington.edu/dittrich/misc/fatgen103.pdf page 10
Quoted 9 lines
BPB_TotSec16| 19 | 2 |
This field is the old 16-bit total count of sectors on the volume. This count includes the count of all sectors in all four regions of the volume. This field can be 0; if it is 0, thenBPB_TotSec32must be non-zero. For FAT32 volumes, this field must be 0. For FAT12 and FAT16 volumes, this field contains the sector count, andBPB_TotSec32is 0 if the total sector count ???fits??? (is less than0x10000).Quoted 7 lines
BPB_TotSec32| 32 | 4 |
This field is the new 32-bit total count of sectors on the volume. This count includes the count of all sectors in all four regions of the volume. This field can be 0; if it is 0, thenBPB_TotSec16must be non-zero. For FAT32 volumes, this field must be non-zero. For FAT12/FAT16 volumes, this field contains the sector count ifBPB_TotSec16is 0 (count is greater than or equal to0x10000).(This specifies that an unused
BPB_TotSec32field is set to zero.)Quoted 3 lines
Quoted 2 lines
This affects all users of
grub_chainloader_patch_bpbwhich are inchainloader.c,freedos.c, andntldr.c
Quoted 7 lines
Quoted 5 lines
I am happy that you fix that issue but
https://en.wikipedia.org/wiki/Design_of_the_FAT_file_system#BPB331_OFS_15h
shows that life is more complicated.Could you take that into account?
MS-DOS 3.20 and 3.30 BPBs aren't supported anyway. The special case for
Aren't supported by whom? GRUB2?
Quoted 2 lines
using a partition table entry's partition length field isn't applicable here. (If it were, the function simply shouldn't check these fields.)
Please say why exactly it is not applicable here.
Quoted 7 lines
And this is the first I've read of that DR-DOS extension. (And again, the simple solution to that one is also not to check the fields for zeros.)
Quoted 4 lines
Quoted 3 lines
Tested with lDebug booted in qemu via grub2's
FreeDOS direct loading support, refer to
https://bitbucket.org/ecm/ldosboot + https://bitbucket.org/ecm/ldebug
Quoted 5 lines
Quoted 1 line
Could you put your SOB here?
Like this?
Signed-off-by C. Masloch <[email protected]>
Yep.
Quoted 1 line
(Should I submit a PATCH v2 for this?)
Yes, please. I am happy to commit this patch if you provide such a nice and detailed explanation like above but with better formating. And please add some stuff which I asked for too.
Daniel
Quoted 9 lines · Daniel Kiper
Quoted 7 lines
Quoted 5 lines
I am happy that you fix that issue but
https://en.wikipedia.org/wiki/Design_of_the_FAT_file_system#BPB331_OFS_15h
shows that life is more complicated.Could you take that into account?
MS-DOS 3.20 and 3.30 BPBs aren't supported anyway. The special case for
Aren't supported by whom? GRUB2?
Yes. If you look at include/grub/fat.h, the format is that which is specified as "DOS 3.31" BPB by the Wikipedia article (plus FAT32 EBPB). (Note that some of the offsets in the comments of struct grub_fat_bpb are wrong. I'll change these in the patch v2.)
Quoted 4 lines
Quoted 2 lines
using a partition table entry's partition length field isn't applicable here. (If it were, the function simply shouldn't check these fields.)
Please say why exactly it is not applicable here.
Because we are using these fields. If it was to be made applicable, it should just not check the fields.
Quoted 13 lines
Quoted 7 lines
And this is the first I've read of that DR-DOS extension. (And again, the simple solution to that one is also not to check the fields for zeros.)
Quoted 4 lines
Quoted 3 lines
Tested with lDebug booted in qemu via grub2's
FreeDOS direct loading support, refer to
https://bitbucket.org/ecm/ldosboot + https://bitbucket.org/ecm/ldebugQuoted 5 lines
Quoted 1 line
Could you put your SOB here?
Like this?
Signed-off-by C. Masloch <[email protected]>
Quoted 7 lines
Yep.
Quoted 1 line
(Should I submit a PATCH v2 for this?)
Yes, please. I am happy to commit this patch if you provide such a nice and detailed explanation like above but with better formating. And please add some stuff which I asked for too.
Am about to mail the patch v2. (I found out how to make Thunderbird not wrap long lines! mail.wrap_long_lines = false and mailnews.wraplength = 0.)
Regards,
ecm