From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8B06781F5B for ; Sun, 26 Feb 2017 18:21:31 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2017 18:21:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,211,1484035200"; d="scan'208";a="1102588259" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga001.jf.intel.com with ESMTP; 26 Feb 2017 18:21:29 -0800 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 26 Feb 2017 18:21:29 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 26 Feb 2017 18:21:28 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0248.002; Mon, 27 Feb 2017 10:21:26 +0800 From: "Wu, Jiaxin" To: "Wu, Hao A" , "edk2-devel@lists.01.org" CC: "Fu, Siyuan" Thread-Topic: [PATCH v3 07/12] NetworkPkg: Refine casting expression result to bigger size Thread-Index: AQHSjyXa0IFAgvkTeEWl0CdrL90u/qF8Ig0w Date: Mon, 27 Feb 2017 02:21:26 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B72741629E216@SHSMSX103.ccr.corp.intel.com> References: <1487999555-9764-1-git-send-email-hao.a.wu@intel.com> <1487999555-9764-8-git-send-email-hao.a.wu@intel.com> In-Reply-To: <1487999555-9764-8-git-send-email-hao.a.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiY2JjZTVhNzItNGQ5ZC00ZWM2LWFiYjUtYjFiOGI4MmY3NTkzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6ImxveHdoVzhSUEZ4ZDhlRVRKUHJXUmRtcVRvNEZMaW90RldmNDRqaUxabXc9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v3 07/12] NetworkPkg: Refine casting expression result to bigger size X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 02:21:31 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wu Jiaxin Thanks, Jiaxin > -----Original Message----- > From: Wu, Hao A > Sent: Saturday, February 25, 2017 1:13 PM > To: edk2-devel@lists.01.org > Cc: Wu, Hao A ; Fu, Siyuan ; > Wu, Jiaxin > Subject: [PATCH v3 07/12] NetworkPkg: Refine casting expression result to > bigger size >=20 > 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. >=20 > 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 =3D (UINT64) (a + b); >=20 > 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. >=20 > The commit refines codes by the following rules: > 1). When the expression is possible to overflow the range of unsigned int= / > int: > c =3D (UINT64)a + b; >=20 > 2). When the expression will not overflow within the rank of "int", remov= e > the explicit type casts: > c =3D a + b; >=20 > 3). When the expression will be cast to pointer of possible greater size: > UINT32 a,b; > VOID *c; > c =3D (VOID *)(UINTN)(a + b); --> c =3D (VOID *)((UINTN)a + b); >=20 > 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) {...} >=20 > 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'. >=20 > Cc: Siyuan Fu > Cc: Jiaxin Wu > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Hao Wu > --- > NetworkPkg/IpSecDxe/Ikev2/Payload.c | 4 ++-- > NetworkPkg/IpSecDxe/IpSecConfigImpl.c | 8 ++++---- > NetworkPkg/IpSecDxe/IpSecConfigImpl.h | 4 ++-- > NetworkPkg/Mtftp6Dxe/Mtftp6Support.c | 4 ++-- > NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++++----- > 5 files changed, 15 insertions(+), 15 deletions(-) >=20 > diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c > b/NetworkPkg/IpSecDxe/Ikev2/Payload.c > index f32b3a8..237743b 100644 > --- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c > +++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c > @@ -2,7 +2,7 @@ > The implementation of Payloads Creation. >=20 > (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
> - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > are licensed and made available under the terms and conditions of the = BSD > License > @@ -1748,7 +1748,7 @@ Ikev2EncodeSa ( > Transform->Header.NextPayload =3D > IKE_TRANSFORM_NEXT_PAYLOAD_MORE; > Transform->Header.PayloadLength =3D HTONS ((UINT16)TransformSize); >=20 > - if (TransformIndex =3D=3D (UINTN)(ProposalData->NumTransforms - 1)= ) { > + if (TransformIndex =3D=3D ((UINT32)ProposalData->NumTransforms - 1= )) { > Transform->Header.NextPayload =3D > IKE_TRANSFORM_NEXT_PAYLOAD_NONE; > } >=20 > diff --git a/NetworkPkg/IpSecDxe/IpSecConfigImpl.c > b/NetworkPkg/IpSecDxe/IpSecConfigImpl.c > index cfee978..4a51bff 100644 > --- a/NetworkPkg/IpSecDxe/IpSecConfigImpl.c > +++ b/NetworkPkg/IpSecDxe/IpSecConfigImpl.c > @@ -1,7 +1,7 @@ > /** @file > The implementation of IPSEC_CONFIG_PROTOCOL. >=20 > - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > 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. > // > SpdEntrySize =3D ALIGN_VARIABLE (sizeof (IPSEC_SPD_ENTRY)); > - SpdEntrySize =3D ALIGN_VARIABLE (SpdEntrySize + > (UINTN)SIZE_OF_SPD_SELECTOR (SpdSel)); > + SpdEntrySize =3D ALIGN_VARIABLE (SpdEntrySize + SIZE_OF_SPD_SELECTOR > (SpdSel)); > SpdEntrySize +=3D IpSecGetSizeOfEfiSpdData (SpdData); >=20 > SpdEntry =3D AllocateZeroPool (SpdEntrySize); > @@ -1357,7 +1357,7 @@ SetSadEntry ( > } >=20 > if (SaData->SpdSelector !=3D NULL) { > - SadEntrySize +=3D SadEntrySize + (UINTN)SIZE_OF_SPD_SELECTOR (SaData= - > >SpdSelector); > + SadEntrySize +=3D SadEntrySize + SIZE_OF_SPD_SELECTOR (SaData- > >SpdSelector); > } > SadEntry =3D AllocateZeroPool (SadEntrySize); >=20 > @@ -1458,7 +1458,7 @@ SetSadEntry ( > SadEntry->Data->SpdEntry =3D SpdEntry; > SadEntry->Data->SpdSelector =3D (EFI_IPSEC_SPD_SELECTOR *)((UINT8 > *)SadEntry + > SadEntry= Size - > - (UINTN)S= IZE_OF_SPD_SELECTOR (SaData- > >SpdSelector) > + SIZE_OF_= SPD_SELECTOR (SaData- > >SpdSelector) > ); > DuplicateSpdSelector ( > (EFI_IPSEC_CONFIG_SELECTOR *) SadEntry->Data->SpdSelector, > diff --git a/NetworkPkg/IpSecDxe/IpSecConfigImpl.h > b/NetworkPkg/IpSecDxe/IpSecConfigImpl.h > index 3e365da..23e6880 100644 > --- a/NetworkPkg/IpSecDxe/IpSecConfigImpl.h > +++ b/NetworkPkg/IpSecDxe/IpSecConfigImpl.h > @@ -1,7 +1,7 @@ > /** @file > Definitions related to IPSEC_CONFIG_PROTOCOL implementations. >=20 > - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> + Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > 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_STATUS_NAME L"IpSecStatus" >=20 > -#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)) >=20 > #define FIX_REF_BUF_ADDR(addr, base) addr =3D (VOID *) ((UINTN) (addr= ) - > (UINTN) (base)) > diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Support.c > b/NetworkPkg/Mtftp6Dxe/Mtftp6Support.c > index 64df901..e6b4127 100644 > --- a/NetworkPkg/Mtftp6Dxe/Mtftp6Support.c > +++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Support.c > @@ -1,7 +1,7 @@ > /** @file > Mtftp6 support functions implementation. >=20 > - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > are licensed and made available under the terms and conditions of the = BSD > License > @@ -223,7 +223,7 @@ Mtftp6RemoveBlockNum ( > *TotalBlock =3D Num; >=20 > if (Range->Round > 0) { > - *TotalBlock +=3D Range->Bound + MultU64x32 ((UINT64) (Range->Ro= und > -1), (UINT32)(Range->Bound + 1)) + 1; > + *TotalBlock +=3D Range->Bound + MultU64x32 (Range->Round - 1, > (UINT32)(Range->Bound + 1)) + 1; > } >=20 > if (Range->Start > Range->Bound) { > diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c > b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c > index e24c573..36477e9 100644 > --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c > +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c > @@ -1,7 +1,7 @@ > /** @file > This implementation of EFI_PXE_BASE_CODE_PROTOCOL and > EFI_LOAD_FILE_PROTOCOL. >=20 > - Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > 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 li= nk layers. > // > - Private->BlockSize =3D (UINTN) (Private->Ip6MaxPacketSize - > - PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - > PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE); > + Private->BlockSize =3D Private->Ip6MaxPacketSize - > + PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - > PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE; >=20 > // > // 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 li= nk layers. > // > - Private->BlockSize =3D (UINTN) (Private->Ip4MaxPacketSize - > - PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - > PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE); > + Private->BlockSize =3D Private->Ip4MaxPacketSize - > + PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - > PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE; >=20 > // > // PXE over IPv4 starts here, initialize the fields. > -- > 1.9.5.msysgit.0