Skip to content

Fix SMBIOS parsing on big-endian architecture #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcreekmore merged 1 commit into from
Mar 25, 2026
Merged

Fix SMBIOS parsing on big-endian architecture #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,14 @@ impl EntryPoint {
InvalidEntryPointError::BadSize(sub_buffer.len() as u8)
);
let_as_struct!(entry_point, EntryPointV2, sub_buffer);
let entry_point = EntryPointV2 {
signature: u32::from_le(entry_point.signature),
struct_max: u16::from_le(entry_point.struct_max),
smbios_len: u16::from_le(entry_point.smbios_len),
smbios_address: u32::from_le(entry_point.smbios_address),
smbios_count: u16::from_le(entry_point.smbios_count),
..entry_point
};
lib_ensure!(
entry_point.len as usize >= mem::size_of::<EntryPointV2>(),
InvalidEntryPointError::BadSize(entry_point.len)
Expand All @@ -211,6 +219,11 @@ impl EntryPoint {
InvalidEntryPointError::BadSize(sub_buffer.len() as u8)
);
let_as_struct!(entry_point, EntryPointV3, sub_buffer);
let entry_point = EntryPointV3 {
smbios_len_max: u32::from_le(entry_point.smbios_len_max),
smbios_address: u64::from_le(entry_point.smbios_address),
..entry_point
};
lib_ensure!(
entry_point.len as usize >= mem::size_of::<EntryPointV3>(),
InvalidEntryPointError::BadSize(entry_point.len)
Expand Down Expand Up @@ -528,6 +541,10 @@ impl<'buffer> Structures<'buffer> {

let working = &self.buffer[(self.idx as usize)..];
let_as_struct!(header, HeaderPacked, working);
let header = HeaderPacked {
handle: u16::from_le(header.handle),
..header
};

let strings_idx: u32 = self.idx + header.len as u32;
if strings_idx >= self.smbios_len {
Expand Down
14 changes: 7 additions & 7 deletions src/structures/000_bios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@ impl<'buffer> Bios<'buffer> {
handle: structure.handle,
vendor: structure.find_string(packed.vendor)?,
bios_version: structure.find_string(packed.bios_version)?,
bios_starting_address_segment: packed.bios_starting_address_segment,
bios_starting_address_segment: u16::from_le(packed.bios_starting_address_segment),
bios_release_date: structure.find_string(packed.bios_release_date)?,
rom_size: RomSize {
basic: packed.bios_rom_size,
extended: Some(packed.extended_bios_rom_size),
extended: Some(u16::from_le(packed.extended_bios_rom_size)),
},
bios_characteristics: Characteristics(packed.bios_characteristics),
bios_characteristics: Characteristics(u64::from_le(packed.bios_characteristics)),
bios_characteristics_exttension_1: Some(CharacteristicsExtension1(
packed.bios_characteristics_exttension_1,
)),
Expand All @@ -161,13 +161,13 @@ impl<'buffer> Bios<'buffer> {
handle: structure.handle,
vendor: structure.find_string(packed.vendor)?,
bios_version: structure.find_string(packed.bios_version)?,
bios_starting_address_segment: packed.bios_starting_address_segment,
bios_starting_address_segment: u16::from_le(packed.bios_starting_address_segment),
bios_release_date: structure.find_string(packed.bios_release_date)?,
rom_size: RomSize {
basic: packed.bios_rom_size,
extended: None,
},
bios_characteristics: Characteristics(packed.bios_characteristics),
bios_characteristics: Characteristics(u64::from_le(packed.bios_characteristics)),
bios_characteristics_exttension_1: Some(CharacteristicsExtension1(
packed.bios_characteristics_exttension_1,
)),
Expand All @@ -190,13 +190,13 @@ impl<'buffer> Bios<'buffer> {
handle: structure.handle,
vendor: structure.find_string(packed.vendor)?,
bios_version: structure.find_string(packed.bios_version)?,
bios_starting_address_segment: packed.bios_starting_address_segment,
bios_starting_address_segment: u16::from_le(packed.bios_starting_address_segment),
bios_release_date: structure.find_string(packed.bios_release_date)?,
rom_size: RomSize {
basic: packed.bios_rom_size,
extended: None,
},
bios_characteristics: Characteristics(packed.bios_characteristics),
bios_characteristics: Characteristics(u64::from_le(packed.bios_characteristics)),
bios_characteristics_exttension_1: None,
bios_characteristics_exttension_2: None,
bios_revision: None,
Expand Down
2 changes: 1 addition & 1 deletion src/structures/002_baseboard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ impl<'buffer> BaseBoard<'buffer> {
None
};
let chassis_handle = if structure.data.len() > 7 {
Some(packed.chassis_handle)
Some(u16::from_le(packed.chassis_handle))
} else {
None
};
Expand Down
2 changes: 1 addition & 1 deletion src/structures/003_enclosure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ impl<'buffer> Enclosure<'buffer> {
})
// Optional 2.3+ fields
.and_then(|oem_defined: u32| {
enclosure.oem_defined = Some(oem_defined);
enclosure.oem_defined = Some(u32::from_le(oem_defined));
read_bytes(data)
})
.and_then(|height: u8| {
Expand Down
96 changes: 48 additions & 48 deletions src/structures/004_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,12 +624,12 @@ impl<'buffer> Processor<'buffer> {
processor_type: packed.processor_type.into(),
processor_family: packed.processor_family.into(),
processor_manufacturer: structure.find_string(packed.processor_manufacturer)?,
processor_id: packed.processor_id,
processor_id: u64::from_le(packed.processor_id),
processor_version: structure.find_string(packed.processor_version)?,
voltage: packed.voltage.into(),
external_clock: packed.external_clock,
max_speed: packed.max_speed,
current_speed: packed.current_speed,
external_clock: u16::from_le(packed.external_clock),
max_speed: u16::from_le(packed.max_speed),
current_speed: u16::from_le(packed.current_speed),
status: ProcessorStatus::from_bits_truncate(packed.status),
processor_upgrade: packed.processor_upgrade.into(),
l1_cache_handle: None,
Expand All @@ -652,17 +652,17 @@ impl<'buffer> Processor<'buffer> {
processor_type: packed.processor_type.into(),
processor_family: packed.processor_family.into(),
processor_manufacturer: structure.find_string(packed.processor_manufacturer)?,
processor_id: packed.processor_id,
processor_id: u64::from_le(packed.processor_id),
processor_version: structure.find_string(packed.processor_version)?,
voltage: packed.voltage.into(),
external_clock: packed.external_clock,
max_speed: packed.max_speed,
current_speed: packed.current_speed,
external_clock: u16::from_le(packed.external_clock),
max_speed: u16::from_le(packed.max_speed),
current_speed: u16::from_le(packed.current_speed),
status: ProcessorStatus::from_bits_truncate(packed.status),
processor_upgrade: packed.processor_upgrade.into(),
l1_cache_handle: Some(packed.l1_cache_handle),
l2_cache_handle: Some(packed.l2_cache_handle),
l3_cache_handle: Some(packed.l3_cache_handle),
l1_cache_handle: Some(u16::from_le(packed.l1_cache_handle)),
l2_cache_handle: Some(u16::from_le(packed.l2_cache_handle)),
l3_cache_handle: Some(u16::from_le(packed.l3_cache_handle)),
serial_number: None,
asset_tag: None,
part_number: None,
Expand All @@ -680,17 +680,17 @@ impl<'buffer> Processor<'buffer> {
processor_type: packed.processor_type.into(),
processor_family: packed.processor_family.into(),
processor_manufacturer: structure.find_string(packed.processor_manufacturer)?,
processor_id: packed.processor_id,
processor_id: u64::from_le(packed.processor_id),
processor_version: structure.find_string(packed.processor_version)?,
voltage: packed.voltage.into(),
external_clock: packed.external_clock,
max_speed: packed.max_speed,
current_speed: packed.current_speed,
external_clock: u16::from_le(packed.external_clock),
max_speed: u16::from_le(packed.max_speed),
current_speed: u16::from_le(packed.current_speed),
status: ProcessorStatus::from_bits_truncate(packed.status),
processor_upgrade: packed.processor_upgrade.into(),
l1_cache_handle: Some(packed.l1_cache_handle),
l2_cache_handle: Some(packed.l2_cache_handle),
l3_cache_handle: Some(packed.l3_cache_handle),
l1_cache_handle: Some(u16::from_le(packed.l1_cache_handle)),
l2_cache_handle: Some(u16::from_le(packed.l2_cache_handle)),
l3_cache_handle: Some(u16::from_le(packed.l3_cache_handle)),
serial_number: Some(structure.find_string(packed.serial_number)?),
asset_tag: Some(structure.find_string(packed.asset_tag)?),
part_number: Some(structure.find_string(packed.part_number)?),
Expand All @@ -708,17 +708,17 @@ impl<'buffer> Processor<'buffer> {
processor_type: packed.processor_type.into(),
processor_family: packed.processor_family.into(),
processor_manufacturer: structure.find_string(packed.processor_manufacturer)?,
processor_id: packed.processor_id,
processor_id: u64::from_le(packed.processor_id),
processor_version: structure.find_string(packed.processor_version)?,
voltage: packed.voltage.into(),
external_clock: packed.external_clock,
max_speed: packed.max_speed,
current_speed: packed.current_speed,
external_clock: u16::from_le(packed.external_clock),
max_speed: u16::from_le(packed.max_speed),
current_speed: u16::from_le(packed.current_speed),
status: ProcessorStatus::from_bits_truncate(packed.status),
processor_upgrade: packed.processor_upgrade.into(),
l1_cache_handle: Some(packed.l1_cache_handle),
l2_cache_handle: Some(packed.l2_cache_handle),
l3_cache_handle: Some(packed.l3_cache_handle),
l1_cache_handle: Some(u16::from_le(packed.l1_cache_handle)),
l2_cache_handle: Some(u16::from_le(packed.l2_cache_handle)),
l3_cache_handle: Some(u16::from_le(packed.l3_cache_handle)),
serial_number: Some(structure.find_string(packed.serial_number)?),
asset_tag: Some(structure.find_string(packed.asset_tag)?),
part_number: Some(structure.find_string(packed.part_number)?),
Expand All @@ -732,7 +732,7 @@ impl<'buffer> Processor<'buffer> {
// smbios spec specifies 0xFE as an indicator to obtain processor
// family from the Processor Family 2 field.
let processor_family = match packed.processor_family.into() {
ProcessorFamily::ProcessorFamily2 => packed.processor_family_2.into(),
ProcessorFamily::ProcessorFamily2 => u16::from_le(packed.processor_family_2).into(),
family => family,
};
Ok(Processor {
Expand All @@ -741,33 +741,33 @@ impl<'buffer> Processor<'buffer> {
processor_type: packed.processor_type.into(),
processor_family,
processor_manufacturer: structure.find_string(packed.processor_manufacturer)?,
processor_id: packed.processor_id,
processor_id: u64::from_le(packed.processor_id),
processor_version: structure.find_string(packed.processor_version)?,
voltage: packed.voltage.into(),
external_clock: packed.external_clock,
max_speed: packed.max_speed,
current_speed: packed.current_speed,
external_clock: u16::from_le(packed.external_clock),
max_speed: u16::from_le(packed.max_speed),
current_speed: u16::from_le(packed.current_speed),
status: ProcessorStatus::from_bits_truncate(packed.status),
processor_upgrade: packed.processor_upgrade.into(),
l1_cache_handle: Some(packed.l1_cache_handle),
l2_cache_handle: Some(packed.l2_cache_handle),
l3_cache_handle: Some(packed.l3_cache_handle),
l1_cache_handle: Some(u16::from_le(packed.l1_cache_handle)),
l2_cache_handle: Some(u16::from_le(packed.l2_cache_handle)),
l3_cache_handle: Some(u16::from_le(packed.l3_cache_handle)),
serial_number: Some(structure.find_string(packed.serial_number)?),
asset_tag: Some(structure.find_string(packed.asset_tag)?),
part_number: Some(structure.find_string(packed.part_number)?),
core_count: Some(packed.core_count as u16),
core_enabled: Some(packed.core_enabled as u16),
thread_count: Some(packed.thread_count as u16),
processor_characteristics: Some(ProcessorCharacteristics::from_bits_truncate(
processor_characteristics: Some(ProcessorCharacteristics::from_bits_truncate(u16::from_le(
packed.processor_characteristics,
)),
))),
})
} else {
let_as_struct!(packed, ProcessorPacked3_0, structure.data);
// smbios spec specifies 0xFE as an indicator to obtain processor
// family from the Processor Family 2 field.
let processor_family = match packed.processor_family.into() {
ProcessorFamily::ProcessorFamily2 => packed.processor_family_2.into(),
ProcessorFamily::ProcessorFamily2 => u16::from_le(packed.processor_family_2).into(),
family => family,
};

Expand All @@ -777,17 +777,17 @@ impl<'buffer> Processor<'buffer> {
//
// The rule is same for Core Enabled and Thread Count as well.
let core_count = if packed.core_count == 0xFF {
Some(packed.core_count_2)
Some(u16::from_le(packed.core_count_2))
} else {
Some(packed.core_count as u16)
};
let core_enabled = if packed.core_enabled == 0xFF {
Some(packed.core_enabled_2)
Some(u16::from_le(packed.core_enabled_2))
} else {
Some(packed.core_enabled as u16)
};
let thread_count = if packed.thread_count == 0xFF {
Some(packed.thread_count_2)
Some(u16::from_le(packed.thread_count_2))
} else {
Some(packed.thread_count as u16)
};
Expand All @@ -797,26 +797,26 @@ impl<'buffer> Processor<'buffer> {
processor_type: packed.processor_type.into(),
processor_family,
processor_manufacturer: structure.find_string(packed.processor_manufacturer)?,
processor_id: packed.processor_id,
processor_id: u64::from_le(packed.processor_id),
processor_version: structure.find_string(packed.processor_version)?,
voltage: packed.voltage.into(),
external_clock: packed.external_clock,
max_speed: packed.max_speed,
current_speed: packed.current_speed,
external_clock: u16::from_le(packed.external_clock),
max_speed: u16::from_le(packed.max_speed),
current_speed: u16::from_le(packed.current_speed),
status: ProcessorStatus::from_bits_truncate(packed.status),
processor_upgrade: packed.processor_upgrade.into(),
l1_cache_handle: Some(packed.l1_cache_handle),
l2_cache_handle: Some(packed.l2_cache_handle),
l3_cache_handle: Some(packed.l3_cache_handle),
l1_cache_handle: Some(u16::from_le(packed.l1_cache_handle)),
l2_cache_handle: Some(u16::from_le(packed.l2_cache_handle)),
l3_cache_handle: Some(u16::from_le(packed.l3_cache_handle)),
serial_number: Some(structure.find_string(packed.serial_number)?),
asset_tag: Some(structure.find_string(packed.asset_tag)?),
part_number: Some(structure.find_string(packed.part_number)?),
core_count,
core_enabled,
thread_count,
processor_characteristics: Some(ProcessorCharacteristics::from_bits_truncate(
processor_characteristics: Some(ProcessorCharacteristics::from_bits_truncate(u16::from_le(
packed.processor_characteristics,
)),
))),
})
}
}
Expand Down
Loading
Loading