PR https://github.com/tianocore/edk2/pull/4816 is created to merge this patch.
Thanks Liming > -----邮件原件----- > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Dandan Bi > 发送时间: 2023年9月8日 9:22 > 收件人: Mike Beaton <mjsbea...@gmail.com>; devel@edk2.groups.io > 抄送: Dong, Eric <eric.d...@intel.com>; Ard Biesheuvel <a...@kernel.org> > 主题: Re: [edk2-devel] [PATCH v5] MdeModulePkg/HiiDatabase: Fix incorrect > AllocateCopyPool size > > Reviewed-by: Dandan Bi <dandan...@intel.com> > > > Thanks, > Dandan > > -----Original Message----- > From: Mike Beaton <mjsbea...@gmail.com> > Sent: Thursday, September 7, 2023 11:35 AM > To: devel@edk2.groups.io > Cc: Dong, Eric <eric.d...@intel.com>; Bi, Dandan <dandan...@intel.com>; > Ard Biesheuvel <a...@kernel.org>; Mike Beaton <mjsbea...@gmail.com> > Subject: [PATCH v5] MdeModulePkg/HiiDatabase: Fix incorrect > AllocateCopyPool size > > The immediately preceding call, GetBestLanguage, plus the implementation of > HiiGetString, which is called immediately afterwards, make it clear that > BestLanguage is a null-terminated ASCII string, and not just a five byte, > non-null terminated buffer. > > Therefore AsciiStrLen is one byte too short, meaning that whether the space > allocated is really sufficient and whether the resultant string is really > null-terminated becomes implementation-dependent. Rather than switching > to AsciiStrSize, we use an explicitly compile-time string length calculation > (both compile-time and run-time approaches are currently used elsewhere in > the codebase for copying static strings). > > Signed-off-by: Mike Beaton <mjsbea...@gmail.com> > --- > MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c > b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c > index 96e05d4cf9..6e791783a6 100644 > --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c > +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c > @@ -1987,7 +1987,7 @@ GetNameFromId ( > NULL > ); > if (BestLanguage == NULL) { > - BestLanguage = AllocateCopyPool (AsciiStrLen ("en-US"), "en-US"); > + BestLanguage = AllocateCopyPool (sizeof ("en-US"), "en-US"); > ASSERT (BestLanguage != NULL); > } > > -- > 2.41.0 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108468): https://edk2.groups.io/g/devel/message/108468 Mute This Topic: https://groups.io/mt/101283979/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-