1 files changed, 2 insertions, 6 deletions
diff --git a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
index c3e4df2f82..b49a660eab 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, 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        
@@ -918,14 +918,10 @@ Returns:
     //
     // Check input parameters
     //
-    if (NumOfLba == 0) {
+    if (NumOfLba == 0 || (StartingLba + NumOfLba) > NumOfBlocks) {
       VA_END (args);
       return EFI_INVALID_PARAMETER;
     }
-
-    if ((StartingLba + NumOfLba) > NumOfBlocks) {
-      return EFI_INVALID_PARAMETER;
-    }
   } while (1);
 
   VA_END (args);