1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string

Jeff Brasen posted 1 patch 3 years, 7 months ago
Failed in applying to current master (apply log)
.../Universal/HiiDatabaseDxe/ConfigRouting.c         | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
[edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
Posted by Jeff Brasen 3 years, 7 months ago 
Update function behavior to not modify the incoming string that is
marked as CONST in the prototype.

Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
 .../Universal/HiiDatabaseDxe/ConfigRouting.c         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 2cad6d29f4..d492b769d5 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -5497,7 +5497,6 @@ HiiBlockToConfig (
   UINTN                               Index;

   UINT8                               *TemBuffer;

   CHAR16                              *TemString;

-  CHAR16                              TemChar;

 

   TmpBuffer = NULL;

 

@@ -5564,10 +5563,13 @@ HiiBlockToConfig (
   //

   // Copy <ConfigHdr> and an additional '&' to <ConfigResp>

   //

-  TemChar = *StringPtr;

-  *StringPtr = '\0';

-  AppendToMultiString(Config, ConfigRequest);

-  *StringPtr = TemChar;

+  TemString = AllocateCopyPool (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);

+  if (TemString == NULL) {

+    return EFI_OUT_OF_RESOURCES;

+  }

+  TemString[StringPtr - ConfigRequest] = '\0';

+  AppendToMultiString(Config, TemString);

+  FreePool (TemString);

 

   //

   // Parse each <RequestElement> if exists

-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#65192): https://edk2.groups.io/g/devel/message/65192
Mute This Topic: https://groups.io/mt/76784317/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
Posted by Dandan Bi 3 years, 7 months ago 
Reviewed-by: Dandan Bi <dandan.bi@intel.com>


Thanks,
Dandan
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com>
> Sent: Saturday, September 12, 2020 1:09 AM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Jeff Brasen <jbrasen@nvidia.com>
> Subject: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
> 
> Update function behavior to not modify the incoming string that is marked as
> CONST in the prototype.
> 
> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
> ---
>  .../Universal/HiiDatabaseDxe/ConfigRouting.c         | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> index 2cad6d29f4..d492b769d5 100644
> --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> @@ -5497,7 +5497,6 @@ HiiBlockToConfig (
>    UINTN                               Index;   UINT8                               *TemBuffer;   CHAR16
> *TemString;-  CHAR16                              TemChar;    TmpBuffer = NULL; @@ -
> 5564,10 +5563,13 @@ HiiBlockToConfig (
>    //   // Copy <ConfigHdr> and an additional '&' to <ConfigResp>   //-
> TemChar = *StringPtr;-  *StringPtr = '\0';-  AppendToMultiString(Config,
> ConfigRequest);-  *StringPtr = TemChar;+  TemString = AllocateCopyPool
> (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);+  if
> (TemString == NULL) {+    return EFI_OUT_OF_RESOURCES;+  }+
> TemString[StringPtr - ConfigRequest] = '\0';+  AppendToMultiString(Config,
> TemString);+  FreePool (TemString);    //   // Parse each <RequestElement> if
> exists--
> 2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#65223): https://edk2.groups.io/g/devel/message/65223
Mute This Topic: https://groups.io/mt/76784317/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
Posted by Jeff Brasen 3 years, 7 months ago 
Thanks Dandan, are we waiting for any additional reviews on this change?


Thanks,

Jeff

________________________________
From: Bi, Dandan <dandan.bi@intel.com>
Sent: Monday, September 14, 2020 8:15 AM
To: Jeff Brasen <jbrasen@nvidia.com>; devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Dong, Eric <eric.dong@intel.com>
Subject: RE: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string

External email: Use caution opening links or attachments


Reviewed-by: Dandan Bi <dandan.bi@intel.com>


Thanks,
Dandan
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com>
> Sent: Saturday, September 12, 2020 1:09 AM
> To: devel@edk2.groups.io
> Cc: Bi, Dandan <dandan.bi@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Jeff Brasen <jbrasen@nvidia.com>
> Subject: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
>
> Update function behavior to not modify the incoming string that is marked as
> CONST in the prototype.
>
> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
> ---
>  .../Universal/HiiDatabaseDxe/ConfigRouting.c         | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> index 2cad6d29f4..d492b769d5 100644
> --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> @@ -5497,7 +5497,6 @@ HiiBlockToConfig (
>    UINTN                               Index;   UINT8                               *TemBuffer;   CHAR16
> *TemString;-  CHAR16                              TemChar;    TmpBuffer = NULL; @@ -
> 5564,10 +5563,13 @@ HiiBlockToConfig (
>    //   // Copy <ConfigHdr> and an additional '&' to <ConfigResp>   //-
> TemChar = *StringPtr;-  *StringPtr = '\0';-  AppendToMultiString(Config,
> ConfigRequest);-  *StringPtr = TemChar;+  TemString = AllocateCopyPool
> (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);+  if
> (TemString == NULL) {+    return EFI_OUT_OF_RESOURCES;+  }+
> TemString[StringPtr - ConfigRequest] = '\0';+  AppendToMultiString(Config,
> TemString);+  FreePool (TemString);    //   // Parse each <RequestElement> if
> exists--
> 2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#65474): https://edk2.groups.io/g/devel/message/65474
Mute This Topic: https://groups.io/mt/76784317/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
Posted by Jeff Brasen 3 years, 6 months ago 
Are we looking for any other reviews on this?

Thanks,
Jeff


From: Jeff Brasen <jbrasen@nvidia.com>
Sent: Tuesday, September 22, 2020 4:13 PM
To: Bi, Dandan <dandan.bi@intel.com>; devel@edk2.groups.io
Cc: Dong, Eric <eric.dong@intel.com>
Subject: Re: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string

Thanks Dandan, are we waiting for any additional reviews on this change?


Thanks,

Jeff

________________________________
From: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>
Sent: Monday, September 14, 2020 8:15 AM
To: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
Cc: Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>
Subject: RE: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string

External email: Use caution opening links or attachments


Reviewed-by: Dandan Bi <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>


Thanks,
Dandan
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> Sent: Saturday, September 12, 2020 1:09 AM
> To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> Cc: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>; Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>;
> Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> Subject: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
>
> Update function behavior to not modify the incoming string that is marked as
> CONST in the prototype.
>
> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> ---
>  .../Universal/HiiDatabaseDxe/ConfigRouting.c         | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> index 2cad6d29f4..d492b769d5 100644
> --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> @@ -5497,7 +5497,6 @@ HiiBlockToConfig (
>    UINTN                               Index;   UINT8                               *TemBuffer;   CHAR16
> *TemString;-  CHAR16                              TemChar;    TmpBuffer = NULL; @@ -
> 5564,10 +5563,13 @@ HiiBlockToConfig (
>    //   // Copy <ConfigHdr> and an additional '&' to <ConfigResp>   //-
> TemChar = *StringPtr;-  *StringPtr = '\0';-  AppendToMultiString(Config,
> ConfigRequest);-  *StringPtr = TemChar;+  TemString = AllocateCopyPool
> (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);+  if
> (TemString == NULL) {+    return EFI_OUT_OF_RESOURCES;+  }+
> TemString[StringPtr - ConfigRequest] = '\0';+  AppendToMultiString(Config,
> TemString);+  FreePool (TemString);    //   // Parse each <RequestElement> if
> exists--
> 2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#65900): https://edk2.groups.io/g/devel/message/65900
Mute This Topic: https://groups.io/mt/76784317/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
Posted by Wu, Hao A 3 years, 6 months ago 
Pushed via:
PR - https://github.com/tianocore/edk2/pull/987
Commit - c640186ec8aae6164123ee38de6409aed69eab12

Best Regards,
Hao Wu

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Jeff Brasen
Sent: Tuesday, October 6, 2020 5:27 AM
To: Bi, Dandan <dandan.bi@intel.com>; devel@edk2.groups.io
Cc: Dong, Eric <eric.dong@intel.com>
Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string

Are we looking for any other reviews on this?

Thanks,
Jeff


From: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
Sent: Tuesday, September 22, 2020 4:13 PM
To: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>
Cc: Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>
Subject: Re: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string

Thanks Dandan, are we waiting for any additional reviews on this change?


Thanks,

Jeff

________________________________
From: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>
Sent: Monday, September 14, 2020 8:15 AM
To: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
Cc: Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>
Subject: RE: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string

External email: Use caution opening links or attachments


Reviewed-by: Dandan Bi <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>


Thanks,
Dandan
> -----Original Message-----
> From: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> Sent: Saturday, September 12, 2020 1:09 AM
> To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> Cc: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>; Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>;
> Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> Subject: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
>
> Update function behavior to not modify the incoming string that is marked as
> CONST in the prototype.
>
> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
> ---
>  .../Universal/HiiDatabaseDxe/ConfigRouting.c         | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> index 2cad6d29f4..d492b769d5 100644
> --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
> @@ -5497,7 +5497,6 @@ HiiBlockToConfig (
>    UINTN                               Index;   UINT8                               *TemBuffer;   CHAR16
> *TemString;-  CHAR16                              TemChar;    TmpBuffer = NULL; @@ -
> 5564,10 +5563,13 @@ HiiBlockToConfig (
>    //   // Copy <ConfigHdr> and an additional '&' to <ConfigResp>   //-
> TemChar = *StringPtr;-  *StringPtr = '\0';-  AppendToMultiString(Config,
> ConfigRequest);-  *StringPtr = TemChar;+  TemString = AllocateCopyPool
> (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);+  if
> (TemString == NULL) {+    return EFI_OUT_OF_RESOURCES;+  }+
> TemString[StringPtr - ConfigRequest] = '\0';+  AppendToMultiString(Config,
> TemString);+  FreePool (TemString);    //   // Parse each <RequestElement> if
> exists--
> 2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#65961): https://edk2.groups.io/g/devel/message/65961
Mute This Topic: https://groups.io/mt/76784317/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
Posted by Laszlo Ersek 3 years, 6 months ago 
On 10/05/20 23:27, Jeff Brasen wrote:
> Are we looking for any other reviews on this?

I don't think so; Dandan is a designated reviewer for
"MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c".

The MdeModulePkg maintainers should merge this patch. (Dandan seems to
have no "M" access anywhere in edk2, so the PR needs to be submitted by
someone else.)

I could merge this myself, but I'm trying to make a point that
maintainership is a service to the community.

Thanks
Laszlo

> 
> Thanks,
> Jeff
> 
> 
> From: Jeff Brasen <jbrasen@nvidia.com>
> Sent: Tuesday, September 22, 2020 4:13 PM
> To: Bi, Dandan <dandan.bi@intel.com>; devel@edk2.groups.io
> Cc: Dong, Eric <eric.dong@intel.com>
> Subject: Re: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
> 
> Thanks Dandan, are we waiting for any additional reviews on this change?
> 
> 
> Thanks,
> 
> Jeff
> 
> ________________________________
> From: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>
> Sent: Monday, September 14, 2020 8:15 AM
> To: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
> Cc: Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>
> Subject: RE: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
> 
> External email: Use caution opening links or attachments
> 
> 
> Reviewed-by: Dandan Bi <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>
> 
> 
> Thanks,
> Dandan
>> -----Original Message-----
>> From: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
>> Sent: Saturday, September 12, 2020 1:09 AM
>> To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
>> Cc: Bi, Dandan <dandan.bi@intel.com<mailto:dandan.bi@intel.com>>; Dong, Eric <eric.dong@intel.com<mailto:eric.dong@intel.com>>;
>> Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
>> Subject: [PATCH] MdeModulePkg/HiiDatabase: Do not modify CONST string
>>
>> Update function behavior to not modify the incoming string that is marked as
>> CONST in the prototype.
>>
>> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com<mailto:jbrasen@nvidia.com>>
>> ---
>>  .../Universal/HiiDatabaseDxe/ConfigRouting.c         | 12 +++++++-----
>>  1 file changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
>> b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
>> index 2cad6d29f4..d492b769d5 100644
>> --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
>> +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
>> @@ -5497,7 +5497,6 @@ HiiBlockToConfig (
>>    UINTN                               Index;   UINT8                               *TemBuffer;   CHAR16
>> *TemString;-  CHAR16                              TemChar;    TmpBuffer = NULL; @@ -
>> 5564,10 +5563,13 @@ HiiBlockToConfig (
>>    //   // Copy <ConfigHdr> and an additional '&' to <ConfigResp>   //-
>> TemChar = *StringPtr;-  *StringPtr = '\0';-  AppendToMultiString(Config,
>> ConfigRequest);-  *StringPtr = TemChar;+  TemString = AllocateCopyPool
>> (sizeof (CHAR16) * (StringPtr - ConfigRequest + 1), ConfigRequest);+  if
>> (TemString == NULL) {+    return EFI_OUT_OF_RESOURCES;+  }+
>> TemString[StringPtr - ConfigRequest] = '\0';+  AppendToMultiString(Config,
>> TemString);+  FreePool (TemString);    //   // Parse each <RequestElement> if
>> exists--
>> 2.25.1
> 
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#65918): https://edk2.groups.io/g/devel/message/65918
Mute This Topic: https://groups.io/mt/76784317/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.