Re: [edk2-devel] [PATCH 2/3] [edk2-stable202402] NetworkPkg: Dhcp6Dxe: Additional Code Cleanup

["Saloni Kasbekar" <saloni.kasbekar@intel.com>]

Reviewed-by: Saloni Kasbekar <saloni.kasbekar@intel.com>

-----Original Message-----
From: Douglas Flick [MSFT] <doug.edk2@gmail.com> 
Sent: Friday, February 9, 2024 7:05 PM
To: devel@edk2.groups.io
Cc: Doug Flick <dougflick@microsoft.com>; Kasbekar, Saloni <saloni.kasbekar@intel.com>; Clark-williams, Zachary <zachary.clark-williams@intel.com>; Andrew Fish <afish@apple.com>; Leif Lindholm <quic_llindhol@quicinc.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Doug Flick [MSFT] <doug.edk2@gmail.com>
Subject: [PATCH 2/3] [edk2-stable202402] NetworkPkg: Dhcp6Dxe: Additional Code Cleanup

From: Doug Flick <dougflick@microsoft.com>

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;
>  }
>

Additionally Calculates the Packet->Length before appending

Cc: Saloni Kasbekar <saloni.kasbekar@intel.com>
Cc: Zachary Clark-williams <zachary.clark-williams@intel.com>

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>
---
 NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
index 705c665c519d..348602c4e1a8 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
@@ -657,15 +657,6 @@ Dhcp6AppendOption (
     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);@@ -929,6 +920,11 @@ Dhcp6AppendIaOption (
     *PacketCursor += sizeof (T2);   } +  //+  // Update the packet length+  //+  Packet->Length += BytesNeeded;+   //   // Fill all the addresses belong to the Ia   //@@ -945,11 +941,6 @@ Dhcp6AppendIaOption (
   //   *Len = HTONS ((UINT16)(*PacketCursor - (UINT8 *)Len - 2)); -  //-  // Update the packet length-  //-  Packet->Length += BytesNeeded;-   return EFI_SUCCESS; } @@ -957,6 +948,7 @@ Dhcp6AppendIaOption (
   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+                                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.-- 
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115363): https://edk2.groups.io/g/devel/message/115363
Mute This Topic: https://groups.io/mt/104272127/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-