summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2019-08-13 14:50:16 -0600
committerCommit Bot <commit-bot@chromium.org>2019-08-17 01:13:01 +0000
commit7cdd879fe9381015aa01be36c0937bac8690253e (patch)
tree75e14a8fcc1372b98c74fbeabd2b656bf7eb82fc
parent83b4473899bf00a0b5a241b96ebf9de913fd50e4 (diff)
downloadvboot-7cdd879fe9381015aa01be36c0937bac8690253e.tar.gz
tests: Add array bounds checkstabilize-kernelnext-broadwell-12434.B
Ensure that mock_keypresses_count is in bounds before accessing the mock_keyflags array. BUG=none TEST=make clean && make runtests BRANCH=none Change-Id: Ifa8fce5438f2e2547c9e316038466244eee7bfa9 Signed-off-by: Jacob Garber <jgarber1@ualberta.ca> Found-by: Coverity CID 198899 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1752048 Reviewed-by: Joel Kitching <kitching@chromium.org>
-rw-r--r--tests/vboot_api_kernel2_tests.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index 2469512e..49a4233a 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -157,7 +157,8 @@ uint32_t VbExKeyboardRead(void)
uint32_t VbExKeyboardReadWithFlags(uint32_t *key_flags)
{
if (mock_keypress_count < ARRAY_SIZE(mock_keypress)) {
- if (key_flags != NULL)
+ if (key_flags != NULL &&
+ mock_keypress_count < ARRAY_SIZE(mock_keyflags))
*key_flags = mock_keyflags[mock_keypress_count];
return mock_keypress[mock_keypress_count++];
} else