* [PATCH v2] MdeModulePkg/SdDxe: Fix potential NULL pointer access
@ 2018-11-16 8:09 Jeff Brasen
2018-11-19 1:11 ` Wu, Hao A
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Brasen @ 2018-11-16 8:09 UTC (permalink / raw)
To: edk2-devel; +Cc: Jeff Brasen
SdReadWrite can be called with a NULL Token for synchronous operations.
Add guard for DEBUG print to only print event pointer with Token is not
NULL.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
index b8d115a..a4695ff 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
+++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
@@ -670,8 +670,9 @@ SdReadWrite (
if (EFI_ERROR (Status)) {
return Status;
}
- DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x Event %p with %r\n", IsRead ? "Read" : "Write", Lba, BlockNum, Token->Event, Status));
-
+ DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x Event %p with %r\n",
+ IsRead ? "Read" : "Write", Lba, BlockNum,
+ (Token != NULL) ? Token->Event : NULL, Status));
Lba += BlockNum;
Buffer = (UINT8*)Buffer + BufferSize;
Remaining -= BlockNum;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] MdeModulePkg/SdDxe: Fix potential NULL pointer access
2018-11-16 8:09 [PATCH v2] MdeModulePkg/SdDxe: Fix potential NULL pointer access Jeff Brasen
@ 2018-11-19 1:11 ` Wu, Hao A
0 siblings, 0 replies; 2+ messages in thread
From: Wu, Hao A @ 2018-11-19 1:11 UTC (permalink / raw)
To: Jeff Brasen, edk2-devel@lists.01.org
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Jeff
> Brasen
> Sent: Friday, November 16, 2018 4:10 PM
> To: edk2-devel@lists.01.org
> Cc: Jeff Brasen
> Subject: [edk2] [PATCH v2] MdeModulePkg/SdDxe: Fix potential NULL pointer
> access
>
> SdReadWrite can be called with a NULL Token for synchronous operations.
> Add guard for DEBUG print to only print event pointer with Token is not
> NULL.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
Thanks.
Reviewed-by: Hao Wu <hao.a.wu@intel.com> and pushed at
5a16ba3ae18e6528cb83039951e15a4b76004949
Best Regards,
Hao Wu
> ---
> MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> index b8d115a..a4695ff 100644
> --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
> @@ -670,8 +670,9 @@ SdReadWrite (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> - DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x Event %p with %r\n",
> IsRead ? "Read" : "Write", Lba, BlockNum, Token->Event, Status));
> -
> + DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x Event %p
> with %r\n",
> + IsRead ? "Read" : "Write", Lba, BlockNum,
> + (Token != NULL) ? Token->Event : NULL, Status));
> Lba += BlockNum;
> Buffer = (UINT8*)Buffer + BufferSize;
> Remaining -= BlockNum;
> --
> 2.7.4
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-19 1:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-16 8:09 [PATCH v2] MdeModulePkg/SdDxe: Fix potential NULL pointer access Jeff Brasen
2018-11-19 1:11 ` Wu, Hao A
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox