GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/lib/memchr-test: Fix possible memory overrun, add non-null checks 

Three calls to memchr() had incorrect length values which could lead to
memory overrun.
Add non-null checks to ensure correct return values from memchr()

Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Change-Id: Ief7b7e2ecb9b5d2e05e6983d92d02fa00935b392
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51054
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
This commit is contained in:
Jakub Czapiga 2021-02-24 12:12:22 +01:00 committed by Patrick Georgi
parent 7a18721cc7
commit 68220b5c42
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/lib/memchr-test.c
View File

@ -47,7 +47,7 @@ static void test_memchr_existing_value(void **state)
{ {
/* Test using character string */ /* Test using character string */
void *v1 = memchr(test_data1, 'A', test_data1_sz); void *v1 = memchr(test_data1, 'A', test_data1_sz);
void *v2 = memchr(test_data1 + 26, 'A', test_data1_sz - 10); void *v2 = memchr(test_data1 + 26, 'A', test_data1_sz - 26);
assert_non_null(v1); assert_non_null(v1);
assert_non_null(v2); assert_non_null(v2);
@ -67,13 +67,17 @@ static void test_memchr_existing_value(void **state)
static void test_memchr_last_character_in_string(void **state) static void test_memchr_last_character_in_string(void **state)
{ {
void *v1 = memchr(test_data1, '9', test_data1_sz); void *v1 = memchr(test_data1, '9', test_data1_sz);
void *v2 = memchr(&test_data1[test_data1_sz - 2], '9', test_data1_sz); void *v2 = memchr(&test_data1[test_data1_sz - 2], '9', 2);
void *v3 = memchr(test_data2, 0xff, test_data2_sz); void *v3 = memchr(test_data2, 0xff, test_data2_sz);
void *v4 = memchr(&test_data2[test_data2_sz - 1], 0xff, test_data2_sz); void *v4 = memchr(&test_data2[test_data2_sz - 1], 0xff, 1);
assert_non_null(v1);
assert_non_null(v2);
assert_ptr_equal(v1, v2); assert_ptr_equal(v1, v2);
assert_ptr_equal(v1, &test_data1[test_data1_sz - 2]); assert_ptr_equal(v1, &test_data1[test_data1_sz - 2]);
assert_non_null(v3);
assert_non_null(v4);
assert_ptr_equal(v3, v4); assert_ptr_equal(v3, v4);
assert_ptr_equal(v3, &test_data2[test_data2_sz - 1]); assert_ptr_equal(v3, &test_data2[test_data2_sz - 1]);
} }