* [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible out-of-bounds memory writes
@ 2019-07-18 6:48 Nate DeSimone
2019-07-18 13:57 ` [edk2-devel] " Chiu, Chasel
2019-07-18 16:53 ` Chaganty, Rangasai V
0 siblings, 2 replies; 3+ messages in thread
From: Nate DeSimone @ 2019-07-18 6:48 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Michael A Kubacki, Sai Chaganty
- Add check for the DSDT not existing.
- Fixed logic errors in loop boundary check.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Co-authored-by: John Mathews <john.mathews@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
.../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
index e6ab43db6d..87c6b15ed2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
@@ -6,7 +6,7 @@
This library uses the ACPI Support protocol.
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -59,6 +59,7 @@ InitializeAslUpdateLib (
@param[in] Length - length of data to be overwritten
@retval EFI_SUCCESS - The function completed successfully.
+ @retval EFI_NOT_FOUND - Failed to locate AcpiTable.
**/
EFI_STATUS
UpdateNameAslCode (
@@ -72,6 +73,7 @@ UpdateNameAslCode (
UINT8 *CurrPtr;
UINT32 *Signature;
UINT8 *DsdtPointer;
+ UINT8 *EndPointer;
UINTN Handle;
UINT8 DataSize;
@@ -99,11 +101,15 @@ UpdateNameAslCode (
/// Point to the beginning of the DSDT table
///
CurrPtr = (UINT8 *) Table;
+ if (CurrPtr == NULL) {
+ return EFI_NOT_FOUND;
+ }
///
/// Loop through the ASL looking for values that we must fix up.
///
- for (DsdtPointer = CurrPtr; DsdtPointer <= (CurrPtr + ((EFI_ACPI_COMMON_HEADER *) CurrPtr)->Length); DsdtPointer++) {
+ EndPointer = CurrPtr + ((EFI_ACPI_COMMON_HEADER *) CurrPtr)->Length;
+ for (DsdtPointer = CurrPtr; DsdtPointer < EndPointer; DsdtPointer++) {
///
/// Get a pointer to compare for signature
///
--
2.17.1.windows.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [edk2-devel] [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible out-of-bounds memory writes
2019-07-18 6:48 [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible out-of-bounds memory writes Nate DeSimone
@ 2019-07-18 13:57 ` Chiu, Chasel
2019-07-18 16:53 ` Chaganty, Rangasai V
1 sibling, 0 replies; 3+ messages in thread
From: Chiu, Chasel @ 2019-07-18 13:57 UTC (permalink / raw)
To: devel@edk2.groups.io, Desimone, Nathaniel L
Cc: Kubacki, Michael A, Chaganty, Rangasai V
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Nate
> DeSimone
> Sent: Thursday, July 18, 2019 2:49 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>
> Subject: [edk2-devel] [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible
> out-of-bounds memory writes
>
> - Add check for the DSDT not existing.
> - Fixed logic errors in loop boundary check.
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
>
> Co-authored-by: John Mathews <john.mathews@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.
> c
> index e6ab43db6d..87c6b15ed2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.
> c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpd
> +++ ateLib.c
> @@ -6,7 +6,7 @@
>
> This library uses the ACPI Support protocol.
>
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -59,6 +59,7 @@ InitializeAslUpdateLib (
> @param[in] Length - length of data to be overwritten
>
> @retval EFI_SUCCESS - The function completed successfully.
> + @retval EFI_NOT_FOUND - Failed to locate AcpiTable.
> **/
> EFI_STATUS
> UpdateNameAslCode (
> @@ -72,6 +73,7 @@ UpdateNameAslCode (
> UINT8 *CurrPtr;
> UINT32 *Signature;
> UINT8 *DsdtPointer;
> + UINT8 *EndPointer;
> UINTN Handle;
> UINT8 DataSize;
>
> @@ -99,11 +101,15 @@ UpdateNameAslCode (
> /// Point to the beginning of the DSDT table
> ///
> CurrPtr = (UINT8 *) Table;
> + if (CurrPtr == NULL) {
> + return EFI_NOT_FOUND;
> + }
>
> ///
> /// Loop through the ASL looking for values that we must fix up.
> ///
> - for (DsdtPointer = CurrPtr; DsdtPointer <= (CurrPtr +
> ((EFI_ACPI_COMMON_HEADER *) CurrPtr)->Length); DsdtPointer++) {
> + EndPointer = CurrPtr + ((EFI_ACPI_COMMON_HEADER *) CurrPtr)->Length;
> + for (DsdtPointer = CurrPtr; DsdtPointer < EndPointer; DsdtPointer++) {
> ///
> /// Get a pointer to compare for signature
> ///
> --
> 2.17.1.windows.2
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible out-of-bounds memory writes
2019-07-18 6:48 [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible out-of-bounds memory writes Nate DeSimone
2019-07-18 13:57 ` [edk2-devel] " Chiu, Chasel
@ 2019-07-18 16:53 ` Chaganty, Rangasai V
1 sibling, 0 replies; 3+ messages in thread
From: Chaganty, Rangasai V @ 2019-07-18 16:53 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Chiu, Chasel, Kubacki, Michael A
Reviewed-by: Sai Chaganty <rangasai.v.chaganty@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L
Sent: Wednesday, July 17, 2019 11:49 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A <michael.a.kubacki@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
Subject: [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible out-of-bounds memory writes
- Add check for the DSDT not existing.
- Fixed logic errors in loop boundary check.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Co-authored-by: John Mathews <john.mathews@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
.../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
index e6ab43db6d..87c6b15ed2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpd
+++ ateLib.c
@@ -6,7 +6,7 @@
This library uses the ACPI Support protocol.
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -59,6 +59,7 @@ InitializeAslUpdateLib (
@param[in] Length - length of data to be overwritten
@retval EFI_SUCCESS - The function completed successfully.
+ @retval EFI_NOT_FOUND - Failed to locate AcpiTable.
**/
EFI_STATUS
UpdateNameAslCode (
@@ -72,6 +73,7 @@ UpdateNameAslCode (
UINT8 *CurrPtr;
UINT32 *Signature;
UINT8 *DsdtPointer;
+ UINT8 *EndPointer;
UINTN Handle;
UINT8 DataSize;
@@ -99,11 +101,15 @@ UpdateNameAslCode (
/// Point to the beginning of the DSDT table
///
CurrPtr = (UINT8 *) Table;
+ if (CurrPtr == NULL) {
+ return EFI_NOT_FOUND;
+ }
///
/// Loop through the ASL looking for values that we must fix up.
///
- for (DsdtPointer = CurrPtr; DsdtPointer <= (CurrPtr + ((EFI_ACPI_COMMON_HEADER *) CurrPtr)->Length); DsdtPointer++) {
+ EndPointer = CurrPtr + ((EFI_ACPI_COMMON_HEADER *) CurrPtr)->Length;
+ for (DsdtPointer = CurrPtr; DsdtPointer < EndPointer; DsdtPointer++) {
///
/// Get a pointer to compare for signature
///
--
2.17.1.windows.2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-18 16:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-18 6:48 [edk2-platforms] [PATCH v2] KabylakeSiliconPkg: Possible out-of-bounds memory writes Nate DeSimone
2019-07-18 13:57 ` [edk2-devel] " Chiu, Chasel
2019-07-18 16:53 ` Chaganty, Rangasai V
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox