From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 473D1211982D9 for ; Mon, 3 Dec 2018 04:50:21 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2AFAD3082A24; Mon, 3 Dec 2018 12:50:21 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-61.rdu2.redhat.com [10.10.120.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C7821868F; Mon, 3 Dec 2018 12:50:19 +0000 (UTC) To: Ard Biesheuvel , edk2-devel@lists.01.org Cc: Yonghong Zhu , Liming Gao , Bob Feng , Jaben Carsey References: <20181130224537.18936-1-ard.biesheuvel@linaro.org> <20181130224537.18936-2-ard.biesheuvel@linaro.org> From: Laszlo Ersek Message-ID: Date: Mon, 3 Dec 2018 13:50:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181130224537.18936-2-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 03 Dec 2018 12:50:21 +0000 (UTC) Subject: Re: [PATCH v2 1/6] BaseTools/CommonLib: avoid using 'native' word size in IP address handling X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2018 12:50:22 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 11/30/18 23:45, Ard Biesheuvel wrote: > In the context of the BaseTools, there is no such thing as a native word > size, given that the same set of tools may be used to build a firmware > image consisting of both 32-bit and 64-bit modules. > > So update StrToIpv4Address() and StrToIpv6Address() to use UINT64 > types instead of UINTN types when parsing strings. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel > --- > BaseTools/Source/C/Common/CommonLib.c | 28 ++++++++++---------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/BaseTools/Source/C/Common/CommonLib.c b/BaseTools/Source/C/Common/CommonLib.c > index 618aadac781a..7c559bc3c222 100644 > --- a/BaseTools/Source/C/Common/CommonLib.c > +++ b/BaseTools/Source/C/Common/CommonLib.c > @@ -1785,7 +1785,7 @@ StrToIpv4Address ( > { > RETURN_STATUS Status; > UINTN AddressIndex; > - UINTN Uintn; > + UINT64 Uint64; > EFI_IPv4_ADDRESS LocalAddress; > UINT8 LocalPrefixLength; > CHAR16 *Pointer; > @@ -1812,7 +1812,7 @@ StrToIpv4Address ( > // > // Get D or P. > // > - Status = StrDecimalToUintnS ((CONST CHAR16 *) Pointer, &Pointer, &Uintn); > + Status = StrDecimalToUint64S ((CONST CHAR16 *) Pointer, &Pointer, &Uint64); > if (RETURN_ERROR (Status)) { > return RETURN_UNSUPPORTED; > } > @@ -1820,18 +1820,18 @@ StrToIpv4Address ( > // > // It's P. > // > - if (Uintn > 32) { > + if (Uint64 > 32) { > return RETURN_UNSUPPORTED; > } > - LocalPrefixLength = (UINT8) Uintn; > + LocalPrefixLength = (UINT8) Uint64; > } else { > // > // It's D. > // > - if (Uintn > MAX_UINT8) { > + if (Uint64 > MAX_UINT8) { > return RETURN_UNSUPPORTED; > } > - LocalAddress.Addr[AddressIndex] = (UINT8) Uintn; > + LocalAddress.Addr[AddressIndex] = (UINT8) Uint64; > AddressIndex++; > } > > @@ -1888,7 +1888,7 @@ StrToIpv6Address ( > { > RETURN_STATUS Status; > UINTN AddressIndex; > - UINTN Uintn; > + UINT64 Uint64; > EFI_IPv6_ADDRESS LocalAddress; > UINT8 LocalPrefixLength; > CONST CHAR16 *Pointer; > @@ -1969,7 +1969,7 @@ StrToIpv6Address ( > // > // Get X. > // > - Status = StrHexToUintnS (Pointer, &End, &Uintn); > + Status = StrHexToUint64S (Pointer, &End, &Uint64); > if (RETURN_ERROR (Status) || End - Pointer > 4) { > // > // Number of hexadecimal digit characters is no more than 4. > @@ -1978,24 +1978,24 @@ StrToIpv6Address ( > } > Pointer = End; > // > - // Uintn won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4. > + // Uint64 won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4. > // > ASSERT (AddressIndex + 1 < ARRAY_SIZE (Address->Addr)); > - LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uintn >> 8); > - LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn; > + LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uint64 >> 8); > + LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uint64; > AddressIndex += 2; > } else { > // > // Get P, then exit the loop. > // > - Status = StrDecimalToUintnS (Pointer, &End, &Uintn); > - if (RETURN_ERROR (Status) || End == Pointer || Uintn > 128) { > + Status = StrDecimalToUint64S (Pointer, &End, &Uint64); > + if (RETURN_ERROR (Status) || End == Pointer || Uint64 > 128) { > // > // Prefix length should not exceed 128. > // > return RETURN_UNSUPPORTED; > } > - LocalPrefixLength = (UINT8) Uintn; > + LocalPrefixLength = (UINT8) Uint64; > Pointer = End; > break; > } > Reviewed-by: Laszlo Ersek