From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Thu, 18 Jun 2015 02:21:57 +0000 (+0000)
Subject: MdePkg/DxeServicesLib: Return NULL GetFileBufferByFilePath reads directory
X-Git-Tag: edk2-stable201903~9613
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=93e8630a8debe1bd76c175370acf684bda69d558

MdePkg/DxeServicesLib: Return NULL GetFileBufferByFilePath reads directory

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17655 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
index ef7c9ba9b2..c8f0014d7a 100644
--- a/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
+++ b/MdePkg/Library/DxeServicesLib/DxeServicesLib.c
@@ -2,7 +2,7 @@
   MDE DXE Services Library provides functions that simplify the development of DXE Drivers.  
   These functions help access data from sections of FFS files or from file path.
 
-  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 2015, 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
@@ -796,18 +796,20 @@ GetFileBufferByFilePath (
           }
           
           if (!EFI_ERROR (Status) && (FileInfo != NULL)) {
-            //
-            // Allocate space for the file
-            //
-            ImageBuffer = AllocatePool ((UINTN)FileInfo->FileSize);
-            if (ImageBuffer == NULL) {
-              Status = EFI_OUT_OF_RESOURCES;
-            } else {
+            if ((FileInfo->Attribute & EFI_FILE_DIRECTORY) == 0) {
               //
-              // Read the file into the buffer we allocated
+              // Allocate space for the file
               //
-              ImageBufferSize = (UINTN)FileInfo->FileSize;
-              Status          = FileHandle->Read (FileHandle, &ImageBufferSize, ImageBuffer);
+              ImageBuffer = AllocatePool ((UINTN)FileInfo->FileSize);
+              if (ImageBuffer == NULL) {
+                Status = EFI_OUT_OF_RESOURCES;
+              } else {
+                //
+                // Read the file into the buffer we allocated
+                //
+                ImageBufferSize = (UINTN)FileInfo->FileSize;
+                Status          = FileHandle->Read (FileHandle, &ImageBufferSize, ImageBuffer);
+              }
             }
           }
         }