sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. UsbMassStorage: Increase the timeout of USBFloppyRead10 and USBFloppyWrite10 for data transfer.

Browse Source 
2. PxeBc: Fix array out bound error and add code to check the validation of the IP and subnet mask addresses.
3. DxeIpl: Make sure FV HOB is not corrupted by checking FV signature.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2570 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8
2007-04-16 05:20:06 +00:00
parent df13cebafa
commit 56056c7cd8
5 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
View File

@@ -1950,11 +1950,14 @@ BcSetStationIP (
--*/
{
EFI_PXE_BASE_CODE_MODE *PxebcMode;
EFI_STATUS StatCode;
PXE_BASECODE_DEVICE *Private;
UINT32 SubnetMask;
//
// Lock the instance data and make sure started
//
StatCode = EFI_SUCCESS;
if (This == NULL) {
DEBUG ((EFI_D_ERROR, "BC *This pointer == NULL"));
@@ -1972,26 +1975,61 @@ BcSetStationIP (
if (This->Mode == NULL || !This->Mode->Started) {
DEBUG ((EFI_D_ERROR, "BC was not started."));
EfiReleaseLock (&Private->Lock);
return EFI_NOT_STARTED;
StatCode = EFI_NOT_STARTED;
goto RELEASE_LOCK;
}
PxebcMode = Private->EfiBc.Mode;
if (StationIpPtr != NULL) {
CopyMem (&PxebcMode->StationIp, StationIpPtr, sizeof (EFI_IP_ADDRESS));
Private->GoodStationIp = TRUE;
if (!Private->GoodStationIp && ((StationIpPtr == NULL) || (SubnetMaskPtr == NULL))) {
//
// It's not allowed to only set one of the two addresses while there isn't a previous
// GOOD address configuration.
//
StatCode = EFI_INVALID_PARAMETER;
goto RELEASE_LOCK;
}
if (SubnetMaskPtr != NULL) {
CopyMem (&PxebcMode->SubnetMask, SubnetMaskPtr, sizeof (EFI_IP_ADDRESS));
SubnetMask = SubnetMaskPtr->Addr[0];
if (SubnetMask & (SubnetMask + 1)) {
//
// the subnet mask is valid if it's with leading continuous 1 bits.
//
StatCode = EFI_INVALID_PARAMETER;
goto RELEASE_LOCK;
}
} else {
SubnetMaskPtr = &PxebcMode->SubnetMask;
SubnetMask = SubnetMaskPtr->Addr[0];
}
if (StationIpPtr == NULL) {
StationIpPtr = &PxebcMode->StationIp;
}
if (!IS_INADDR_UNICAST (StationIpPtr) ||
((StationIpPtr->Addr[0] | SubnetMask) == BROADCAST_IPv4)) {
//
// The station IP is not a unicast address.
//
StatCode = EFI_INVALID_PARAMETER;
goto RELEASE_LOCK;
}
CopyMem (&PxebcMode->StationIp, StationIpPtr, sizeof (EFI_IP_ADDRESS));
CopyMem (&PxebcMode->SubnetMask, SubnetMaskPtr, sizeof (EFI_IP_ADDRESS));
Private->GoodStationIp = TRUE;
RELEASE_LOCK:
//
// Unlock the instance data
//
EfiReleaseLock (&Private->Lock);
return EFI_SUCCESS;
return StatCode;
}
EFI_DRIVER_BINDING_PROTOCOL gPxeBcDriverBinding = {

2
EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c
View File

@@ -571,7 +571,7 @@ Returns:
//
// build menu items array
//
for (Longest = NumMenuItems = Index = 0; Index < MenuLth && NumMenuItems <= MAX_MENULIST;) {
for (Longest = NumMenuItems = Index = 0; Index < MenuLth && NumMenuItems < MAX_MENULIST;) {
UINTN lth;
lth = Ptr.CurrentMenuItemPtr->DataLen + sizeof (*Ptr.CurrentMenuItemPtr) - sizeof (Ptr.CurrentMenuItemPtr->Data);