diff options
| author | Raul E Rangel <rrangel@chromium.org> | 2022-08-19 13:45:39 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-19 22:11:09 +0000 |
| commit | 171ab28a4c9aab8cff8cf741384b2daf13d60431 (patch) | |
| tree | 6255f34763c6aa262b10c9bd6c97bd6fe122e162 /test | |
| parent | 722c3e2024bf23181c5366cf96b78e1586308cd8 (diff) | |
| download | chrome-ec-171ab28a4c9aab8cff8cf741384b2daf13d60431.tar.gz | |
8042: Add return code to read_cmd_byte
This return code will be used in a follow up CL to verify the length of
lpc_char_buf before reading the array. This will avoid reading a
possibly uninitialized queue entry.
BUG=b:242886255
BRANCH=none
TEST=run unit tests
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: I816cbb69e6743e74124f6b847aaa126d12499487
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3843089
Reviewed-by: Yuval Peress <peress@google.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/kb_8042.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/test/kb_8042.c b/test/kb_8042.c index 7db0655b6f..2da92432d8 100644 --- a/test/kb_8042.c +++ b/test/kb_8042.c @@ -125,13 +125,20 @@ static int _write_cmd_byte(uint8_t val) } #define WRITE_CMD_BYTE(val) TEST_EQ(_write_cmd_byte(val), EC_SUCCESS, "%d") -static uint8_t read_cmd_byte(void) +static int _read_cmd_byte(uint8_t *cmd) { lpc_char_cnt = 0; keyboard_host_write(I8042_READ_CMD_BYTE, 1); msleep(30); - return lpc_char_buf[0]; + *cmd = lpc_char_buf[0]; + return EC_SUCCESS; } +#define READ_CMD_BYTE(cmd_ptr) \ + ({ \ + uint8_t cmd; \ + TEST_EQ(_read_cmd_byte(&cmd), EC_SUCCESS, "%d"); \ + cmd; \ + }) static int __verify_lpc_char(char *arr, unsigned int sz, int delay_ms) { @@ -295,12 +302,12 @@ static int test_8042_aux_controller_commands(void) /* Send the AUX DISABLE command and verify the ctrl got updated */ i8042_write_cmd(I8042_DIS_MOUSE); - ctrl = read_cmd_byte(); + ctrl = READ_CMD_BYTE(); TEST_ASSERT(ctrl & I8042_AUX_DIS); /* Send the AUX ENABLE command and verify the ctrl got updated */ i8042_write_cmd(I8042_ENA_MOUSE); - ctrl = read_cmd_byte(); + ctrl = READ_CMD_BYTE(); TEST_ASSERT(!(ctrl & I8042_AUX_DIS)); return EC_SUCCESS; @@ -381,13 +388,13 @@ static int test_scancode_set2(void) { SET_SCANCODE(2); - WRITE_CMD_BYTE(read_cmd_byte() | I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() | I8042_XLATE); press_key(1, 1, 1); VERIFY_LPC_CHAR("\x01"); press_key(1, 1, 0); VERIFY_LPC_CHAR("\x81"); - WRITE_CMD_BYTE(read_cmd_byte() & ~I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() & ~I8042_XLATE); press_key(1, 1, 1); VERIFY_LPC_CHAR("\x76"); press_key(1, 1, 0); @@ -409,7 +416,7 @@ static int test_power_button(void) VERIFY_LPC_CHAR_DELAY("\xe0\xde", 100); SET_SCANCODE(2); - WRITE_CMD_BYTE(read_cmd_byte() & ~I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() & ~I8042_XLATE); gpio_set_level(GPIO_POWER_BUTTON_L, 0); VERIFY_LPC_CHAR_DELAY("\xe0\x37", 100); @@ -441,13 +448,13 @@ static int test_sysjump(void) static int test_sysjump_cont(void) { - WRITE_CMD_BYTE(read_cmd_byte() | I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() | I8042_XLATE); press_key(1, 1, 1); VERIFY_LPC_CHAR("\x01"); press_key(1, 1, 0); VERIFY_LPC_CHAR("\x81"); - WRITE_CMD_BYTE(read_cmd_byte() & ~I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() & ~I8042_XLATE); press_key(1, 1, 1); VERIFY_LPC_CHAR("\x76"); press_key(1, 1, 0); @@ -507,17 +514,17 @@ static int test_vivaldi_top_keys(void) SET_SCANCODE(2); /* Test REFRESH key */ - WRITE_CMD_BYTE(read_cmd_byte() | I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() | I8042_XLATE); press_key(2, 3, 1); /* Press T2 */ VERIFY_LPC_CHAR("\xe0\x67"); /* Check REFRESH scancode in set-1 */ /* Test SNAPSHOT key */ - WRITE_CMD_BYTE(read_cmd_byte() | I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() | I8042_XLATE); press_key(4, 3, 1); /* Press T2 */ VERIFY_LPC_CHAR("\xe0\x13"); /* Check SNAPSHOT scancode in set-1 */ /* Test VOL_UP key */ - WRITE_CMD_BYTE(read_cmd_byte() | I8042_XLATE); + WRITE_CMD_BYTE(READ_CMD_BYTE() | I8042_XLATE); press_key(5, 3, 1); /* Press T2 */ VERIFY_LPC_CHAR("\xe0\x30"); /* Check VOL_UP scancode in set-1 */ |