[PATCH] MdeModulePkg/SdDxe: Potential NULL pointer on Token

[PATCH] MdeModulePkg/SdDxe: Potential NULL pointer on Token

[GuoMinJ]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2286

Token pointer may be NULL, it is should be check before use it.

Signed-off-by: GuoMinJ <newexplorerj@gmail.com>
---
 MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
index 9f42abe7e2..25ab5abb2d 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
+++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
@@ -1367,7 +1367,12 @@ SdEraseBlocks (
     return Status;
   }
 
-  DEBUG ((EFI_D_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p with %r\n", Lba, BlockNum, Token->Event, Status));
+  DEBUG ((DEBUG_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x with %r, ", Lba, BlockNum, Status));
+  if ((Token != NULL) && (Token->Event != NULL)) {
+    DEBUG ((DEBUG_ERROR, "Event pointer is %p\n", Token->Event));
+  else {
+    DEBUG ((DEBUG_ERROR, "Event is meaningless\n"));
+  }
 
   return Status;
 }
-- 
2.17.1

Re: [edk2-devel] [PATCH] MdeModulePkg/SdDxe: Potential NULL pointer on Token

[Zhang, Shenglei]

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> GuoMinJ
> Sent: Saturday, February 22, 2020 1:25 PM
> To: devel@edk2.groups.io
> Cc: GuoMinJ <newexplorerj@gmail.com>
> Subject: [edk2-devel] [PATCH] MdeModulePkg/SdDxe: Potential NULL
> pointer on Token
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2286
> 
> Token pointer may be NULL, it is should be check before use it.
> 
> Signed-off-by: GuoMinJ <newexplorerj@gmail.com>
> ---
>  MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> index 9f42abe7e2..25ab5abb2d 100644
> --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> @@ -1367,7 +1367,12 @@ SdEraseBlocks (
>      return Status;
>    }
> 
> -  DEBUG ((EFI_D_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p
> with %r\n", Lba, BlockNum, Token->Event, Status));
> +  DEBUG ((DEBUG_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x with %r,
> ", Lba, BlockNum, Status));
> +  if ((Token != NULL) && (Token->Event != NULL)) {
> +    DEBUG ((DEBUG_ERROR, "Event pointer is %p\n", Token->Event));

I think a close brace is need here.

Thanks,
Shenglei

> +  else {
> +    DEBUG ((DEBUG_ERROR, "Event is meaningless\n"));
> +  }
> 
>    return Status;
>  }
> --
> 2.17.1
> 
> 
>