tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the issue that null pointer may be dereferenced at SourceLevelDebugPkg

Browse Source 
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
This commit is contained in:
erictian 2011-09-20 08:07:54 +00:00
parent 1e60a0ecfc
commit 83283ef1ce
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Debug Port Library implementation based on usb debug port. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 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); *Length = (UINT8)(MmioRead32((UINTN)&DebugPortRegister->ControlStatus) & 0xF);
ASSERT (*Length <= 8);
for (Index = 0; Index < *Length; Index++) { for (Index = 0; Index < *Length; Index++) {
Buffer[Index] = DebugPortRegister->DataBuffer[Index]; Buffer[Index] = DebugPortRegister->DataBuffer[Index];
} }
@ -402,6 +403,7 @@ UsbDebugPortControlTransfer (
{ {
RETURN_STATUS Status; RETURN_STATUS Status;
UINT8 Temp; UINT8 Temp;
UINT8 ReturnStatus[8];
// //
// Setup Phase // Setup Phase
@ -414,7 +416,7 @@ UsbDebugPortControlTransfer (
// //
// Data Phase // Data Phase
// //
if (SetupPacket->Length != 0) { if (DataLength != 0) {
if ((SetupPacket->RequestType & BIT7) != 0) { if ((SetupPacket->RequestType & BIT7) != 0) {
// //
// Get Data From Device // Get Data From Device
@ -446,7 +448,7 @@ UsbDebugPortControlTransfer (
// //
// For WRITE operation, Data Toggle in Status Phase Should be 1. // 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; return Status;
@ -641,11 +643,11 @@ InitializeUsbDebugHardware (
// //
return Status; return Status;
} }
ASSERT (Length == sizeof(USB_DEBUG_PORT_DESCRIPTOR));
// //
// set usb debug device address as 0x7F. // 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)) { if (RETURN_ERROR(Status)) {
// //
// The device can not work well. // The device can not work well.