Skip to content

Fix to GetMigTDData optional reportdata size #787

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
jyao1 merged 1 commit into from
Apr 9, 2026
Merged

Fix to GetMigTDData optional reportdata size #787

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
11 changes: 6 additions & 5 deletions src/migtd/src/migration/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@ pub async fn wait_for_request() -> Result<WaitForRequestResponse> {
if data_length >= size_of::<u64>() as u32 {
let slice = &data_buffer[reqbufferhdrlen..reqbufferhdrlen + data_length as usize];
let mig_request_id = u64::from_le_bytes(slice[0..8].try_into().unwrap());
log::error!(migration_request_id = mig_request_id; "wait_for_request: StartMigration operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
log::error!(migration_request_id = mig_request_id; "wait_for_request: GetReportData operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
} else {
log::error!("wait_for_request: StartMigration operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
log::error!("wait_for_request: GetReportData operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
}
return Poll::Pending;
}
Expand Down Expand Up @@ -418,14 +418,15 @@ pub async fn wait_for_request() -> Result<WaitForRequestResponse> {
{
let mut reportdata: [u8; 64] = [0; 64];
let mut mig_request_id: u64 = 0;
if data_length != size_of::<MigtdDataInfo>() as u32
// data length should MigRequestID (+ optional REPORTDATA)
if data_length != size_of::<MigtdDataInfo>() as u32 && data_length != size_of_val(&mig_request_id) as u32
{
if data_length >= size_of::<u64>() as u32 {
let slice = &data_buffer[reqbufferhdrlen..reqbufferhdrlen + data_length as usize];
let mig_request_id = u64::from_le_bytes(slice[0..8].try_into().unwrap());
log::error!(migration_request_id = mig_request_id; "wait_for_request: StartMigration operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
log::error!(migration_request_id = mig_request_id; "wait_for_request: GetMigtdData operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
} else {
log::error!("wait_for_request: StartMigration operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
log::error!("wait_for_request: GetMigtdData operation incorrect data length - expected {} actual {}\n", size_of::<ReportInfo>(), data_length);
}
return Poll::Pending;
}
Expand Down
Loading