Skip to content
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

Jump to bottom

fix: implement uuid parsing according to RFC4122 #76

Merged
merged 3 commits into from
Dec 24, 2023
Merged

fix: implement uuid parsing according to RFC4122 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0ee4a0
implement uuid parsing according to RFC4122
ju6ge Dec 24, 2023
4c9b0af
chore: cargo fmt
ju6ge Dec 24, 2023
5bf5443
remove unsafe transmute
ju6ge Dec 24, 2023
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
81 changes: 55 additions & 26 deletions efivar/src/boot/parse/device_path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use std::{convert::TryInto, fmt::Display, io::Write, path::PathBuf};

use byteorder::{BigEndian, LittleEndian, ReadBytesExt, WriteBytesExt};
use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
use uuid::Uuid;

use crate::{utils::read_nt_utf16_string, Error};
Expand Down Expand Up @@ -59,6 +59,35 @@ pub struct EFIHardDrive {
pub sig_type: EFIHardDriveType,
}

impl EFIHardDrive {
pub fn parse(buf: &mut &[u8]) -> crate::Result<EFIHardDrive> {
Ok(EFIHardDrive {
partition_number: buf
.read_u32::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
partition_start: buf
.read_u64::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
partition_size: buf
.read_u64::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
partition_sig: Uuid::from_fields(
buf.read_u32::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
buf.read_u16::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
buf.read_u16::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
&buf.read_u64::<LittleEndian>()
.map_err(|_| Error::VarParseError)?
.to_le_bytes(),
),
format: buf.read_u8().map_err(|_| Error::VarParseError)?,
sig_type: EFIHardDriveType::parse(buf.read_u8().map_err(|_| Error::VarParseError)?),
})
}
}

impl Display for EFIHardDrive {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
Expand Down Expand Up @@ -93,30 +122,9 @@ impl DevicePath {
})));
}
consts::MEDIA_DEVICE_PATH_SUBTYPE::HARD_DRIVE => {
return Ok(Some(DevicePath::HardDrive(EFIHardDrive {
partition_number: device_path_data
.read_u32::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
partition_start: device_path_data
.read_u64::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
partition_size: device_path_data
.read_u64::<LittleEndian>()
.map_err(|_| Error::VarParseError)?,
partition_sig: Uuid::from_u128(
device_path_data
.read_u128::<BigEndian>()
.map_err(|_| Error::VarParseError)?,
),
format: device_path_data
.read_u8()
.map_err(|_| Error::VarParseError)?,
sig_type: EFIHardDriveType::parse(
device_path_data
.read_u8()
.map_err(|_| Error::VarParseError)?,
),
})));
return Ok(Some(DevicePath::HardDrive(EFIHardDrive::parse(
&mut device_path_data,
)?)));
}
_ => {}
},
Expand Down Expand Up @@ -156,7 +164,12 @@ impl EFIHardDrive {
bytes
.write_u64::<LittleEndian>(self.partition_size)
.unwrap();
bytes.write_all(self.partition_sig.as_bytes()).unwrap();

let (f1, f2, f3, f4) = self.partition_sig.as_fields();
bytes.write_u32::<LittleEndian>(f1).unwrap();
bytes.write_u16::<LittleEndian>(f2).unwrap();
bytes.write_u16::<LittleEndian>(f3).unwrap();
bytes.write_all(f4).unwrap();
bytes.write_u8(self.format).unwrap();
bytes.write_u8(self.sig_type.as_u8()).unwrap();

Expand Down Expand Up @@ -263,4 +276,20 @@ mod tests {
)
);
}

#[test]
fn to_from_bytes() {
let drive = EFIHardDrive {
partition_number: 1,
partition_start: 2,
partition_size: 3,
partition_sig: Uuid::from_str("90364bbd-1000-47fc-8c05-8707e01b4593").unwrap(),
format: 5,
sig_type: EFIHardDriveType::Gpt,
};
let bytes = drive.to_bytes_raw();
let mut x = bytes.as_slice();
let test_parse = EFIHardDrive::parse(&mut x).unwrap();
assert_eq!(drive, test_parse)
}
}
2 changes: 1 addition & 1 deletion efivar/src/boot/parse/tests/dump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn dump() {
partition_number: 1,
partition_start: 10240,
partition_size: 991232,
partition_sig: Uuid::from_str("0ac986f5-a335-f2a8-4943-3ef0837cdce3").unwrap(),
partition_sig: Uuid::from_str("f586c90a-35a3-a8f2-4943-3ef0837cdce3").unwrap(),
format: 2,
sig_type: crate::boot::EFIHardDriveType::Gpt,
},
Expand Down
2 changes: 1 addition & 1 deletion efivar/src/boot/parse/tests/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fn parse() {
partition_number: 1,
partition_start: 10240,
partition_size: 991232,
partition_sig: Uuid::from_str("e3dc7c83-f03e-4349-a8f2-35a3f586c90a").unwrap(),
partition_sig: Uuid::from_str("837cdce3-3ef0-4943-a8f2-35a3f586c90a").unwrap(),
format: 2,
sig_type: crate::boot::EFIHardDriveType::Gpt,
}
Expand Down