[AMD Official Use Only - General]
> -----Original Message-----
> From: Mike Maslenkin <mike.maslen...@gmail.com>
> Sent: Friday, December 15, 2023 7:25 AM
> To: devel@edk2.groups.io
> Cc: Chang, Abner <abner.ch...@amd.com>; nick...@nvidia.com;
> ig...@ami.com; Mike Maslenkin <mike.maslen...@gmail.com>
> Subject: [PATCH v2 13/14] RedfishDiscoverDxe: handle memory allocation
> error conditions.
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> Cc: Abner Chang <abner.ch...@amd.com>
> Cc: Nickle Wang <nick...@nvidia.com>
> Cc: Igor Kulchytskyy <ig...@ami.com>
> Signed-off-by: Mike Maslenkin <mike.maslen...@gmail.com>
> ---
> .../RedfishDiscoverDxe/RedfishDiscoverDxe.c | 85 ++++++++++++++++---
> 1 file changed, 75 insertions(+), 10 deletions(-)
>
> diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
> b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
> index 3499a855570c..9d1678c3429e 100644
> --- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
> +++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c
> @@ -748,38 +748,103 @@ InitInformationData (
> if (RedfishLocation != NULL) {
>
> AllocationSize = AsciiStrSize (RedfishLocation) * sizeof (CHAR16);
>
> Information->Location = AllocatePool (AllocationSize);
>
> - AsciiStrToUnicodeStrS (RedfishLocation, Information->Location,
> AllocationSize);
>
> - DEBUG ((DEBUG_MANAGEABILITY, "Redfish service location: %s.\n",
> Information->Location));
>
> + if (Information->Location != NULL) {
>
> + AsciiStrToUnicodeStrS (RedfishLocation, Information->Location,
> AllocationSize);
>
> + DEBUG ((DEBUG_MANAGEABILITY, "Redfish service location: %s.\n",
> Information->Location));
>
> + } else {
>
> + DEBUG ((
>
> + DEBUG_ERROR,
>
> + "%a: Can not allocate memory for Redfish service location: %a.\n",
>
> + __func__,
>
> + RedfishLocation
>
> + ));
>
> + }
>
> }
>
>
>
> if (Uuid != NULL) {
>
> AllocationSize = AsciiStrSize (Uuid) * sizeof (CHAR16);
>
> Information->Uuid = AllocatePool (AllocationSize);
>
> - AsciiStrToUnicodeStrS (Uuid, Information->Uuid, AllocationSize);
>
> - DEBUG ((DEBUG_MANAGEABILITY, "Service UUID: %s.\n", Information-
> >Uuid));
>
> + if (Information->Uuid != NULL) {
>
> + AsciiStrToUnicodeStrS (Uuid, Information->Uuid, AllocationSize);
>
> + DEBUG ((DEBUG_MANAGEABILITY, "Service UUID: %s.\n", Information-
> >Uuid));
>
> + } else {
>
> + DEBUG ((
>
> + DEBUG_ERROR,
>
> + "%a: Can not allocate memory for Service UUID: %a.\n",
>
> + __func__,
>
> + Uuid
>
> + ));
>
> + }
>
> }
>
>
>
> if (Os != NULL) {
>
> AllocationSize = AsciiStrSize (Os) * sizeof (CHAR16);
>
> Information->Os = AllocatePool (AllocationSize);
>
> - AsciiStrToUnicodeStrS (Os, Information->Os, AllocationSize);
>
> + if (Information->Os != NULL) {
>
> + AsciiStrToUnicodeStrS (Os, Information->Os, AllocationSize);
>
> + } else {
>
> + DEBUG ((
>
> + DEBUG_ERROR,
>
> + "%a: Can not allocate memory for Redfish service OS: %a.\n",
>
> + __func__,
>
> + Os
>
> + ));
>
> + }
>
> }
>
>
>
> if (OsVer != NULL) {
>
> AllocationSize = AsciiStrSize (OsVer) * sizeof (CHAR16);
>
> Information->OsVersion = AllocatePool (AllocationSize);
>
> - AsciiStrToUnicodeStrS (OsVer, Information->OsVersion, AllocationSize);
>
> - DEBUG ((DEBUG_MANAGEABILITY, "Redfish service OS: %s, Version:%s.\n",
> Information->Os, Information->OsVersion));
>
> + if (Information->OsVersion != NULL) {
>
> + AsciiStrToUnicodeStrS (OsVer, Information->OsVersion, AllocationSize);
>
> + DEBUG ((
>
> + DEBUG_MANAGEABILITY,
>
> + "Redfish service OS: %s, Version:%s.\n",
Jus a note here: We expect the debug message will be <null string> for the
case when Information->Os is NULL.
>
> + Information->Os,
>
> + Information->OsVersion
>
> + ));
>
> + } else {
>
> + DEBUG ((
>
> + DEBUG_ERROR,
>
> + "%a: Can not allocate memory for Redfish OS Version:%a.\n",
>
> + __func__,
>
> + OsVer
>
> + ));
>
> + }
>
> }
>
>
>
> if ((Product != NULL) && (ProductVer != NULL)) {
Not for your change, but could you please help to remove this check? I think we
can have a consistent code as Os/OsVer, just print out the product information
separately.
Thanks
Abner
>
> AllocationSize = AsciiStrSize (Product) * sizeof (CHAR16);
>
> Information->Product = AllocatePool (AllocationSize);
>
> - AsciiStrToUnicodeStrS (Product, Information->Product, AllocationSize);
>
> + if (Information->Product != NULL) {
>
> + AsciiStrToUnicodeStrS (Product, Information->Product, AllocationSize);
>
> + } else {
>
> + DEBUG ((
>
> + DEBUG_ERROR,
>
> + "%a: Can not allocate memory for Redfish service product: %a.\n",
>
> + __func__,
>
> + Product
>
> + ));
>
> + }
>
> +
>
> AllocationSize = AsciiStrSize (ProductVer) * sizeof (CHAR16);
>
> Information->ProductVer = AllocatePool (AllocationSize);
>
> - AsciiStrToUnicodeStrS (ProductVer, Information->ProductVer,
> AllocationSize);
>
> - DEBUG ((DEBUG_MANAGEABILITY, "Redfish service product: %s,
> Version:%s.\n", Information->Product, Information->ProductVer));
>
> + if (Information->ProductVer != NULL) {
>
> + AsciiStrToUnicodeStrS (ProductVer, Information->ProductVer,
> AllocationSize);
>
> + DEBUG ((
>
> + DEBUG_MANAGEABILITY,
>
> + "Redfish service product: %s, Version:%s.\n",
>
> + Information->Product,
>
> + Information->ProductVer
>
> + ));
>
> + } else {
>
> + DEBUG ((
>
> + DEBUG_ERROR,
>
> + "%a: Can not allocate memory for Redfish service product Version:
> %a.\n",
>
> + __func__,
>
> + ProductVer
>
> + ));
>
> + }
>
> }
>
> }
>
>
>
> --
> 2.32.0 (Apple Git-132)
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112631): https://edk2.groups.io/g/devel/message/112631
Mute This Topic: https://groups.io/mt/103181050/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
