tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/UsbKbDxe: don't assert when the key read is invalid 

The GetKeyDescriptor() may return NULL when the KeyData is invalid.
For such case, we should go to error handling path rather than assert

Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Feng Tian 2016-04-01 16:37:53 +08:00
parent b5e44fbc15
commit 18b50d66d3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Helper functions for USB Keyboard Driver. Helper functions for USB Keyboard Driver.
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, 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
@ -1195,7 +1195,9 @@ KeyboardHandler (
// Handle repeat key // Handle repeat key
// //
KeyDescriptor = GetKeyDescriptor (UsbKeyboardDevice, CurKeyCodeBuffer[Index]); KeyDescriptor = GetKeyDescriptor (UsbKeyboardDevice, CurKeyCodeBuffer[Index]);
ASSERT (KeyDescriptor != NULL); if (KeyDescriptor == NULL) {
continue;
}
if (KeyDescriptor->Modifier == EFI_NUM_LOCK_MODIFIER || KeyDescriptor->Modifier == EFI_CAPS_LOCK_MODIFIER) { if (KeyDescriptor->Modifier == EFI_NUM_LOCK_MODIFIER || KeyDescriptor->Modifier == EFI_CAPS_LOCK_MODIFIER) {
// //
@ -1272,8 +1274,9 @@ USBParseKey (
Dequeue (&UsbKeyboardDevice->UsbKeyQueue, &UsbKey, sizeof (UsbKey)); Dequeue (&UsbKeyboardDevice->UsbKeyQueue, &UsbKey, sizeof (UsbKey));
KeyDescriptor = GetKeyDescriptor (UsbKeyboardDevice, UsbKey.KeyCode); KeyDescriptor = GetKeyDescriptor (UsbKeyboardDevice, UsbKey.KeyCode);
ASSERT (KeyDescriptor != NULL); if (KeyDescriptor == NULL) {
continue;
}
if (!UsbKey.Down) { if (!UsbKey.Down) {
// //
// Key is released. // Key is released.
@ -1513,7 +1516,9 @@ UsbKeyCodeToEfiInputKey (
// KeyCode must in the range of [0x4, 0x65] or [0xe0, 0xe7]. // KeyCode must in the range of [0x4, 0x65] or [0xe0, 0xe7].
// //
KeyDescriptor = GetKeyDescriptor (UsbKeyboardDevice, KeyCode); KeyDescriptor = GetKeyDescriptor (UsbKeyboardDevice, KeyCode);
ASSERT (KeyDescriptor != NULL); if (KeyDescriptor == NULL) {
return EFI_DEVICE_ERROR;
}
if (KeyDescriptor->Modifier == EFI_NS_KEY_MODIFIER) { if (KeyDescriptor->Modifier == EFI_NS_KEY_MODIFIER) {
// //