diff options
Diffstat (limited to 'meta-optee/recipes-security/optee/optee-test/regression-4011-correct-potential-overflow.patch')
-rw-r--r-- | meta-optee/recipes-security/optee/optee-test/regression-4011-correct-potential-overflow.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/meta-optee/recipes-security/optee/optee-test/regression-4011-correct-potential-overflow.patch b/meta-optee/recipes-security/optee/optee-test/regression-4011-correct-potential-overflow.patch deleted file mode 100644 index dfe33df5..00000000 --- a/meta-optee/recipes-security/optee/optee-test/regression-4011-correct-potential-overflow.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ee5e039664065e7df44118c0a25967c9e16ab5fa Mon Sep 17 00:00:00 2001 -From: Etienne Carriere <etienne.carriere@linaro.org> -Date: Fri, 21 Dec 2018 15:36:25 +0100 -Subject: [PATCH 1/2] regression 4011: correct potential overflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix issues reported by GCC 8.2.0. - -build/optee_test/host/xtest/regression_4000.c: In function ‘xtest_tee_test_4011’: -build/optee_test/host/xtest/regression_4000.c:5029:3: error: ‘memmove’ pointer overflow between offset [0, 8] and size [4294967295, 2147483647] accessing array ‘tmp’ with type ‘uint8_t[1024]’ {aka ‘unsigned char[1024]’} [-Werror=array-bounds] - memmove(tmp + n + i, tmp + m, tmp_size - m); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -build/optee_test/host/xtest/regression_4000.c:4927:10: note: array ‘tmp’ declared here - uint8_t tmp[1024]; - ^~~ -build/optee_test/host/xtest/regression_4000.c:5029:3: error: ‘memmove’ specified size 4294967295 exceeds maximum object size 2147483647 [-Werror=stringop-overflow=] - memmove(tmp + n + i, tmp + m, tmp_size - m); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors - -Reported-by: Simon Hughes <simon.hughes@arm.com> -Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> -Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> ---- - host/xtest/regression_4000.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/host/xtest/regression_4000.c b/host/xtest/regression_4000.c -index 380bdf4..08c814b 100644 ---- a/host/xtest/regression_4000.c -+++ b/host/xtest/regression_4000.c -@@ -5006,18 +5006,28 @@ static void xtest_tee_test_4011(ADBG_Case_t *c) - out, out_size, tmp, &tmp_size))) - goto out; - -+ if (!ADBG_EXPECT_COMPARE_UNSIGNED(c, tmp_size, <=, sizeof(tmp))) -+ goto out; -+ - /* 4.1 */ -- for (n = 0; n < tmp_size; n++) -+ for (n = 0; n < tmp_size - i; n++) - if (tmp[n] == 0xff) - break; -+ -+ /* Shall find at least a padding start before buffer end */ -+ if (!ADBG_EXPECT_COMPARE_UNSIGNED(c, n, <, tmp_size - i - 1)) -+ goto out; -+ - for (m = n + 1; m < tmp_size; m++) - if (tmp[m] != 0xff) - break; -+ - /* 4.2 */ - memmove(tmp + n + i, tmp + m, tmp_size - m); -+ - /* 4.3 */ -- for (n = n + tmp_size - m + i; n < tmp_size; n++) -- tmp[n] = 0; -+ n = n + i + tmp_size - m; -+ memset(tmp + n, 0, tmp_size - n); - - /* 5 */ - out_size = sizeof(out); --- -2.17.1 - |