From 1a35dd723bbf9333a11f6397dac77f1a5dadd3c5 Mon Sep 17 00:00:00 2001
From: Chen A Chen <chen.a.chen@intel.com>
Date: Mon, 11 Feb 2019 14:07:29 +0800
Subject: MdeModulePkg/CapsuleApp: Fix potential NULL pointer dereference issue

To avoid potential NULL pointer dereference issue. Initialize them at
the beginning of the function. This patch is a supplement which was missed
at e98212cb5d59fff8f385d9179ad7f1a3ce9cf215 commit.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
---
 MdeModulePkg/Application/CapsuleApp/CapsuleDump.c  | 23 +++++++++++++---------
 .../Application/CapsuleApp/CapsuleOnDisk.c         |  5 ++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'MdeModulePkg')

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
index 7bef5a1378..ba2583accb 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
@@ -970,12 +970,15 @@ DumpProvisionedCapsule (
   EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Fs;
   EFI_SHELL_PROTOCOL              *ShellProtocol;
 
-  ShellProtocol = GetShellProtocol ();
-
   Index             = 0;
   CapsuleDataPtr64  = NULL;
   BootNext          = NULL;
-  ShellProtocol     = NULL;
+
+  ShellProtocol = GetShellProtocol ();
+  if (ShellProtocol == NULL) {
+    Print (L"Get Shell Protocol Fail\n");
+    return ;
+  }
 
   //
   // Dump capsule provisioned on Memory
@@ -1002,16 +1005,16 @@ DumpProvisionedCapsule (
               (VOID **) &CapsuleDataPtr64,
               NULL
               );
-    if (EFI_ERROR (Status)) {
+    if (EFI_ERROR (Status) || CapsuleDataPtr64 == NULL) {
       if (Index == 0) {
         Print (L"No data.\n");
       }
       break;
-    } else {
-      Index++;
-      Print (L"Capsule Description at 0x%08x\n", *CapsuleDataPtr64);
-      DumpBlockDescriptors ((EFI_CAPSULE_BLOCK_DESCRIPTOR*) (UINTN) *CapsuleDataPtr64, DumpCapsuleInfo);
     }
+
+    Index++;
+    Print (L"Capsule Description at 0x%08x\n", *CapsuleDataPtr64);
+    DumpBlockDescriptors ((EFI_CAPSULE_BLOCK_DESCRIPTOR*) (UINTN) *CapsuleDataPtr64, DumpCapsuleInfo);
   }
 
   //
@@ -1026,7 +1029,9 @@ DumpProvisionedCapsule (
              (VOID **) &BootNext,
              NULL
             );
-  if (!EFI_ERROR (Status)) {
+  if (EFI_ERROR (Status) || BootNext == NULL) {
+    Print (L"Get BootNext Variable Fail. Status = %r\n", Status);
+  } else {
     UnicodeSPrint (BootOptionName, sizeof (BootOptionName), L"Boot%04x", *BootNext);
     Status = EfiBootManagerVariableToLoadOption (BootOptionName, &BootNextOptionEntry);
     if (!EFI_ERROR (Status)) {
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
index 4faa863bca..f6e46cbdb1 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
@@ -445,7 +445,10 @@ GetUpdateFileSystem (
                (VOID **)&BootNextData,
                NULL
                );
-    if (!EFI_ERROR (Status)) {
+    if (EFI_ERROR (Status) || BootNextData == NULL) {
+      Print (L"Get Boot Next Data Fail. Status = %r\n", Status);
+      return EFI_NOT_FOUND;
+    } else {
       UnicodeSPrint (BootOptionName, sizeof (BootOptionName), L"Boot%04x", *BootNextData);
       Status = EfiBootManagerVariableToLoadOption (BootOptionName, &BootNextOption);
       if (!EFI_ERROR (Status)) {
-- 
cgit v1.2.3