packages/edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
edk2/0070-NetworkPkg-Dhcp6Dxe-Removes-duplicate-check-and-repl.patch
yexiao 9fe974a680 Fix some CVE 
Fix CVE-2023-45229、CVE-2023-45230、CVE-2023-45231、
CVE-2023-45232、CVE-2023-45233、CVE-2023-45234、CVE-2023-45235

Signed-off-by: yexiao <yexiao7@huawei.com>
2024-03-03 17:53:43 +08:00

792 lines
24 KiB
Diff
Raw Blame History

From 6acd7ea3c036fcd9ac60f990dca2d28a0c3c1cdc Mon Sep 17 00:00:00 2001
From: Doug Flick <dougflick@microsoft.com>
Date: Tue, 13 Feb 2024 10:46:01 -0800
Subject: [PATCH 2/3] NetworkPkg: Dhcp6Dxe: Removes duplicate check and
replaces with macro
Removes duplicate check after merge
>
> //
> // Verify the PacketCursor is within the packet
> //
> if ( (*PacketCursor < Packet->Dhcp6.Option)
> || (*PacketCursor >= Packet->Dhcp6.Option + (Packet->Size -
sizeof (EFI_DHCP6_HEADER))))
> {
> return EFI_INVALID_PARAMETER;
> }
>
Converts the check to a macro and replaces all instances of the check
with the macro
Cc: Saloni Kasbekar <saloni.kasbekar@intel.com>
Cc: Zachary Clark-williams <zachary.clark-williams@intel.com>
Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>
Reviewed-by: Saloni Kasbekar <saloni.kasbekar@intel.com>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
reference: https://github.com/tianocore/edk2/pull/5372
Signed-off-by: yexiao <yexiao7@huawei.com>
---
NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 598 ++++++++++++++---------------
1 file changed, 295 insertions(+), 303 deletions(-)
diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
index 2b4005b4..eafa72eb 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
@@ -10,6 +10,14 @@
#include "Dhcp6Impl.h"
+//
+// Verifies the packet cursor is within the packet
+// otherwise it is invalid
+//
+#define IS_INVALID_PACKET_CURSOR(PacketCursor, Packet) \
+ (((*PacketCursor) < (Packet)->Dhcp6.Option) || \
+ ((*PacketCursor) >= (Packet)->Dhcp6.Option + ((Packet)->Size - sizeof(EFI_DHCP6_HEADER))) \
+ )
/**
Generate client Duid in the format of Duid-llt.
@@ -601,33 +609,33 @@ Dhcp6OnTransmitted (
/**
- Append the option to Buf, update the length of packet, and move Buf to the end.
+ Append the option to Buf, update the length of packet, and move Buf to the end.
- @param[in, out] Packet A pointer to the packet, on success Packet->Length
- will be updated.
- @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
- will be moved to the end of the option.
- @param[in] OptType The option type.
- @param[in] OptLen The length of option contents.
- @param[in] Data The pointer to the option content.
+ @param[in, out] Packet A pointer to the packet, on success Packet->Length
+ will be updated.
+ @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
+ will be moved to the end of the option.
+ @param[in] OptType The option type.
+ @param[in] OptLen The length of option contents.
+ @param[in] Data The pointer to the option content.
- @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
- @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
- @retval EFI_SUCCESS The option is appended successfully.
+ @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
+ @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
+ @retval EFI_SUCCESS The option is appended successfully.
**/
-EFI_STATUS
+EFI_STATUS
Dhcp6AppendOption (
- IN OUT EFI_DHCP6_PACKET *Packet,
- IN OUT UINT8 **PacketCursor,
- IN UINT16 OptType,
- IN UINT16 OptLen,
- IN UINT8 *Data
+ IN OUT EFI_DHCP6_PACKET *Packet,
+ IN OUT UINT8 **PacketCursor,
+ IN UINT16 OptType,
+ IN UINT16 OptLen,
+ IN UINT8 *Data
)
{
- UINT32 Length;
- UINT32 BytesNeeded;
-
+ UINT32 Length;
+ UINT32 BytesNeeded;
+
//
// The format of Dhcp6 option:
//
@@ -640,94 +648,83 @@ Dhcp6AppendOption (
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
//
- //
- // Verify the arguments are valid
- //
- if (Packet == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (Data == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (OptLen == 0) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Verify the PacketCursor is within the packet
- //
- if ( (*PacketCursor < Packet->Dhcp6.Option)
- || (*PacketCursor >= Packet->Dhcp6.Option + (Packet->Size - sizeof (EFI_DHCP6_HEADER))))
- {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Calculate the bytes needed for the option
- //
- BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN + NTOHS (OptLen);
-
- //
- // Space remaining in the packet
- //
- Length = Packet->Size - Packet->Length;
- if (Length < BytesNeeded) {
- return EFI_BUFFER_TOO_SMALL;
- }
-
- //
- // Verify the PacketCursor is within the packet
- //
- if ( (*PacketCursor < Packet->Dhcp6.Option)
- || (*PacketCursor >= Packet->Dhcp6.Option + (Packet->Size - sizeof (EFI_DHCP6_HEADER))))
- {
- return EFI_INVALID_PARAMETER;
- }
-
- WriteUnaligned16 ((UINT16 *)*PacketCursor, OptType);
- *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
- WriteUnaligned16 ((UINT16 *)*PacketCursor, OptLen);
- *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
- CopyMem (*PacketCursor, Data, NTOHS (OptLen));
- *PacketCursor += NTOHS (OptLen);
-
- // Update the packet length by the length of the option + 4 bytes
- Packet->Length += BytesNeeded;
-
- return EFI_SUCCESS;
+ //
+ // Verify the arguments are valid
+ //
+ if (Packet == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if (Data == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if (OptLen == 0) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Verify the PacketCursor is within the packet
+ //
+ if (IS_INVALID_PACKET_CURSOR (PacketCursor, Packet)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Calculate the bytes needed for the option
+ //
+ BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN + NTOHS (OptLen);
+
+ //
+ // Space remaining in the packet
+ //
+ Length = Packet->Size - Packet->Length;
+ if (Length < BytesNeeded) {
+ return EFI_BUFFER_TOO_SMALL;
+ }
+
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, OptType);
+ *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, OptLen);
+ *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
+ CopyMem (*PacketCursor, Data, NTOHS (OptLen));
+ *PacketCursor += NTOHS (OptLen);
+
+ // Update the packet length by the length of the option + 4 bytes
+ Packet->Length += BytesNeeded;
+
+ return EFI_SUCCESS;
}
/**
Append the appointed IA Address option to Buf, and move Buf to the end.
- @param[in, out] Packet A pointer to the packet, on success Packet->Length
- will be updated.
- @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
- will be moved to the end of the option.
+ @param[in, out] Packet A pointer to the packet, on success Packet->Length
+ will be updated.
+ @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
+ will be moved to the end of the option.
@param[in] IaAddr The pointer to the IA Address.
@param[in] MessageType Message type of DHCP6 package.
- @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
- @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
- @retval EFI_SUCCESS The option is appended successfully.
+ @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
+ @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
+ @retval EFI_SUCCESS The option is appended successfully.
**/
-EFI_STATUS
+EFI_STATUS
Dhcp6AppendIaAddrOption (
- IN OUT EFI_DHCP6_PACKET *Packet,
- IN OUT UINT8 **PacketCursor,
+ IN OUT EFI_DHCP6_PACKET *Packet,
+ IN OUT UINT8 **PacketCursor,
IN EFI_DHCP6_IA_ADDRESS *IaAddr,
IN UINT32 MessageType
)
{
- UINT32 BytesNeeded;
- UINT32 Length;
+ UINT32 BytesNeeded;
+ UINT32 Length;
// The format of the IA Address option is:
//
@@ -750,60 +747,58 @@ Dhcp6AppendIaAddrOption (
// . .
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //
- // Verify the arguments are valid
- //
- if (Packet == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (IaAddr == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Verify the PacketCursor is within the packet
- //
- if ( (*PacketCursor < Packet->Dhcp6.Option)
- || (*PacketCursor >= Packet->Dhcp6.Option + (Packet->Size - sizeof (EFI_DHCP6_HEADER))))
- {
- return EFI_INVALID_PARAMETER;
- }
-
- BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN;
- BytesNeeded += sizeof (EFI_IPv6_ADDRESS);
- //
- // Even if the preferred-lifetime is 0, it still needs to store it.
- //
- BytesNeeded += sizeof (IaAddr->PreferredLifetime);
- //
- // Even if the valid-lifetime is 0, it still needs to store it.
- //
- BytesNeeded += sizeof (IaAddr->ValidLifetime);
-
- //
- // Space remaining in the packet
- //
- Length = Packet->Size - Packet->Length;
- if (Length < BytesNeeded) {
- return EFI_BUFFER_TOO_SMALL;
- }
-
+ //
+ // Verify the arguments are valid
+ //
+ if (Packet == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if (IaAddr == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Verify the PacketCursor is within the packet
+ //
+ if (IS_INVALID_PACKET_CURSOR (PacketCursor, Packet)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN;
+ BytesNeeded += sizeof (EFI_IPv6_ADDRESS);
+ //
+ // Even if the preferred-lifetime is 0, it still needs to store it.
+ //
+ BytesNeeded += sizeof (IaAddr->PreferredLifetime);
+ //
+ // Even if the valid-lifetime is 0, it still needs to store it.
+ //
+ BytesNeeded += sizeof (IaAddr->ValidLifetime);
+
+ //
+ // Space remaining in the packet
+ //
+ Length = Packet->Size - Packet->Length;
+ if (Length < BytesNeeded) {
+ return EFI_BUFFER_TOO_SMALL;
+ }
+
//
// Fill the value of Ia Address option type
//
- WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (Dhcp6OptIaAddr));
- *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (Dhcp6OptIaAddr));
+ *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
- WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (sizeof (EFI_DHCP6_IA_ADDRESS)));
- *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (sizeof (EFI_DHCP6_IA_ADDRESS)));
+ *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
- CopyMem (*PacketCursor, &IaAddr->IpAddress, sizeof (EFI_IPv6_ADDRESS));
- *PacketCursor += sizeof (EFI_IPv6_ADDRESS);
+ CopyMem (*PacketCursor, &IaAddr->IpAddress, sizeof (EFI_IPv6_ADDRESS));
+ *PacketCursor += sizeof (EFI_IPv6_ADDRESS);
//
// Fill the value of preferred-lifetime and valid-lifetime.
@@ -811,57 +806,57 @@ Dhcp6AppendIaAddrOption (
// should set to 0 when initiate a Confirm message.
//
if (MessageType != Dhcp6MsgConfirm) {
- WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL (IaAddr->PreferredLifetime));
+ WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL (IaAddr->PreferredLifetime));
}
- *PacketCursor += sizeof (IaAddr->PreferredLifetime);
+ *PacketCursor += sizeof (IaAddr->PreferredLifetime);
if (MessageType != Dhcp6MsgConfirm) {
- WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL (IaAddr->ValidLifetime));
+ WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL (IaAddr->ValidLifetime));
}
- *PacketCursor += sizeof (IaAddr->ValidLifetime);
-
- //
- // Update the packet length
- //
- Packet->Length += BytesNeeded;
-
- return EFI_SUCCESS;
+ *PacketCursor += sizeof (IaAddr->ValidLifetime);
+
+ //
+ // Update the packet length
+ //
+ Packet->Length += BytesNeeded;
+
+ return EFI_SUCCESS;
}
/**
Append the appointed Ia option to Buf, and move Buf to the end.
- @param[in, out] Packet A pointer to the packet, on success Packet->Length
- will be updated.
- @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
- will be moved to the end of the option.
+ @param[in, out] Packet A pointer to the packet, on success Packet->Length
+ will be updated.
+ @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
+ will be moved to the end of the option.
@param[in] Ia The pointer to the Ia.
@param[in] T1 The time of T1.
@param[in] T2 The time of T2.
@param[in] MessageType Message type of DHCP6 package.
- @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
- @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
- @retval EFI_SUCCESS The option is appended successfully.
+ @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
+ @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
+ @retval EFI_SUCCESS The option is appended successfully.
**/
-EFI_STATUS
+EFI_STATUS
Dhcp6AppendIaOption (
- IN OUT EFI_DHCP6_PACKET *Packet,
- IN OUT UINT8 **PacketCursor,
- IN EFI_DHCP6_IA *Ia,
- IN UINT32 T1,
- IN UINT32 T2,
- IN UINT32 MessageType
+ IN OUT EFI_DHCP6_PACKET *Packet,
+ IN OUT UINT8 **PacketCursor,
+ IN EFI_DHCP6_IA *Ia,
+ IN UINT32 T1,
+ IN UINT32 T2,
+ IN UINT32 MessageType
)
{
- UINT8 *AddrOpt;
- UINT16 *Len;
- UINTN Index;
- UINT32 BytesNeeded;
- UINT32 Length;
- EFI_STATUS Status;
+ UINT8 *AddrOpt;
+ UINT16 *Len;
+ UINTN Index;
+ UINT32 BytesNeeded;
+ UINT32 Length;
+ EFI_STATUS Status;
//
// The format of IA_NA and IA_TA option:
@@ -882,75 +877,73 @@ Dhcp6AppendIaOption (
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
//
- //
- // Verify the arguments are valid
- //
- if (Packet == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (Ia == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Verify the PacketCursor is within the packet
- //
- if ( (*PacketCursor < Packet->Dhcp6.Option)
- || (*PacketCursor >= Packet->Dhcp6.Option + (Packet->Size - sizeof (EFI_DHCP6_HEADER))))
- {
- return EFI_INVALID_PARAMETER;
- }
-
- BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN;
- BytesNeeded += sizeof (Ia->Descriptor.IaId);
- //
- // + N for the IA_NA-options/IA_TA-options
- // Dhcp6AppendIaAddrOption will need to check the length for each address
- //
- if (Ia->Descriptor.Type == Dhcp6OptIana) {
- BytesNeeded += sizeof (T1) + sizeof (T2);
- }
-
- //
- // Space remaining in the packet
- //
- Length = (UINT16)(Packet->Size - Packet->Length);
- if (Length < BytesNeeded) {
- return EFI_BUFFER_TOO_SMALL;
- }
-
-
+ //
+ // Verify the arguments are valid
+ //
+ if (Packet == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if (Ia == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Verify the PacketCursor is within the packet
+ //
+ if (IS_INVALID_PACKET_CURSOR (PacketCursor, Packet)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN;
+ BytesNeeded += sizeof (Ia->Descriptor.IaId);
+ //
+ // + N for the IA_NA-options/IA_TA-options
+ // Dhcp6AppendIaAddrOption will need to check the length for each address
+ //
+ if (Ia->Descriptor.Type == Dhcp6OptIana) {
+ BytesNeeded += sizeof (T1) + sizeof (T2);
+ }
+
+ //
+ // Space remaining in the packet
+ //
+ Length = (UINT16)(Packet->Size - Packet->Length);
+ if (Length < BytesNeeded) {
+ return EFI_BUFFER_TOO_SMALL;
+ }
+
+
//
// Fill the value of Ia option type
//
- WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (Ia->Descriptor.Type));
- *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (Ia->Descriptor.Type));
+ *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
//
// Fill the len of Ia option later, keep the pointer first
//
- Len = (UINT16 *)*PacketCursor;
- *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
+ Len = (UINT16 *)*PacketCursor;
+ *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
//
// Fill the value of iaid
//
- WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL (Ia->Descriptor.IaId));
- *PacketCursor += sizeof (Ia->Descriptor.IaId);
+ WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL (Ia->Descriptor.IaId));
+ *PacketCursor += sizeof (Ia->Descriptor.IaId);
//
// Fill the value of t1 and t2 if iana, keep it 0xffffffff if no specified.
//
if (Ia->Descriptor.Type == Dhcp6OptIana) {
- WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL ((T1 != 0) ? T1 : 0xffffffff));
- *PacketCursor += sizeof (T1);
- WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL ((T2 != 0) ? T2 : 0xffffffff));
- *PacketCursor += sizeof (T2);
+ WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL ((T1 != 0) ? T1 : 0xffffffff));
+ *PacketCursor += sizeof (T1);
+ WriteUnaligned32 ((UINT32 *)*PacketCursor, HTONL ((T2 != 0) ? T2 : 0xffffffff));
+ *PacketCursor += sizeof (T2);
}
//
@@ -958,51 +951,52 @@ Dhcp6AppendIaOption (
//
for (Index = 0; Index < Ia->IaAddressCount; Index++) {
AddrOpt = (UINT8 *) Ia->IaAddress + Index * sizeof (EFI_DHCP6_IA_ADDRESS);
- Status = Dhcp6AppendIaAddrOption (Packet, PacketCursor, (EFI_DHCP6_IA_ADDRESS *)AddrOpt, MessageType);
- if (EFI_ERROR (Status)) {
- return Status;
- }
+ Status = Dhcp6AppendIaAddrOption (Packet, PacketCursor, (EFI_DHCP6_IA_ADDRESS *)AddrOpt, MessageType);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
}
+ //
+ // Update the packet length
+ //
+ Packet->Length += BytesNeeded;
+
//
// Fill the value of Ia option length
//
- *Len = HTONS ((UINT16)(*PacketCursor - (UINT8 *)Len - 2));
-
- //
- // Update the packet length
- //
- Packet->Length += BytesNeeded;
+ *Len = HTONS ((UINT16)(*PacketCursor - (UINT8 *)Len - 2));
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
/**
Append the appointed Elapsed time option to Buf, and move Buf to the end.
- @param[in, out] Packet A pointer to the packet, on success Packet->Length
- @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
- will be moved to the end of the option.
+ @param[in, out] Packet A pointer to the packet, on success Packet->Length
+ will be updated.
+ @param[in, out] PacketCursor The pointer in the packet, on success PacketCursor
+ will be moved to the end of the option.
@param[in] Instance The pointer to the Dhcp6 instance.
@param[out] Elapsed The pointer to the elapsed time value in
- the generated packet.
+ the generated packet.
- @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
- @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
- @retval EFI_SUCCESS The option is appended successfully.
+ @retval EFI_INVALID_PARAMETER An argument provided to the function was invalid
+ @retval EFI_BUFFER_TOO_SMALL The buffer is too small to append the option.
+ @retval EFI_SUCCESS The option is appended successfully.
**/
-EFI_STATUS
+EFI_STATUS
Dhcp6AppendETOption (
- IN OUT EFI_DHCP6_PACKET *Packet,
- IN OUT UINT8 **PacketCursor,
- IN DHCP6_INSTANCE *Instance,
- OUT UINT16 **Elapsed
+ IN OUT EFI_DHCP6_PACKET *Packet,
+ IN OUT UINT8 **PacketCursor,
+ IN DHCP6_INSTANCE *Instance,
+ OUT UINT16 **Elapsed
)
{
- UINT32 BytesNeeded;
- UINT32 Length;
-
+ UINT32 BytesNeeded;
+ UINT32 Length;
+
//
// The format of elapsed time option:
//
@@ -1014,70 +1008,68 @@ Dhcp6AppendETOption (
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
//
- //
- // Verify the arguments are valid
- //
- if (Packet == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (Instance == NULL) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((Elapsed == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Verify the PacketCursor is within the packet
- //
- if ( (*PacketCursor < Packet->Dhcp6.Option)
- || (*PacketCursor >= Packet->Dhcp6.Option + (Packet->Size - sizeof (EFI_DHCP6_HEADER))))
- {
- return EFI_INVALID_PARAMETER;
- }
-
- BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN;
- //
- // + 2 for elapsed-time
- //
- BytesNeeded += sizeof (UINT16);
- //
- // Space remaining in the packet
- //
- Length = Packet->Size - Packet->Length;
- if (Length < BytesNeeded) {
- return EFI_BUFFER_TOO_SMALL;
- }
-
+ //
+ // Verify the arguments are valid
+ //
+ if (Packet == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if ((PacketCursor == NULL) || (*PacketCursor == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if (Instance == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if ((Elapsed == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Verify the PacketCursor is within the packet
+ //
+ if (IS_INVALID_PACKET_CURSOR (PacketCursor, Packet)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ BytesNeeded = DHCP6_SIZE_OF_COMBINED_CODE_AND_LEN;
+ //
+ // + 2 for elapsed-time
+ //
+ BytesNeeded += sizeof (UINT16);
+ //
+ // Space remaining in the packet
+ //
+ Length = Packet->Size - Packet->Length;
+ if (Length < BytesNeeded) {
+ return EFI_BUFFER_TOO_SMALL;
+ }
+
//
// Fill the value of elapsed-time option type.
//
- WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (Dhcp6OptElapsedTime));
- *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (Dhcp6OptElapsedTime));
+ *PacketCursor += DHCP6_SIZE_OF_OPT_CODE;
//
// Fill the len of elapsed-time option, which is fixed.
//
- WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (2));
- *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (2));
+ *PacketCursor += DHCP6_SIZE_OF_OPT_LEN;
//
// Fill in elapsed time value with 0 value for now. The actual value is
// filled in later just before the packet is transmitted.
//
- WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (0));
- *Elapsed = (UINT16 *)*PacketCursor;
- *PacketCursor += sizeof (UINT16);
+ WriteUnaligned16 ((UINT16 *)*PacketCursor, HTONS (0));
+ *Elapsed = (UINT16 *)*PacketCursor;
+ *PacketCursor += sizeof (UINT16);
+
+ Packet->Length += BytesNeeded;
- Packet->Length += BytesNeeded;
-
- return EFI_SUCCESS;
+ return EFI_SUCCESS;
}
/**
--
2.33.0
Reference in New Issue View Git Blame Copy Permalink