tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 07:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

NetworkPkg: Refine casting expression result to bigger size

Browse Source 
There are cases that the operands of an expression are all with rank less
than UINT64/INT64 and the result of the expression is explicitly cast to
UINT64/INT64 to fit the target size.

An example will be:
UINT32 a,b;
// a and b can be any unsigned int type with rank less than UINT64, like
// UINT8, UINT16, etc.
UINT64 c;
c = (UINT64) (a + b);

Some static code checkers may warn that the expression result might
overflow within the rank of "int" (integer promotions) and the result is
then cast to a bigger size.

The commit refines codes by the following rules:
1). When the expression is possible to overflow the range of unsigned int/
int:
c = (UINT64)a + b;

2). When the expression will not overflow within the rank of "int", remove
the explicit type casts:
c = a + b;

3). When the expression will be cast to pointer of possible greater size:
UINT32 a,b;
VOID *c;
c = (VOID *)(UINTN)(a + b); --> c = (VOID *)((UINTN)a + b);

4). When one side of a comparison expression contains only operands with
rank less than UINT32:
UINT8 a;
UINT16 b;
UINTN c;
if ((UINTN)(a + b) > c) {...} --> if (((UINT32)a + b) > c) {...}

For rule 4), if we remove the 'UINTN' type cast like:
if (a + b > c) {...}
The VS compiler will complain with warning C4018 (signed/unsigned
mismatch, level 3 warning) due to promoting 'a + b' to type 'int'.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
This commit is contained in:
Hao Wu 2017-02-16 14:58:03 +08:00
parent bcee1b9f17
commit ce5c3273c3
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NetworkPkg/IpSecDxe/Ikev2/Payload.c
View File

