From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"krzysztof.koch@arm.com" <krzysztof.koch@arm.com>
Cc: "Carsey, Jaben" <jaben.carsey@intel.com>,
"Ni, Ray" <ray.ni@intel.com>,
"Sami.Mujawar@arm.com" <Sami.Mujawar@arm.com>,
"Matteo.Carlini@arm.com" <Matteo.Carlini@arm.com>,
"nd@arm.com" <nd@arm.com>
Subject: Re: [edk2-devel] [PATCH v1 05/11] ShellPkg: acpiview: SLIT: Validate System Locality count
Date: Mon, 19 Aug 2019 01:18:30 +0000 [thread overview]
Message-ID: <3CE959C139B4C44DBEA1810E3AA6F9000B82386D@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <20190815131121.52644-6-krzysztof.koch@arm.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Krzysztof Koch
> Sent: Thursday, August 15, 2019 9:11 PM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>; Sami.Mujawar@arm.com;
> Matteo.Carlini@arm.com; nd@arm.com
> Subject: [edk2-devel] [PATCH v1 05/11] ShellPkg: acpiview: SLIT: Validate
> System Locality count
>
> 1. Check if the 'Number of System Localities' provided can be represented in
> the SLIT table. The table 'Length' field is a 32-bit value while the 'Number of
> System Localities' field is 64-bit long.
>
> 2. Check if the SLIT matrix fits in the table buffer. If N is the SLIT locality count,
> then the matrix used to represent the localities is N*N bytes long. The ACPI
> table length must be big enough to fit the matrix.
>
> 3. Remove (now) redundant 64x64 bit multiplication.
Why removing? This change is added to fixed the issue build error with IA32 multiplication of two 64 bits data.
The change of #3 should be removed from the patch.
Keeping the variable size as UINT64 wouldn't affect the result.
Thanks,
Zhichao
>
> Signed-off-by: Krzysztof Koch <krzysztof.koch@arm.com>
> ---
>
> Notes:
> v1:
> - Validate the 'Number of System Localities' Field [Krzysztof]
> - Remove redundant 64x64 bit multiplication [Krzysztof]
>
> ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c |
> 47 +++++++++++++++++---
> 1 file changed, 42 insertions(+), 5 deletions(-)
>
> diff --git
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
> index
> 17e2166a09d8615b714e0c51d4d93d293fcdf601..e4625ee8b13907893a9b6990
> ecb956baf91cc3b9 100644
> ---
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
> +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitPars
> +++ er.c
> @@ -30,7 +30,7 @@ STATIC CONST ACPI_PARSER SlitParser[] = {
> /**
> Macro to get the value of a System Locality **/ -#define
> SLIT_ELEMENT(Ptr, i, j) *(Ptr + (MultU64x64 (i, LocalityCount)) + j)
> +#define SLIT_ELEMENT(Ptr, i, j) *(Ptr + (i * LocalityCount) + j)
>
> /**
> This function parses the ACPI SLIT table.
> @@ -57,9 +57,9 @@ ParseAcpiSlit (
> )
> {
> UINT32 Offset;
> - UINT64 Count;
> - UINT64 Index;
> - UINT64 LocalityCount;
> + UINT32 Count;
> + UINT32 Index;
> + UINT32 LocalityCount;
> UINT8* LocalityPtr;
> CHAR16 Buffer[80]; // Used for AsciiName param of ParseAcpi
>
> @@ -87,8 +87,45 @@ ParseAcpiSlit (
> return;
> }
>
> + /*
> + Despite the 'Number of System Localities' being a 64-bit field in SLIT,
> + the maximum number of localities that can be represented in SLIT is
> limited
> + by the 'Length' field of the ACPI table.
> +
> + Since the ACPI table length field is 32-bit wide. The maximum number of
> + localities that can be represented in SLIT can be calculated as:
> +
> + MaxLocality = sqrt (MAX_UINT32 - sizeof
> (EFI_ACPI_6_3_SYSTEM_LOCALITY_DISTANCE_INFORMATION_TABLE_HEAD
> ER))
> + = 65535
> + = MAX_UINT16
> + */
> + if (*SlitSystemLocalityCount > MAX_UINT16) {
> + IncrementErrorCount ();
> + Print (
> + L"ERROR: The Number of System Localities provided can't be
> represented " \
> + L"in the SLIT table. SlitSystemLocalityCount = %ld. " \
> + L"MaxLocalityCountAllowed = %d.\n",
> + *SlitSystemLocalityCount,
> + MAX_UINT16
> + );
> + return;
> + }
> +
> + LocalityCount = (UINT32)*SlitSystemLocalityCount;
> +
> + // Make sure system localities fit in the table buffer provided if
> + (Offset + (LocalityCount * LocalityCount) > AcpiTableLength) {
> + IncrementErrorCount ();
> + Print (
> + L"ERROR: Invalid Number of System Localities. " \
> + L"SlitSystemLocalityCount = %ld. AcpiTableLength = %d.\n",
> + *SlitSystemLocalityCount,
> + AcpiTableLength
> + );
> + return;
> + }
> +
> LocalityPtr = Ptr + Offset;
> - LocalityCount = *SlitSystemLocalityCount;
>
> // We only print the Localities if the count is less than 16
> // If the locality count is more than 16 then refer to the
> --
> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
>
>
>
>
next prev parent reply other threads:[~2019-08-19 1:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 13:11 [PATCH v1 00/11] Test against invalid pointers in acpiview Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 01/11] ShellPkg: acpiview: Set ItemPtr to NULL for unprocessed table fields Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 02/11] ShellPkg: acpiview: RSDP: Validate global pointer before use Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 03/11] ShellPkg: acpiview: FADT: " Krzysztof Koch
2019-08-16 7:34 ` Gao, Zhichao
2019-08-16 10:25 ` Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 04/11] ShellPkg: acpiview: SLIT: " Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 05/11] ShellPkg: acpiview: SLIT: Validate System Locality count Krzysztof Koch
2019-08-19 1:18 ` Gao, Zhichao [this message]
2019-08-19 6:28 ` [edk2-devel] " Krzysztof Koch
2019-08-19 7:16 ` Gao, Zhichao
2019-08-19 9:30 ` Sami Mujawar
2019-08-15 13:11 ` [PATCH v1 06/11] ShellPkg: acpiview: SRAT: Validate global pointers before use Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 07/11] ShellPkg: acpiview: MADT: " Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 08/11] ShellPkg: acpiview: PPTT: " Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 09/11] ShellPkg: acpiview: IORT: " Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 10/11] ShellPkg: acpiview: GTDT: " Krzysztof Koch
2019-08-15 13:11 ` [PATCH v1 11/11] ShellPkg: acpiview: DBG2: " Krzysztof Koch
2019-08-16 4:02 ` [edk2-devel] [PATCH v1 00/11] Test against invalid pointers in acpiview Liming Gao
2019-08-16 7:21 ` Krzysztof Koch
2019-08-19 9:29 ` Sami Mujawar
2019-08-21 1:46 ` [edk2-devel] " Gao, Zhichao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3CE959C139B4C44DBEA1810E3AA6F9000B82386D@SHSMSX101.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox