Reviewed-By: Zailiang Sun
> -Original Message-
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang ; Qian, Yi ;
> Gary Lin
> Subject: [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer
> access in SmbiosMiscDxe
>
> Handle case where no Simple Network Protocols are found.
>
> Cc: Zailiang Sun
> Cc: Yi Qian
> Cc: Gary Lin
> Signed-off-by: Michael D Kinney
> ---
> .../MiscBaseBoardManufacturerFunction.c| 14 +-
> .../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 14 +
> -
> 2 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> index 4e02486853..8eddc5c2a6 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> @@ -130,11 +130,15 @@
> MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
>//
>//Get the MAC string
>//
> - Status = NetLibGetMacString (
> - *Handles,
> - NULL,
> - &MacStr
> - );
> + if (Handles == NULL) {
> +Status = EFI_NOT_FOUND;
> + } else {
> +Status = NetLibGetMacString (
> + *Handles,
> + NULL,
> + &MacStr
> + );
> + }
>if (EFI_ERROR (Status)) {
> MacStr = L"";
>}
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> index da660cb3a8..b18dbd6ae2 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> @@ -212,11 +212,15 @@ AddSmbiosManuCallback (
>//
>//Get the MAC string
>//
> - Status = NetLibGetMacString (
> - *Handles,
> - NULL,
> - &MacStr
> - );
> + if (Handles == NULL) {
> +Status = EFI_NOT_FOUND;
> + } else {
> +Status = NetLibGetMacString (
> + *Handles,
> + NULL,
> + &MacStr
> + );
> + }
>if (EFI_ERROR (Status)) {
> MacStr = L"";
>}
> --
> 2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#43566): https://edk2.groups.io/g/devel/message/43566
Mute This Topic: https://groups.io/mt/32419741/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