@ -2,7 +2,7 @@
The implementation of Payloads Creation. The implementation of Payloads Creation.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -1748,7 +1748,7 @@ Ikev2EncodeSa (
Transform->Header.NextPayload = IKE_TRANSFORM_NEXT_PAYLOAD_MORE; Transform->Header.NextPayload = IKE_TRANSFORM_NEXT_PAYLOAD_MORE;
Transform->Header.PayloadLength = HTONS ((UINT16)TransformSize); Transform->Header.PayloadLength = HTONS ((UINT16)TransformSize);
if (TransformIndex == (UINTN)(ProposalData->NumTransforms - 1)) { if (TransformIndex == ((UINT32)ProposalData->NumTransforms - 1)) {
Transform->Header.NextPayload = IKE_TRANSFORM_NEXT_PAYLOAD_NONE; Transform->Header.NextPayload = IKE_TRANSFORM_NEXT_PAYLOAD_NONE;
} }

8
NetworkPkg/IpSecDxe/IpSecConfigImpl.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The implementation of IPSEC_CONFIG_PROTOCOL. The implementation of IPSEC_CONFIG_PROTOCOL.
Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -1152,7 +1152,7 @@ SetSpdEntry (
// Do Padding for the different Arch. // Do Padding for the different Arch.
// //
SpdEntrySize = ALIGN_VARIABLE (sizeof (IPSEC_SPD_ENTRY)); SpdEntrySize = ALIGN_VARIABLE (sizeof (IPSEC_SPD_ENTRY));
SpdEntrySize = ALIGN_VARIABLE (SpdEntrySize + (UINTN)SIZE_OF_SPD_SELECTOR (SpdSel)); SpdEntrySize = ALIGN_VARIABLE (SpdEntrySize + SIZE_OF_SPD_SELECTOR (SpdSel));
SpdEntrySize += IpSecGetSizeOfEfiSpdData (SpdData); SpdEntrySize += IpSecGetSizeOfEfiSpdData (SpdData);
SpdEntry = AllocateZeroPool (SpdEntrySize); SpdEntry = AllocateZeroPool (SpdEntrySize);
@ -1357,7 +1357,7 @@ SetSadEntry (
} }
if (SaData->SpdSelector != NULL) { if (SaData->SpdSelector != NULL) {
SadEntrySize += SadEntrySize + (UINTN)SIZE_OF_SPD_SELECTOR (SaData->SpdSelector); SadEntrySize += SadEntrySize + SIZE_OF_SPD_SELECTOR (SaData->SpdSelector);
} }
SadEntry = AllocateZeroPool (SadEntrySize); SadEntry = AllocateZeroPool (SadEntrySize);
@ -1458,7 +1458,7 @@ SetSadEntry (
SadEntry->Data->SpdEntry = SpdEntry; SadEntry->Data->SpdEntry = SpdEntry;
SadEntry->Data->SpdSelector = (EFI_IPSEC_SPD_SELECTOR *)((UINT8 *)SadEntry + SadEntry->Data->SpdSelector = (EFI_IPSEC_SPD_SELECTOR *)((UINT8 *)SadEntry +
SadEntrySize - SadEntrySize -
(UINTN)SIZE_OF_SPD_SELECTOR (SaData->SpdSelector) SIZE_OF_SPD_SELECTOR (SaData->SpdSelector)
); );
DuplicateSpdSelector ( DuplicateSpdSelector (
(EFI_IPSEC_CONFIG_SELECTOR *) SadEntry->Data->SpdSelector, (EFI_IPSEC_CONFIG_SELECTOR *) SadEntry->Data->SpdSelector,

4
NetworkPkg/IpSecDxe/IpSecConfigImpl.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Definitions related to IPSEC_CONFIG_PROTOCOL implementations. Definitions related to IPSEC_CONFIG_PROTOCOL implementations.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -38,7 +38,7 @@
#define IPSECCONFIG_VARIABLE_NAME L"IpSecConfig" #define IPSECCONFIG_VARIABLE_NAME L"IpSecConfig"
#define IPSECCONFIG_STATUS_NAME L"IpSecStatus" #define IPSECCONFIG_STATUS_NAME L"IpSecStatus"
#define SIZE_OF_SPD_SELECTOR(x) (UINTN) (sizeof (EFI_IPSEC_SPD_SELECTOR) \ #define SIZE_OF_SPD_SELECTOR(x) (sizeof (EFI_IPSEC_SPD_SELECTOR) \
+ sizeof (EFI_IP_ADDRESS_INFO) * ((x)->LocalAddressCount + (x)->RemoteAddressCount)) + sizeof (EFI_IP_ADDRESS_INFO) * ((x)->LocalAddressCount + (x)->RemoteAddressCount))
#define FIX_REF_BUF_ADDR(addr, base) addr = (VOID *) ((UINTN) (addr) - (UINTN) (base)) #define FIX_REF_BUF_ADDR(addr, base) addr = (VOID *) ((UINTN) (addr) - (UINTN) (base))

4
NetworkPkg/Mtftp6Dxe/Mtftp6Support.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Mtftp6 support functions implementation. Mtftp6 support functions implementation.
Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -223,7 +223,7 @@ Mtftp6RemoveBlockNum (
*TotalBlock = Num; *TotalBlock = Num;
if (Range->Round > 0) { if (Range->Round > 0) {
*TotalBlock += Range->Bound + MultU64x32 ((UINT64) (Range->Round -1), (UINT32)(Range->Bound + 1)) + 1; *TotalBlock += Range->Bound + MultU64x32 (Range->Round - 1, (UINT32)(Range->Bound + 1)) + 1;
} }
if (Range->Start > Range->Bound) { if (Range->Start > Range->Bound) {

10
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
This implementation of EFI_PXE_BASE_CODE_PROTOCOL and EFI_LOAD_FILE_PROTOCOL. This implementation of EFI_PXE_BASE_CODE_PROTOCOL and EFI_LOAD_FILE_PROTOCOL.
Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -95,8 +95,8 @@ EfiPxeBcStart (
// //
// Configure block size for TFTP as a default value to handle all link layers. // Configure block size for TFTP as a default value to handle all link layers.
// //
Private->BlockSize = (UINTN) (Private->Ip6MaxPacketSize - Private->BlockSize = Private->Ip6MaxPacketSize -
PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE); PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;
// //
// PXE over IPv6 starts here, initialize the fields and list header. // PXE over IPv6 starts here, initialize the fields and list header.
@ -148,8 +148,8 @@ EfiPxeBcStart (
// //
// Configure block size for TFTP as a default value to handle all link layers. // Configure block size for TFTP as a default value to handle all link layers.
// //
Private->BlockSize = (UINTN) (Private->Ip4MaxPacketSize - Private->BlockSize = Private->Ip4MaxPacketSize -
PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE); PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;
// //
// PXE over IPv4 starts here, initialize the fields. // PXE over IPv4 starts here, initialize the fields.