From: "Chang, Abner via groups.io" <abner.chang=amd.com@groups.io>
To: Mike Maslenkin <mike.maslenkin@gmail.com>
Cc: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"nicklew@nvidia.com" <nicklew@nvidia.com>,
"igork@ami.com" <igork@ami.com>
Subject: Re: [edk2-devel] [edk2-redfish-client][PATCH 2/2] RedfishClientPkg: fix memory leak in ConverterLib
Date: Tue, 30 Jan 2024 14:06:12 +0000 [thread overview]
Message-ID: <LV8PR12MB9452A44A14FC3553570A0085EA7D2@LV8PR12MB9452.namprd12.prod.outlook.com> (raw)
In-Reply-To: <CAL77WPArSkeeG+QE+cqiPmL6HiHEuqoRTczFQ8ctT3MFxdigrQ@mail.gmail.com>
[AMD Official Use Only - General]
Hi Mike,
I just merged it.
Also Reviewed-by: Abner Chang <abner.chang@amd.com> for this two patches set. You can create a PR against edk2-redfish-client, I will merge it once it passes CI.
Thank you
Abner
> -----Original Message-----
> From: Mike Maslenkin <mike.maslenkin@gmail.com>
> Sent: Tuesday, January 30, 2024 7:15 PM
> To: Chang, Abner <Abner.Chang@amd.com>
> Cc: devel@edk2.groups.io; nicklew@nvidia.com; igork@ami.com
> Subject: Re: [edk2-redfish-client][PATCH 2/2] RedfishClientPkg: fix memory
> leak in ConverterLib
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> Hi Abner,
>
> I created PR containing patch 2/2 with your R-b set.
>
> https://github.com/DMTF/Redfish-Schema-C-Struct-Generator/pull/5
>
> Please review and commit. Thank you!
>
> Regards,
> Mike.
>
> On Mon, Jan 29, 2024 at 5:41 AM Chang, Abner <Abner.Chang@amd.com>
> wrote:
> >
> > [AMD Official Use Only - General]
> >
> > Reviewed-by: Abner Chang <abner.chang@amd.com>
> >
> > Would you like to create a PR on below repo
> https://github.com/DMTF/Redfish-Schema-C-Struct-Generator for the 2/2
> patch? As we should fix the issue on DMTF Github as well.
> RedfishCsCommon.c is here, https://github.com/DMTF/Redfish-Schema-C-
> Struct-Generator/tree/main/src. I can also help to sync up the fix if you are ok
> with it.
> >
> > Thanks
> > Abner
> >
> >
> > > -----Original Message-----
> > > From: Mike Maslenkin <mike.maslenkin@gmail.com>
> > > Sent: Saturday, January 27, 2024 8:01 AM
> > > To: devel@edk2.groups.io
> > > Cc: Chang, Abner <Abner.Chang@amd.com>; nicklew@nvidia.com;
> > > igork@ami.com; Mike Maslenkin <mike.maslenkin@gmail.com>
> > > Subject: [edk2-redfish-client][PATCH 2/2] RedfishClientPkg: fix memory
> leak in
> > > ConverterLib
> > >
> > > Caution: This message originated from an External Source. Use proper
> caution
> > > when opening attachments, clicking links, or responding.
> > >
> > >
> > > The memory returned by json_dumps() must be freed.
> > >
> > > Signed-off-by: Mike Maslenkin <mike.maslenkin@gmail.com>
> > > Cc: Abner Chang <abner.chang@amd.com>
> > > Cc: Nickle Wang <nicklew@nvidia.com>
> > > Cc: Igor Kulchytskyy <igork@ami.com>
> > > ---
> > > RedfishClientPkg/ConverterLib/src/RedfishCsCommon.c | 7 ++++++-
> > > 1 file changed, 6 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/RedfishClientPkg/ConverterLib/src/RedfishCsCommon.c
> > > b/RedfishClientPkg/ConverterLib/src/RedfishCsCommon.c
> > > index 126200dd019c..250ef75e40de 100644
> > > --- a/RedfishClientPkg/ConverterLib/src/RedfishCsCommon.c
> > > +++ b/RedfishClientPkg/ConverterLib/src/RedfishCsCommon.c
> > > @@ -379,15 +379,19 @@ CreateCsJsonByNode (
> > > if (TempChar != NULL) {
> > >
> > > Status = allocateRecordCsMemory (Cs, sizeof
> > > (RedfishCS_Type_JSON_Data), (void **)&CsTypeJson);
> > >
> > > if (Status != RedfishCS_status_success) {
> > >
> > > + free (TempChar);
> > >
> > > return Status;
> > >
> > > }
> > >
> > >
> > >
> > > Status = allocateRecordCsMemory (Cs, (RedfishCS_int)strlen (TempChar)
> +
> > > 1, (void **)&DumpStr);
> > >
> > > if (Status != RedfishCS_status_success) {
> > >
> > > + free (TempChar);
> > >
> > > return Status;
> > >
> > > }
> > >
> > >
> > >
> > > strncpy (DumpStr, TempChar, strlen (TempChar) + 1);
> > >
> > > + free (TempChar);
> > >
> > > +
> > >
> > > InitializeLinkHead (&CsTypeJson->Header.LinkEntry);
> > >
> > > CsTypeJson->Header.ResourceType = RedfishCS_Type_JSON;
> > >
> > > CsTypeJson->Header.ThisUri = ParentUri;
> > >
> > > @@ -1506,9 +1510,10 @@ RemoveUnchangeableProperties (
> > > Status = RedfishCS_status_insufficient_memory;
> > >
> > > } else {
> > >
> > > memcpy (NewJsonBuffer, TempChar, strlen (TempChar) + 1);
> > >
> > > - free (TempChar);
> > >
> > > Status = RedfishCS_status_success;
> > >
> > > }
> > >
> > > +
> > >
> > > + free (TempChar);
> > >
> > > } else {
> > >
> > > Status = RedfishCS_status_unknown_error;
> > >
> > > }
> > >
> > > --
> > > 2.32.0 (Apple Git-132)
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114786): https://edk2.groups.io/g/devel/message/114786
Mute This Topic: https://groups.io/mt/103988340/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-01-30 14:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-27 0:01 [edk2-devel] [edk2-redfish-client][PATCH 0/2] RedfishClientPkg: fix memory leak in ConverterLib Mike Maslenkin
2024-01-27 0:01 ` [edk2-devel] [edk2-redfish-client][PATCH 1/2] RedfishClientPkg: fix uninitialized variable build error Mike Maslenkin
2024-01-27 0:01 ` [edk2-devel] [edk2-redfish-client][PATCH 2/2] RedfishClientPkg: fix memory leak in ConverterLib Mike Maslenkin
2024-01-29 2:41 ` Chang, Abner via groups.io
2024-01-30 11:14 ` Mike Maslenkin
2024-01-30 14:06 ` Chang, Abner via groups.io [this message]
[not found] ` <17AF251A16C0A480.16647@groups.io>
2024-01-31 4:42 ` Chang, Abner via groups.io
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=LV8PR12MB9452A44A14FC3553570A0085EA7D2@LV8PR12MB9452.namprd12.prod.outlook.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