1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
|
Description: Fix endianness bugs on big-endian architectures (s390x)
The SMBIOS specification defines all multi-byte fields as little-endian.
The crate used unsafe ptr::read casts on #[repr(C,packed)] structs to
deserialise binary data, which reads fields in native byte order. This is
correct on little-endian hosts but produces wrong values on big-endian
hosts such as s390x, causing test failures and incorrect parsed output
.
Fix by applying u{16,32,64}::from_le() to every multi-byte field read
from a packed struct or via the generic read_bytes helper
Author: Nadzeya Hutsko <nadzya.info@gmail.com>
Forwarded: https://github.com/jcreekmore/dmidecode/pull/56
Last-Update: 2026-03-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/src/lib.rs b/src/lib.rs
index 42584bd..a461686 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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)
@@ -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)
@@ -531,6 +544,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 {
diff --git a/src/structures/000_bios.rs b/src/structures/000_bios.rs
index 86f43b1..5a52992 100644
--- a/src/structures/000_bios.rs
+++ b/src/structures/000_bios.rs
@@ -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,
)),
@@ -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,
)),
@@ -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,
diff --git a/src/structures/002_baseboard.rs b/src/structures/002_baseboard.rs
index ff360d9..7d41680 100644
--- a/src/structures/002_baseboard.rs
+++ b/src/structures/002_baseboard.rs
@@ -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
};
diff --git a/src/structures/003_enclosure.rs b/src/structures/003_enclosure.rs
index eddd486..af276d7 100644
--- a/src/structures/003_enclosure.rs
+++ b/src/structures/003_enclosure.rs
@@ -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| {
diff --git a/src/structures/004_processor.rs b/src/structures/004_processor.rs
index 4dabf80..adfce91 100644
--- a/src/structures/004_processor.rs
+++ b/src/structures/004_processor.rs
@@ -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,
@@ -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,
@@ -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)?),
@@ -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)?),
@@ -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 {
@@ -741,17 +741,17 @@ 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)?),
@@ -759,7 +759,7 @@ impl<'buffer> Processor<'buffer> {
core_enabled: Some(packed.core_enabled as u16),
thread_count: Some(packed.thread_count as u16),
processor_characteristics: Some(ProcessorCharacteristics::from_bits_truncate(
- packed.processor_characteristics,
+ u16::from_le(packed.processor_characteristics),
)),
})
} else {
@@ -767,7 +767,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,
};
@@ -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)
};
@@ -797,17 +797,17 @@ 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)?),
@@ -815,7 +815,7 @@ impl<'buffer> Processor<'buffer> {
core_enabled,
thread_count,
processor_characteristics: Some(ProcessorCharacteristics::from_bits_truncate(
- packed.processor_characteristics,
+ u16::from_le(packed.processor_characteristics),
)),
})
}
diff --git a/src/structures/007_cache.rs b/src/structures/007_cache.rs
index db1ab72..bb7af99 100644
--- a/src/structures/007_cache.rs
+++ b/src/structures/007_cache.rs
@@ -217,17 +217,17 @@ impl<'buffer> Cache<'buffer> {
Ok(Cache {
handle: structure.handle,
socket_designation: structure.find_string(packed.socket_designation)?,
- cache_configuration: packed.cache_configuration.into(),
- maximum_cache_size: packed.maximum_cache_size.into(),
- installed_size: packed.installed_size.into(),
- supported_sram_type: CacheSramType::from_bits_truncate(packed.supported_sram_type),
- current_sram_type: CacheSramType::from_bits_truncate(packed.current_sram_type),
+ cache_configuration: u16::from_le(packed.cache_configuration).into(),
+ maximum_cache_size: u16::from_le(packed.maximum_cache_size).into(),
+ installed_size: u16::from_le(packed.installed_size).into(),
+ supported_sram_type: CacheSramType::from_bits_truncate(u16::from_le(packed.supported_sram_type)),
+ current_sram_type: CacheSramType::from_bits_truncate(u16::from_le(packed.current_sram_type)),
cache_speed: Some(packed.cache_speed),
error_correction_type: Some(packed.error_correction_type.into()),
system_cache_type: Some(packed.system_cache_type.into()),
associativity: Some(packed.associativity.into()),
- maximum_cache_size_2: Some(packed.maximum_cache_size_2.into()),
- installed_size_2: Some(packed.installed_size_2.into()),
+ maximum_cache_size_2: Some(u32::from_le(packed.maximum_cache_size_2).into()),
+ installed_size_2: Some(u32::from_le(packed.installed_size_2).into()),
})
}
v if v > (2, 1).into() => {
@@ -235,11 +235,11 @@ impl<'buffer> Cache<'buffer> {
Ok(Cache {
handle: structure.handle,
socket_designation: structure.find_string(packed.socket_designation)?,
- cache_configuration: packed.cache_configuration.into(),
- maximum_cache_size: packed.maximum_cache_size.into(),
- installed_size: packed.installed_size.into(),
- supported_sram_type: CacheSramType::from_bits_truncate(packed.supported_sram_type),
- current_sram_type: CacheSramType::from_bits_truncate(packed.current_sram_type),
+ cache_configuration: u16::from_le(packed.cache_configuration).into(),
+ maximum_cache_size: u16::from_le(packed.maximum_cache_size).into(),
+ installed_size: u16::from_le(packed.installed_size).into(),
+ supported_sram_type: CacheSramType::from_bits_truncate(u16::from_le(packed.supported_sram_type)),
+ current_sram_type: CacheSramType::from_bits_truncate(u16::from_le(packed.current_sram_type)),
cache_speed: Some(packed.cache_speed),
error_correction_type: Some(packed.error_correction_type.into()),
system_cache_type: Some(packed.system_cache_type.into()),
@@ -253,11 +253,11 @@ impl<'buffer> Cache<'buffer> {
Ok(Cache {
handle: structure.handle,
socket_designation: structure.find_string(packed.socket_designation)?,
- cache_configuration: packed.cache_configuration.into(),
- maximum_cache_size: packed.maximum_cache_size.into(),
- installed_size: packed.installed_size.into(),
- supported_sram_type: CacheSramType::from_bits_truncate(packed.supported_sram_type),
- current_sram_type: CacheSramType::from_bits_truncate(packed.current_sram_type),
+ cache_configuration: u16::from_le(packed.cache_configuration).into(),
+ maximum_cache_size: u16::from_le(packed.maximum_cache_size).into(),
+ installed_size: u16::from_le(packed.installed_size).into(),
+ supported_sram_type: CacheSramType::from_bits_truncate(u16::from_le(packed.supported_sram_type)),
+ current_sram_type: CacheSramType::from_bits_truncate(u16::from_le(packed.current_sram_type)),
cache_speed: None,
error_correction_type: None,
system_cache_type: None,
diff --git a/src/structures/009_system_slots.rs b/src/structures/009_system_slots.rs
index fd9f438..44a4311 100644
--- a/src/structures/009_system_slots.rs
+++ b/src/structures/009_system_slots.rs
@@ -799,7 +799,7 @@ impl<'a> From<&'a [u8]> for Device {
fn from(data: &'a [u8]) -> Device {
let_as_struct!(packed, DevicePacked, data);
Device {
- segment_group_number: packed.segment_group_number,
+ segment_group_number: u16::from_le(packed.segment_group_number),
bus_number: packed.bus_number,
device_and_function_number: packed.dev_and_fun_number.into(),
data_bus_width: packed.data_bus_width,
@@ -808,7 +808,7 @@ impl<'a> From<&'a [u8]> for Device {
}
impl<'a> From<&'a Device> for [u8; 5] {
fn from(d: &'a Device) -> [u8; 5] {
- let segment = d.segment_group_number.to_ne_bytes();
+ let segment = d.segment_group_number.to_le_bytes();
[
segment[0],
segment[1],
|
