Skip to content

NetworkPkg: Add IP address error handling in PxeBcDhcp6Sarr() #1596

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

Open
makubacki wants to merge 1 commit into
base: release/202502
Choose a base branch
from
+8 −1
Open

NetworkPkg: Add IP address error handling in PxeBcDhcp6Sarr() #1596

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
9 changes: 8 additions & 1 deletion NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2472,7 +2472,14 @@ PxeBcDhcp6Sarr (
return Status;
}

ASSERT ((Mode.Ia != NULL) && (Mode.Ia->State == Dhcp6Bound));
// MU_CHANGE [BEGIN] - Explicitly check IA state
if ((Mode.Ia == NULL) || (Mode.Ia->State != Dhcp6Bound)) {
Dhcp6->Stop (Dhcp6);
return EFI_DEVICE_ERROR;
}

// MU_CHANGE [END] - Explicitly check IA state

//
// DHCP6 doesn't have an option to specify the router address on the subnet, the only way to get the
// router address in IP6 is the router discovery mechanism (the RS and RA, which only be handled when
Expand Down