> -----Original Message----- > From: Zhang, Shenglei > Sent: Wednesday, October 30, 2019 9:46 PM > To: devel@edk2.groups.io > Cc: Bi, Dandan <dandan...@intel.com>; Dong, Eric <eric.d...@intel.com> > Subject: [PATCH v2] MdeModulePkg/HiiDatabaseDxe: Add check for 'Private- > >Attribute >> 4' > > The size of mHiiEfiColors is 16. > mHiiEfiColors[Private->Attribute >> 4] may be out of boundary. > So add a check for that. > > Cc: Dandan Bi <dandan...@intel.com> > Cc: Eric Dong <eric.d...@intel.com> > Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com> > --- > v2: Instead of returing value, we add ASSERT to ensure > "Private->Attribute >> 4" is not out of boundary. > > MdeModulePkg/Universal/HiiDatabaseDxe/Font.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c > b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c > index ca63df168c94..1eee5ec76bb0 100644 > --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c > +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c > @@ -999,6 +999,7 @@ GetSystemFont ( > } > > Info->ForegroundColor = mHiiEfiColors[Private->Attribute & 0x0f]; > + ASSERT ((Private->Attribute >> 4) < 16);
Hi Shenglei, 1) I think we can add ASSERT ((Private->Attribute >> 4) < 8); here directly, the reason can refer my comments in V1 patch. 2) And please also update the subject and commit message accordingly. With above comments addressed, Reviewed-by: Dandan Bi <dandan...@intel.com> Thanks, Dandan > Info->BackgroundColor = mHiiEfiColors[Private->Attribute >> 4]; > Info->FontInfoMask = EFI_FONT_INFO_SYS_FONT | > EFI_FONT_INFO_SYS_SIZE | EFI_FONT_INFO_SYS_STYLE; > Info->FontInfo.FontStyle = 0; > -- > 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49789): https://edk2.groups.io/g/devel/message/49789 Mute This Topic: https://groups.io/mt/39783598/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
