Reviewed-by: Jaben Carsey <[email protected]> > -----Original Message----- > From: Ni, Ruiyu > Sent: Tuesday, August 07, 2018 2:14 AM > To: [email protected] > Cc: Carsey, Jaben <[email protected]>; Jim Dailey > <[email protected]> > Subject: [PATCH] ShellPkg/set: Fix EfiShellSetEnv to use case sensitive > compare > Importance: High > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=777 > > Per Shell spec, the environment variable has a case-sensitive name. > But today's implementation of EfiShellSetEnv() compares the > environment variable name case insensitively, which causes variable > like "CWD" cannot be set due to "cwd" is pre-defined variable. > > The patch fixes this issue. > > The EfiShellGetEnv() doesn't have such issue because it will > call into ShellFindEnvVarInList() which uses StrCmp(). > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni <[email protected]> > Cc: Jaben Carsey <[email protected]> > Cc: Jim Dailey <[email protected]> > --- > ShellPkg/Application/Shell/ShellProtocol.c | 39 > +++++++----------------------- > 1 file changed, 9 insertions(+), 30 deletions(-) > > diff --git a/ShellPkg/Application/Shell/ShellProtocol.c > b/ShellPkg/Application/Shell/ShellProtocol.c > index f2ca2029e3..767cbc99a0 100644 > --- a/ShellPkg/Application/Shell/ShellProtocol.c > +++ b/ShellPkg/Application/Shell/ShellProtocol.c > @@ -2924,36 +2924,15 @@ EfiShellSetEnv( > // > // Make sure we dont 'set' a predefined read only variable > // > - if (gUnicodeCollation->StriColl( > - gUnicodeCollation, > - (CHAR16*)Name, > - L"cwd") == 0 > - ||gUnicodeCollation->StriColl( > - gUnicodeCollation, > - (CHAR16*)Name, > - L"Lasterror") == 0 > - ||gUnicodeCollation->StriColl( > - gUnicodeCollation, > - (CHAR16*)Name, > - L"profiles") == 0 > - ||gUnicodeCollation->StriColl( > - gUnicodeCollation, > - (CHAR16*)Name, > - L"uefishellsupport") == 0 > - ||gUnicodeCollation->StriColl( > - gUnicodeCollation, > - (CHAR16*)Name, > - L"uefishellversion") == 0 > - ||gUnicodeCollation->StriColl( > - gUnicodeCollation, > - (CHAR16*)Name, > - L"uefiversion") == 0 > - ||(!ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest && > - gUnicodeCollation->StriColl( > - gUnicodeCollation, > - (CHAR16*)Name, > - (CHAR16*)mNoNestingEnvVarName) == 0) > - ){ > + if ((StrCmp (Name, L"cwd") == 0) || > + (StrCmp (Name, L"Lasterror") == 0) || > + (StrCmp (Name, L"profiles") == 0) || > + (StrCmp (Name, L"uefishellsupport") == 0) || > + (StrCmp (Name, L"uefishellversion") == 0) || > + (StrCmp (Name, L"uefiversion") == 0) || > + (!ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoNest && > + StrCmp (Name, mNoNestingEnvVarName) == 0) > + ) { > return (EFI_INVALID_PARAMETER); > } > return (InternalEfiShellSetEnv(Name, Value, Volatile)); > -- > 2.16.1.windows.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
