Fixing Klocwork NUM.OVERFLOW issues

Signed-off-by: Juha Vainio <[email protected]>
intel · May 20, 2020 · 38abefc · 38abefc
1 parent 7735f69
commit 38abefc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/avb/libavb_user/uefi_avb_ops.c b/avb/libavb_user/uefi_avb_ops.c
@@ -41,7 +41,7 @@
 extern char _binary_avb_pk_start;
 extern char _binary_avb_pk_end;
 #define avb_pk (&_binary_avb_pk_start)
-#define avb_pk_size (&_binary_avb_pk_end - &_binary_avb_pk_start)
+#define avb_pk_size ((size_t)&_binary_avb_pk_end - (size_t)&_binary_avb_pk_start)
 
 static AvbIOResult read_from_partition(__attribute__((unused)) AvbOps* ops,
                                        const char* partition_name,

diff --git a/libedk2_tpm/Tpm2Help.c b/libedk2_tpm/Tpm2Help.c
@@ -330,5 +330,5 @@ CopyAuthSessionCommand (
     Buffer += sizeof(UINT16);
   }
 
-  return (UINT32)(UINTN)(Buffer - (UINT8 *)AuthSessionOut);
+  return (UINT32)(Buffer - (UINT8 *)AuthSessionOut);
 }
diff --git a/libefiusb/device_mode/XdciDWC.c b/libefiusb/device_mode/XdciDWC.c
@@ -25,7 +25,7 @@ UsbRegRead (
   IN UINT32    Offset
   )
 {
-  volatile UINT32 *addr = (volatile UINT32 *)(UINTN)(Base + Offset);
+  volatile UINT32 *addr = (volatile UINT32 *)((UINTN)Base + (UINTN)Offset);
   return *addr;
 }
 
@@ -36,7 +36,7 @@ UsbRegWrite (
   IN UINT32    val
   )
 {
-  volatile UINT32 *addr = (volatile UINT32 *)(UINTN)(Base + Offset);
+  volatile UINT32 *addr = (volatile UINT32 *)((UINTN)Base + (UINTN)Offset);
   *addr = val;
 }
 
@@ -1848,7 +1848,7 @@ DwcXdciCoreInit (
   //
   // Prepare a Buffer for SETUP packet
   //
-  LocalCoreHandle->Trbs = (DWC_XDCI_TRB *)(UINTN)((UINT32)(UINTN)
+  LocalCoreHandle->Trbs = (DWC_XDCI_TRB *)(UINTN)((UINTN)
                             LocalCoreHandle->UnalignedTrbs +
                             (DWC_XDCI_TRB_BYTE_ALIGNMENT -
                             ((UINT32)(UINTN)LocalCoreHandle->UnalignedTrbs %
@@ -3946,7 +3946,7 @@ UsbXdciCoreReinit (
   //
   // Prepare a Buffer for SETUP packet
   //
-  LocalCoreHandle->Trbs = (DWC_XDCI_TRB *)(UINTN)((UINT32)(UINTN)
+  LocalCoreHandle->Trbs = (DWC_XDCI_TRB *)(UINTN)((UINTN)
                             LocalCoreHandle->UnalignedTrbs +
                             (DWC_XDCI_TRB_BYTE_ALIGNMENT -
                             ((UINT32)(UINTN)LocalCoreHandle->UnalignedTrbs %

diff --git a/libkernelflinger/qsort.c b/libkernelflinger/qsort.c
@@ -144,7 +144,7 @@ loop:	SWAPINIT(a, es);
 	pn = (char *)a + n * es;
 	r = min(pa - (char *)a, pb - pa);
 	vecswap(a, pb - r, r);
-	r = min((size_t)(pd - pc), pn - pd - es);
+	r = min(((size_t)pd - (size_t)pc), pn - pd - es);
 	vecswap(pb, pn - r, r);
 	if ((r = pb - pa) > es)
 		qsort(a, r / es, es, cmp);

diff --git a/libkernelflinger/upng.c b/libkernelflinger/upng.c
@@ -1165,7 +1165,7 @@ static EFI_STATUS upng_decode(upng_t* upng)
 
 		/* Make sure chunk header is not larger than the total
 		 * compressed */
-		if ((unsigned long)(chunk - upng->source.buffer + 12) >
+		if ((unsigned long)(chunk - (unsigned long)upng->source.buffer + 12) >
 		    upng->source.size) {
 			SET_ERROR(upng, EFI_INVALID_PARAMETER);
 			return upng->error;

diff --git a/libsslsupport/wrapper.c b/libsslsupport/wrapper.c
@@ -547,9 +547,9 @@ time_t time(time_t *timer)
 	*timer = *timer +
 		(time_t)((Time.TimeZone != EFI_UNSPECIFIED_TIMEZONE) ? (Time.TimeZone * 60) : 0) +
 		(time_t)(CumulativeDays[isleap(Time.Year)][Time.Month] * SECSPERDAY) +
-		(time_t)(((Time.Day > 0) ? Time.Day - 1 : 0) * SECSPERDAY) +
-		(time_t)(Time.Hour * SECSPERHOUR) +
-		(time_t)(Time.Minute * 60) +
+		(time_t)(((Time.Day > 0) ? (time_t)Time.Day - 1 : 0) * SECSPERDAY) +
+		(time_t)((time_t)Time.Hour * SECSPERHOUR) +
+		(time_t)((time_t)Time.Minute * 60) +
 		(time_t)Time.Second;
 
 	return *timer;