@param[in] Dst The pointer to the cache buffer for DHCPv6 packet.\r
@param[in] Src The pointer to the DHCPv6 packet to be cached.\r
\r
+ @retval EFI_SUCCESS Packet is copied.\r
+ @retval EFI_BUFFER_TOO_SMALL Cache buffer is not big enough to hold the packet.\r
+\r
**/\r
-VOID\r
+EFI_STATUS\r
PxeBcCacheDhcp6Packet (\r
IN EFI_DHCP6_PACKET *Dst,\r
IN EFI_DHCP6_PACKET *Src\r
)\r
{\r
- ASSERT (Dst->Size >= Src->Length);\r
+ if (Dst->Size < Src->Length) {\r
+ return EFI_BUFFER_TOO_SMALL;\r
+ }\r
\r
CopyMem (&Dst->Dhcp6, &Src->Dhcp6, Src->Length);\r
Dst->Length = Src->Length;\r
+\r
+ return EFI_SUCCESS;\r
}\r
\r
\r
@param[in] Ack The pointer to the DHCPv6 ack packet.\r
@param[in] Verified If TRUE, parse the ACK packet and store info into mode data.\r
\r
+ @retval EFI_SUCCESS Cache and parse the packet successfully.\r
+ @retval EFI_BUFFER_TOO_SMALL Cache buffer is not big enough to hold the packet.\r
+\r
**/\r
-VOID\r
+EFI_STATUS\r
PxeBcCopyDhcp6Ack (\r
IN PXEBC_PRIVATE_DATA *Private,\r
IN EFI_DHCP6_PACKET *Ack,\r
)\r
{\r
EFI_PXE_BASE_CODE_MODE *Mode;\r
+ EFI_STATUS Status;\r
\r
Mode = Private->PxeBc.Mode;\r
\r
- PxeBcCacheDhcp6Packet (&Private->DhcpAck.Dhcp6.Packet.Ack, Ack);\r
+ Status = PxeBcCacheDhcp6Packet (&Private->DhcpAck.Dhcp6.Packet.Ack, Ack);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
\r
if (Verified) {\r
//\r
CopyMem (&Mode->DhcpAck.Dhcpv6, &Ack->Dhcp6, Ack->Length);\r
Mode->DhcpAckReceived = TRUE;\r
}\r
+\r
+ return EFI_SUCCESS;\r
}\r
\r
\r
@param[in] Private The pointer to PxeBc private data.\r
@param[in] OfferIndex The received order of offer packets.\r
\r
+ @retval EFI_SUCCESS Cache and parse the packet successfully.\r
+ @retval EFI_BUFFER_TOO_SMALL Cache buffer is not big enough to hold the packet.\r
+\r
**/\r
-VOID\r
+EFI_STATUS\r
PxeBcCopyDhcp6Proxy (\r
IN PXEBC_PRIVATE_DATA *Private,\r
IN UINT32 OfferIndex\r
{\r
EFI_PXE_BASE_CODE_MODE *Mode;\r
EFI_DHCP6_PACKET *Offer;\r
+ EFI_STATUS Status;\r
\r
ASSERT (OfferIndex < Private->OfferNum);\r
ASSERT (OfferIndex < PXEBC_OFFER_MAX_NUM);\r
//\r
// Cache the proxy offer packet and parse it.\r
//\r
- PxeBcCacheDhcp6Packet (&Private->ProxyOffer.Dhcp6.Packet.Offer, Offer);\r
+ Status = PxeBcCacheDhcp6Packet (&Private->ProxyOffer.Dhcp6.Packet.Offer, Offer);\r
+ if (EFI_ERROR(Status)) {\r
+ return Status;\r
+ }\r
PxeBcParseDhcp6Packet (&Private->ProxyOffer.Dhcp6);\r
\r
//\r
//\r
CopyMem (&Mode->ProxyOffer.Dhcpv6, &Offer->Dhcp6, Offer->Length);\r
Mode->ProxyOfferReceived = TRUE;\r
+\r
+ return EFI_SUCCESS;\r
}\r
\r
/**\r
@param[in] Private The pointer to PXEBC_PRIVATE_DATA.\r
@param[in] RcvdOffer The pointer to the received offer packet.\r
\r
+ @retval EFI_SUCCESS Cache and parse the packet successfully.\r
+ @retval Others Operation failed.\r
**/\r
-VOID\r
+EFI_STATUS\r
PxeBcCacheDhcp6Offer (\r
IN PXEBC_PRIVATE_DATA *Private,\r
IN EFI_DHCP6_PACKET *RcvdOffer\r
PXEBC_DHCP6_PACKET_CACHE *Cache6;\r
EFI_DHCP6_PACKET *Offer;\r
PXEBC_OFFER_TYPE OfferType;\r
+ EFI_STATUS Status;\r
\r
Cache6 = &Private->OfferBuffer[Private->OfferNum].Dhcp6;\r
Offer = &Cache6->Packet.Offer;\r
//\r
// Cache the content of DHCPv6 packet firstly.\r
//\r
- PxeBcCacheDhcp6Packet (Offer, RcvdOffer);\r
+ Status = PxeBcCacheDhcp6Packet (Offer, RcvdOffer);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
\r
//\r
// Validate the DHCPv6 packet, and parse the options and offer type.\r
//\r
if (EFI_ERROR (PxeBcParseDhcp6Packet (Cache6))) {\r
- return ;\r
+ return EFI_ABORTED;\r
}\r
\r
//\r
Private->OfferIndex[OfferType][0] = Private->OfferNum;\r
Private->OfferCount[OfferType] = 1;\r
} else {\r
- return;\r
+ return EFI_ABORTED;\r
}\r
} else {\r
//\r
}\r
\r
Private->OfferNum++;\r
+\r
+ return EFI_SUCCESS;\r
}\r
\r
\r
@retval EFI_SUCCESS Handled the DHCPv6 offer packet successfully.\r
@retval EFI_NO_RESPONSE No response to the following request packet.\r
@retval EFI_OUT_OF_RESOURCES Failed to allocate resources.\r
+ @retval EFI_BUFFER_TOO_SMALL Can't cache the offer pacet.\r
\r
**/\r
EFI_STATUS\r
//\r
// Success to try to request by a ProxyPxe10 or ProxyWfm11a offer, copy and parse it.\r
//\r
- PxeBcCopyDhcp6Proxy (Private, ProxyIndex);\r
+ Status = PxeBcCopyDhcp6Proxy (Private, ProxyIndex);\r
}\r
} else {\r
//\r
//\r
// All PXE boot information is ready by now.\r
//\r
- PxeBcCopyDhcp6Ack (Private, &Private->DhcpAck.Dhcp6.Packet.Ack, TRUE);\r
+ Status = PxeBcCopyDhcp6Ack (Private, &Private->DhcpAck.Dhcp6.Packet.Ack, TRUE);\r
Private->PxeBc.Mode->DhcpDiscoverValid = TRUE;\r
}\r
\r
break;\r
\r
case Dhcp6RcvdReply:\r
- if (Packet->Length > PXEBC_DHCP6_PACKET_MAX_SIZE) {\r
- //\r
- // Abort the DHCP if the Peply packet exceeds the maximum length.\r
- //\r
- Status = EFI_ABORTED;\r
- break;\r
- }\r
//\r
// Cache the dhcp ack to Private->Dhcp6Ack, but it's not the final ack in mode data\r
// without verification.\r
//\r
ASSERT (Private->SelectIndex != 0);\r
- PxeBcCopyDhcp6Ack (Private, Packet, FALSE);\r
+ Status = PxeBcCopyDhcp6Ack (Private, Packet, FALSE);\r
+ if (EFI_ERROR (Status)) {\r
+ Status = EFI_ABORTED;\r
+ }\r
break;\r
\r
default:\r