RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

Kernel/FileSystem/FATFS: Use AssertSize to enforce FAT structure sizes

Browse source
This commit is contained in:
Taj Morton 2024-01-07 13:04:19 -08:00 • committed by Andrew Kaster
parent d6a519e9af
commit 55cd89aea8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Kernel/FileSystem/FATFS/Definitions.h
View file

@ -45,7 +45,7 @@ struct [[gnu::packed]] DOS3BIOSParameterBlock {
u32 sector_count_32bit; // 0x020 -- end of DOS 3.31 BPB. u32 sector_count_32bit; // 0x020 -- end of DOS 3.31 BPB.
}; };
// 11 is the boot jump/OEM identifier prefix prior to the official BPB. // 11 is the boot jump/OEM identifier prefix prior to the official BPB.
static_assert(sizeof(DOS3BIOSParameterBlock) == 11 + 25); static_assert(AssertSize<DOS3BIOSParameterBlock, 11 + 25>());
struct [[gnu::packed]] DOS4BIOSParameterBlock { struct [[gnu::packed]] DOS4BIOSParameterBlock {
// Begins at sector offset 0x024. // Begins at sector offset 0x024.
@ -56,7 +56,7 @@ struct [[gnu::packed]] DOS4BIOSParameterBlock {
char volume_label_string[11]; char volume_label_string[11];
char file_system_type[8]; char file_system_type[8];
}; };
static_assert(sizeof(DOS4BIOSParameterBlock) == 26); static_assert(AssertSize<DOS4BIOSParameterBlock, 26>());
struct [[gnu::packed]] DOS7BIOSParameterBlock { struct [[gnu::packed]] DOS7BIOSParameterBlock {
// Begins at sector offset 0x024. // Begins at sector offset 0x024.
@ -74,7 +74,7 @@ struct [[gnu::packed]] DOS7BIOSParameterBlock {
char volume_label_string[11]; char volume_label_string[11];
char file_system_type[8]; char file_system_type[8];
}; };
static_assert(sizeof(DOS7BIOSParameterBlock) == 54); static_assert(AssertSize<DOS7BIOSParameterBlock, 54>());
enum DOSBIOSParameterBlockVersion { enum DOSBIOSParameterBlockVersion {
DOS_BPB_UNKNOWN, DOS_BPB_UNKNOWN,
@ -116,7 +116,7 @@ struct [[gnu::packed]] FATEntry {
u16 first_cluster_low; u16 first_cluster_low;
u32 file_size; u32 file_size;
}; };
static_assert(sizeof(FATEntry) == 32); static_assert(AssertSize<FATEntry, 32>());
struct [[gnu::packed]] FATLongFileNameEntry { struct [[gnu::packed]] FATLongFileNameEntry {
u8 entry_index; u8 entry_index;
@ -128,6 +128,6 @@ struct [[gnu::packed]] FATLongFileNameEntry {
u16 zero; u16 zero;
u16 characters3[2]; u16 characters3[2];
}; };
static_assert(sizeof(FATLongFileNameEntry) == 32); static_assert(AssertSize<FATLongFileNameEntry, 32>());
} }