Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Ip4Dxe/Ip4Option.c

Timestamp:

Apr 14, 2023 3:17:44 PM (22 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• NetworkPkg/Ip4Dxe/Ip4Option.c (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Ip4Dxe/Ip4Option.c

@@ -8 +8 @@
 
 #include "Ip4Impl.h"
-
 
 /**
@@ -25 +24 @@
 BOOLEAN
 Ip4OptionIsValid (
-  IN UINT8                  *Option,
-  IN UINT32                 OptionLen,
-  IN BOOLEAN                Rcvd
+  IN UINT8    *Option,
+  IN UINT32   OptionLen,
+  IN BOOLEAN  Rcvd
   )
 {
-  UINT32                    Cur;
-  UINT32                    Len;
-  UINT32                    Point;
+  UINT32  Cur;
+  UINT32  Len;
+  UINT32  Point;
 
-  Cur       = 0;
+  Cur = 0;
 
   while (Cur < OptionLen) {
     switch (Option[Cur]) {
-    case IP4_OPTION_NOP:
-      Cur++;
-      break;
+      case IP4_OPTION_NOP:
+        Cur++;
+        break;
 
-    case IP4_OPTION_EOP:
-      Cur = OptionLen;
-      break;
+      case IP4_OPTION_EOP:
+        Cur = OptionLen;
+        break;
 
-    case IP4_OPTION_LSRR:
-    case IP4_OPTION_SSRR:
-    case IP4_OPTION_RR:
-      Len   = Option[Cur + 1];
-      Point = Option[Cur + 2];
+      case IP4_OPTION_LSRR:
+      case IP4_OPTION_SSRR:
+      case IP4_OPTION_RR:
+        Len   = Option[Cur + 1];
+        Point = Option[Cur + 2];
 
-      //
-      // SRR/RR options are formatted as |Type|Len|Point|Ip1|Ip2|...
-      //
-      if ((OptionLen - Cur < Len) || (Len < 3) || ((Len - 3) % 4 != 0)) {
-        return FALSE;
-      }
+        //
+        // SRR/RR options are formatted as |Type|Len|Point|Ip1|Ip2|...
+        //
+        if ((OptionLen - Cur < Len) || (Len < 3) || ((Len - 3) % 4 != 0)) {
+          return FALSE;
+        }
 
-      if ((Point > Len + 1) || (Point % 4 != 0)) {
-        return FALSE;
-      }
+        if ((Point > Len + 1) || (Point % 4 != 0)) {
+          return FALSE;
+        }
 
-      //
-      // The Point must point pass the last entry if the packet is received
-      // by us. It must point to 4 if the packet is to be sent by us for
-      // source route option.
-      //
-      if ((Option[Cur] != IP4_OPTION_RR) &&
-          ((Rcvd && (Point != Len + 1)) || (!Rcvd && (Point != 4)))) {
+        //
+        // The Point must point pass the last entry if the packet is received
+        // by us. It must point to 4 if the packet is to be sent by us for
+        // source route option.
+        //
+        if ((Option[Cur] != IP4_OPTION_RR) &&
+            ((Rcvd && (Point != Len + 1)) || (!Rcvd && (Point != 4))))
+        {
+          return FALSE;
+        }
 
-        return FALSE;
-      }
+        Cur += Len;
+        break;
 
-      Cur += Len;
-      break;
+      default:
+        Len = Option[Cur + 1];
 
-    default:
-      Len = Option[Cur + 1];
+        if ((OptionLen - Cur < Len) || (Len < 2)) {
+          return FALSE;
+        }
 
-      if ((OptionLen - Cur < Len) || (Len < 2)) {
-        return FALSE;
-      }
-
-      Cur = Cur + Len;
-      break;
+        Cur = Cur + Len;
+        break;
     }
-
   }
 
   return TRUE;
 }
-
 
 /**
@@ -113 +110 @@
 EFI_STATUS
 Ip4CopyOption (
-  IN     UINT8              *Option,
-  IN     UINT32             OptionLen,
-  IN     BOOLEAN            FirstFragment,
-  IN OUT UINT8              *Buf,           OPTIONAL
-  IN OUT UINT32             *BufLen
+  IN     UINT8    *Option,
+  IN     UINT32   OptionLen,
+  IN     BOOLEAN  FirstFragment,
+  IN OUT UINT8    *Buf            OPTIONAL,
+  IN OUT UINT32   *BufLen
   )
 {
-  UINT8                     OptBuf[40];
-  UINT32                    Cur;
-  UINT32                    Next;
-  UINT8                     Type;
-  UINT32                    Len;
+  UINT8   OptBuf[40];
+  UINT32  Cur;
+  UINT32  Next;
+  UINT8   Type;
+  UINT32  Len;
 
   ASSERT ((BufLen != NULL) && (OptionLen <= 40));
 
-  Cur   = 0;
-  Next  = 0;
+  Cur  = 0;
+  Next = 0;
 
   while (Cur < OptionLen) {
-    Type  = Option[Cur];
-    Len   = Option[Cur + 1];
+    Type = Option[Cur];
+    Len  = Option[Cur + 1];
 
     if (Type == IP4_OPTION_NOP) {
@@ -143 +140 @@
       Next++;
       Cur++;
-
     } else if (Type == IP4_OPTION_EOP) {
       //
@@ -149 +145 @@
       //
       break;
-
     } else {
       //
       // don't copy options that is only valid for the first fragment
       //
-      if (FirstFragment || (Type & IP4_OPTION_COPY_MASK) != 0) {
+      if (FirstFragment || ((Type & IP4_OPTION_COPY_MASK) != 0)) {
         CopyMem (OptBuf + Next, Option + Cur, Len);
         Next += Len;