X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLevel2CommandsLib%2FVol.c;h=4b6d2ea8e387ca3fb89f712c5f5cf55094e151ea;hb=1b354b080c7e70b56d5aaff811a7959f82d21f81;hp=8757ff1b302319990ee40ea463477b5cfdf2e596;hpb=e35b53179454119ba0d8591ccdfee9f0efe5fd77;p=mirror_edk2.git

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
index 8757ff1b30..4b6d2ea8e3 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for vol shell level 2 function.
 
-  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -30,7 +30,7 @@ EFIAPI
 HandleVol(
   IN CONST CHAR16  *Path,
   IN CONST BOOLEAN Delete,
-  IN CONST CHAR16  *Name
+  IN CONST CHAR16  *Name OPTIONAL
   )
 {
   EFI_STATUS            Status;
@@ -44,6 +44,29 @@ HandleVol(
 
   ShellStatus   = SHELL_SUCCESS;
 
+  if (
+      Name != NULL && (
+      StrStr(Name, L"%") != NULL ||
+      StrStr(Name, L"^") != NULL ||
+      StrStr(Name, L"*") != NULL ||
+      StrStr(Name, L"+") != NULL ||
+      StrStr(Name, L"=") != NULL ||
+      StrStr(Name, L"[") != NULL ||
+      StrStr(Name, L"]") != NULL ||
+      StrStr(Name, L"|") != NULL ||
+      StrStr(Name, L":") != NULL ||
+      StrStr(Name, L";") != NULL ||
+      StrStr(Name, L"\"") != NULL ||
+      StrStr(Name, L"<") != NULL ||
+      StrStr(Name, L">") != NULL ||
+      StrStr(Name, L"?") != NULL ||
+      StrStr(Name, L"/") != NULL ||
+      StrStr(Name, L" ") != NULL )
+      ){
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, Name);
+    return (SHELL_INVALID_PARAMETER);
+  }
+
   Status = gEfiShellProtocol->OpenFileByName(
     Path,
     &ShellFileHandle,
@@ -51,8 +74,7 @@ HandleVol(
 
   if (EFI_ERROR(Status) || ShellFileHandle == NULL) {
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, Path);
-    ShellStatus = SHELL_ACCESS_DENIED;
-    return (ShellStatus);
+    return (SHELL_ACCESS_DENIED);
   }
 
   //
@@ -76,8 +98,10 @@ HandleVol(
       SysInfo);
   }
 
+  ASSERT(SysInfo != NULL);
+
   if (Delete) {
-    StrCpy ((CHAR16 *) SysInfo->VolumeLabel, L"");
+    *((CHAR16 *) SysInfo->VolumeLabel) = CHAR_NULL;
     SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize(SysInfo->VolumeLabel);
     Status = EfiFpHandle->SetInfo(
       EfiFpHandle,
@@ -89,14 +113,20 @@ HandleVol(
     Size2 = StrSize(SysInfo->VolumeLabel);
     if (Size1 > Size2) {
       SysInfo = ReallocatePool((UINTN)SysInfo->Size, (UINTN)SysInfo->Size + Size1 - Size2, SysInfo);
+      if (SysInfo == NULL) {
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellLevel2HiiHandle);
+        ShellStatus = SHELL_OUT_OF_RESOURCES;
+      } 
+    }
+    if (SysInfo != NULL) {
+      StrnCpy ((CHAR16 *) SysInfo->VolumeLabel, Name, (Size1 > Size2?Size1/sizeof(CHAR16):Size2/sizeof(CHAR16))-1);
+      SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + Size1;
+      Status = EfiFpHandle->SetInfo(
+        EfiFpHandle,
+        &gEfiFileSystemInfoGuid,
+        (UINTN)SysInfo->Size,
+        SysInfo);
     }
-    StrCpy ((CHAR16 *) SysInfo->VolumeLabel, Name);
-    SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + Size1;
-    Status = EfiFpHandle->SetInfo(
-      EfiFpHandle,
-      &gEfiFileSystemInfoGuid,
-      (UINTN)SysInfo->Size,
-      SysInfo);
   }  
 
   FreePool(SysInfo);
@@ -127,23 +157,27 @@ HandleVol(
   }
 
   gEfiShellProtocol->CloseFile(ShellFileHandle);
+  
+  ASSERT(SysInfo != NULL);
 
-  //
-  // print VolumeInfo table
-  //
-  ShellPrintHiiEx (
-    0,
-    gST->ConOut->Mode->CursorRow,
-    NULL,
-    STRING_TOKEN (STR_VOL_VOLINFO),
-    gShellLevel2HiiHandle,
-    SysInfo->VolumeLabel,
-    SysInfo->ReadOnly?L"r":L"rw",
-    SysInfo->VolumeSize,
-    SysInfo->FreeSpace,
-    SysInfo->BlockSize
-   );
-  SHELL_FREE_NON_NULL(SysInfo);
+  if (SysInfo != NULL) {
+    //
+    // print VolumeInfo table
+    //
+    ShellPrintHiiEx (
+      0,
+      gST->ConOut->Mode->CursorRow,
+      NULL,
+      STRING_TOKEN (STR_VOL_VOLINFO),
+      gShellLevel2HiiHandle,
+      SysInfo->VolumeLabel,
+      SysInfo->ReadOnly?L"r":L"rw",
+      SysInfo->VolumeSize,
+      SysInfo->FreeSpace,
+      SysInfo->BlockSize
+     );
+    SHELL_FREE_NON_NULL(SysInfo);
+  }
 
   return (ShellStatus);
 }
@@ -177,6 +211,7 @@ ShellCommandRunVol (
   CHAR16        *FullPath;
   CHAR16        *TempSpot;
   UINTN         Length;
+  CONST CHAR16  *NewName;
 
   Length              = 0;
   ProblemParam        = NULL;
@@ -243,20 +278,21 @@ ShellCommandRunVol (
         StrnCatGrow(&FullPath, &Length, PathName, 0);
         StrnCatGrow(&FullPath, &Length, L":\\", 0);
         DeleteMode = ShellCommandLineGetFlag(Package, L"-d");
+        NewName    = ShellCommandLineGetValue(Package, L"-n");
         if (DeleteMode && ShellCommandLineGetFlag(Package, L"-n")) {
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle);
           ShellStatus = SHELL_INVALID_PARAMETER;
-        } else if (ShellCommandLineGetFlag(Package, L"-n") && ShellCommandLineGetValue(Package, L"-n") == NULL) {
+        } else if (ShellCommandLineGetFlag(Package, L"-n") && NewName == NULL) {
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"-n");
           ShellStatus = SHELL_INVALID_PARAMETER;
-        } else if (ShellCommandLineGetValue(Package, L"-n") != NULL && StrLen(ShellCommandLineGetValue(Package, L"-n")) > 11) {
+        } else if (NewName != NULL && StrLen(NewName) > 11) {
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"-n");
           ShellStatus = SHELL_INVALID_PARAMETER;
         } else if (ShellStatus == SHELL_SUCCESS) {
           ShellStatus = HandleVol(
             FullPath,
             DeleteMode,
-            ShellCommandLineGetValue(Package, L"-n")
+            NewName
            );
         }
       }