summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Griffin <peter.griffin@linaro.org>2020-01-10 16:20:11 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2020-01-14 23:04:44 -0300
commitd8f73dcbb538533f265fadb837c80d0170e0ce10 (patch)
tree9656657d4933449286be4f4593038afc88a72ce8
parentdd67d23dddb6fb50170edc541a844143d1dffc57 (diff)
downloadmeta-freescale-d8f73dcbb538533f265fadb837c80d0170e0ce10.tar.gz
optee-test_3.2.0.imx: remove no longer required gcc fixes
These are now present in the new op-tee fork version. Fixes: 020d818 Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
-rw-r--r--recipes-security/optee-imx/optee-test/0001-regression-4011-correct-potential-overflow.patch72
-rw-r--r--recipes-security/optee-imx/optee-test/0001-xtest-prevent-unexpected-build-warning-with-strncpy.patch66
-rw-r--r--recipes-security/optee-imx/optee-test_3.2.0.imx.bb2
3 files changed, 0 insertions, 140 deletions
diff --git a/recipes-security/optee-imx/optee-test/0001-regression-4011-correct-potential-overflow.patch b/recipes-security/optee-imx/optee-test/0001-regression-4011-correct-potential-overflow.patch
deleted file mode 100644
index 0d853ed0..00000000
--- a/recipes-security/optee-imx/optee-test/0001-regression-4011-correct-potential-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1Upstream-Status: Backport 3.4.0
2
3Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
4---
5From 0953bf0abb08fb98d24b7966001171a707fbb9b9 Mon Sep 17 00:00:00 2001
6From: Etienne Carriere <etienne.carriere@linaro.org>
7Date: Fri, 21 Dec 2018 15:36:25 +0100
8Subject: [PATCH] regression 4011: correct potential overflow
9MIME-Version: 1.0
10Content-Type: text/plain; charset=UTF-8
11Content-Transfer-Encoding: 8bit
12
13Fix issues reported by GCC 8.2.0.
14
15build/optee_test/host/xtest/regression_4000.c: In function ‘xtest_tee_test_4011’:
16build/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]
17 memmove(tmp + n + i, tmp + m, tmp_size - m);
18 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
19build/optee_test/host/xtest/regression_4000.c:4927:10: note: array ‘tmp’ declared here
20 uint8_t tmp[1024];
21 ^~~
22build/optee_test/host/xtest/regression_4000.c:5029:3: error: ‘memmove’ specified size 4294967295 exceeds maximum object size 2147483647 [-Werror=stringop-overflow=]
23 memmove(tmp + n + i, tmp + m, tmp_size - m);
24 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
25cc1: all warnings being treated as errors
26
27Reported-by: Simon Hughes <simon.hughes@arm.com>
28Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
29Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
30---
31 host/xtest/regression_4000.c | 16 +++++++++++++---
32 1 file changed, 13 insertions(+), 3 deletions(-)
33
34diff --git a/host/xtest/regression_4000.c b/host/xtest/regression_4000.c
35index 766aad2..205a226 100644
36--- a/host/xtest/regression_4000.c
37+++ b/host/xtest/regression_4000.c
38@@ -5018,18 +5018,28 @@ static void xtest_tee_test_4011(ADBG_Case_t *c)
39 out, out_size, tmp, &tmp_size)))
40 goto out;
41
42+ if (!ADBG_EXPECT_COMPARE_UNSIGNED(c, tmp_size, <=, sizeof(tmp)))
43+ goto out;
44+
45 /* 4.1 */
46- for (n = 0; n < tmp_size; n++)
47+ for (n = 0; n < tmp_size - i; n++)
48 if (tmp[n] == 0xff)
49 break;
50+
51+ /* Shall find at least a padding start before buffer end */
52+ if (!ADBG_EXPECT_COMPARE_UNSIGNED(c, n, <, tmp_size - i - 1))
53+ goto out;
54+
55 for (m = n + 1; m < tmp_size; m++)
56 if (tmp[m] != 0xff)
57 break;
58+
59 /* 4.2 */
60 memmove(tmp + n + i, tmp + m, tmp_size - m);
61+
62 /* 4.3 */
63- for (n = n + tmp_size - m + i; n < tmp_size; n++)
64- tmp[n] = 0;
65+ n = n + i + tmp_size - m;
66+ memset(tmp + n, 0, tmp_size - n);
67
68 /* 5 */
69 out_size = sizeof(out);
70--
712.7.4
72
diff --git a/recipes-security/optee-imx/optee-test/0001-xtest-prevent-unexpected-build-warning-with-strncpy.patch b/recipes-security/optee-imx/optee-test/0001-xtest-prevent-unexpected-build-warning-with-strncpy.patch
deleted file mode 100644
index 0c13dcfc..00000000
--- a/recipes-security/optee-imx/optee-test/0001-xtest-prevent-unexpected-build-warning-with-strncpy.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1Upstream-Status: Backport 3.4.0
2
3Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
4---
5From 493574ad1f4f56dd63097a652b87c25c507ce99c Mon Sep 17 00:00:00 2001
6From: Etienne Carriere <etienne.carriere@linaro.org>
7Date: Fri, 21 Dec 2018 15:36:00 +0100
8Subject: [PATCH] xtest: prevent unexpected build warning with strncpy
9MIME-Version: 1.0
10Content-Type: text/plain; charset=UTF-8
11Content-Transfer-Encoding: 8bit
12
13This change modifies adbg_run.c to prevent a false positive
14warning reported by GCC 8.2 on usage of strncpy():
15
16 build/optee_test/host/xtest/adbg/src/adbg_run.c: In function ‘Do_ADBG_AppendToSuite’:
17 build/optee_test/host/xtest/adbg/src/adbg_run.c:103:3: error: ‘strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
18 strncpy(p, Source_p->SuiteID_p, size);
19 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20 build/optee_test/host/xtest/adbg/src/adbg_run.c:88:9: note: length computed here
21 size = strlen(Source_p->SuiteID_p);
22 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
23 cc1: all warnings being treated as errors
24
25From [1]:
26 Using strncpy Safely
27 In general, it is not possible to avoid string truncation by strncpy
28 except by sizing the destination to be at least a byte larger than
29 the length of the source string. With that approach, however, using
30 strncpy becomes unnecessary and the function can be avoided in favor
31 of other APIs such as strcpy or (less preferably) memcpy. Much has
32 been written about the problems with strncpy and we recommend to
33 avoid it whenever possible. It is, however, worth keeping in mind
34 that unlike other standard string-handling functions, strncpy always
35 writes exactly as many characters as specified by the third argument;
36 if the source string is shorter, the function fills the remaining
37 bytes with NULs.
38
39This change prefers using a snprintf() as used in the alternate
40instruction block of the strncpy() call.
41
42[1] https://developers.redhat.com/blog/2018/05/24/detecting-string-truncation-with-gcc-8/
43
44Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
45Signed-off-by: Simon Hughes <simon.hughes@arm.com>
46Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
47---
48 host/xtest/adbg/src/adbg_run.c | 2 +-
49 1 file changed, 1 insertion(+), 1 deletion(-)
50
51diff --git a/host/xtest/adbg/src/adbg_run.c b/host/xtest/adbg/src/adbg_run.c
52index 406e429..2739db5 100644
53--- a/host/xtest/adbg/src/adbg_run.c
54+++ b/host/xtest/adbg/src/adbg_run.c
55@@ -100,7 +100,7 @@ int Do_ADBG_AppendToSuite(
56 snprintf(p, size, "%s+%s", Dest_p->SuiteID_p,
57 Source_p->SuiteID_p);
58 else
59- strncpy(p, Source_p->SuiteID_p, size);
60+ snprintf(p, size, "%s", Source_p->SuiteID_p);
61 free((void *)Dest_p->SuiteID_p);
62 Dest_p->SuiteID_p = p;
63
64--
652.7.4
66
diff --git a/recipes-security/optee-imx/optee-test_3.2.0.imx.bb b/recipes-security/optee-imx/optee-test_3.2.0.imx.bb
index c52e70a3..8b1c232e 100644
--- a/recipes-security/optee-imx/optee-test_3.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.2.0.imx.bb
@@ -15,8 +15,6 @@ SRCBRANCH = "imx_4.19.35_1.1.0"
15OPTEE_TEST_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https" 15OPTEE_TEST_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https"
16 16
17SRC_URI = "${OPTEE_TEST_SRC};branch=${SRCBRANCH} \ 17SRC_URI = "${OPTEE_TEST_SRC};branch=${SRCBRANCH} \
18 file://0001-regression-4011-correct-potential-overflow.patch \
19 file://0001-xtest-prevent-unexpected-build-warning-with-strncpy.patch \
20 file://0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch \ 18 file://0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch \
21 file://0004-build-ignore-declaration-after-statement-warnings.patch \ 19 file://0004-build-ignore-declaration-after-statement-warnings.patch \
22 file://0005-benchmark_1000-fix-compilation-against-musl-uint.patch \ 20 file://0005-benchmark_1000-fix-compilation-against-musl-uint.patch \