12090 loader.efi: efi_readkey_ex needs to check the key despite the s…

…hift status or toggle status

Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>

usr/src/boot/Makefile.version

@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2019.12.18.1
+BOOT_VERSION = $(LOADER_VERSION)-2019.12.18.2

usr/src/boot/sys/boot/efi/libefi/efi_console.c

@@ -674,11 +674,15 @@ efi_readkey_ex(EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *coninex)
 					kp->UnicodeChar++;
 				}
 			}
-			if (kp->ScanCode == 0 && kp->UnicodeChar == 0)
-				return (false);
-			keybuf_inschar(kp);
-			return (true);
 		}
+		/*
+		 * The shift state and/or toggle state may not be valid,
+		 * but we still can have ScanCode or UnicodeChar.
+		 */
+		if (kp->ScanCode == 0 && kp->UnicodeChar == 0)
+			return (false);
+		keybuf_inschar(kp);
+		return (true);
 	}
 	return (false);
 }