From 83283ef1ceaf9ca1372986c0a825c6aa261a61af Mon Sep 17 00:00:00 2001
From: erictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 20 Sep 2011 08:07:54 +0000
Subject: Fix the issue that null pointer may be dereferenced at
 SourceLevelDebugPkg

Signed-off-by: erictian
Reviewed-by: ydong10

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12389 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../DebugCommunicationLibUsb/DebugCommunicationLibUsb.c      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'SourceLevelDebugPkg')

diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
index 588e45853d..59189db0dc 100644
--- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
+++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
@@ -1,7 +1,7 @@
 /** @file
   Debug Port Library implementation based on usb debug port.
 
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2011, 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
@@ -285,6 +285,7 @@ UsbDebugPortIn (
   }
 
   *Length = (UINT8)(MmioRead32((UINTN)&DebugPortRegister->ControlStatus) & 0xF);
+  ASSERT (*Length <= 8);
   for (Index = 0; Index < *Length; Index++) {
     Buffer[Index] = DebugPortRegister->DataBuffer[Index];
   }
@@ -402,6 +403,7 @@ UsbDebugPortControlTransfer (
 {
   RETURN_STATUS          Status;
   UINT8                  Temp;
+  UINT8                  ReturnStatus[8];
 
   //
   // Setup Phase
@@ -414,7 +416,7 @@ UsbDebugPortControlTransfer (
   //
   // Data Phase
   //
-  if (SetupPacket->Length != 0) {
+  if (DataLength != 0) {
     if ((SetupPacket->RequestType & BIT7) != 0) {
       //
       // Get Data From Device
@@ -446,7 +448,7 @@ UsbDebugPortControlTransfer (
     //
     // For WRITE operation, Data Toggle in Status Phase Should be 1.
     //
-    Status = UsbDebugPortIn(DebugPortRegister, NULL, &Temp, INPUT_PID, Addr, Ep, 1);
+    Status = UsbDebugPortIn(DebugPortRegister, ReturnStatus, &Temp, INPUT_PID, Addr, Ep, 1);
   }
 
   return Status;
@@ -641,11 +643,11 @@ InitializeUsbDebugHardware (
     //
     return Status;
   }
-
+  ASSERT (Length == sizeof(USB_DEBUG_PORT_DESCRIPTOR));
   //
   // set usb debug device address as 0x7F.
   //
-  Status = UsbDebugPortControlTransfer (UsbDebugPortRegister, &mSetDebugAddress, 0x0, 0x0, (UINT8*)&UsbDebugPortDescriptor, &Length);
+  Status = UsbDebugPortControlTransfer (UsbDebugPortRegister, &mSetDebugAddress, 0x0, 0x0, NULL, NULL);
   if (RETURN_ERROR(Status)) {
     //
     // The device can not work well.
-- 
cgit v1.2.3