Skip to content

Commit

Permalink
optee-client: fix build with gcc 8.1
Browse files Browse the repository at this point in the history
Fix for GCC 8.1, as described at
OP-TEE/optee_client#126

Final fix to be provided via upstream and meta-linaro.

Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
  • Loading branch information
rsalveti committed Jun 27, 2018
1 parent ccffc82 commit c25f131
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
5 changes: 5 additions & 0 deletions recipes-security/optee/optee-client.bbappend
@@ -0,0 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

SRC_URI_append = " \
file://0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch \
"
@@ -0,0 +1,28 @@
From 30dd2986fb64aba7ee78d4e231c344e2c39d7999 Mon Sep 17 00:00:00 2001
From: Simon Hughes <simon.hughes@arm.com>
Date: Thu, 21 Jun 2018 17:22:23 +0100
Subject: [PATCH] Fix for teec_trace.c snprintf -Werror=format-truncation=
error.

Signed-off-by: Simon Hughes <simon.hughes@arm.com>
---
libteec/src/teec_trace.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libteec/src/teec_trace.c b/libteec/src/teec_trace.c
index 78b79d6..c91bc43 100644
--- a/libteec/src/teec_trace.c
+++ b/libteec/src/teec_trace.c
@@ -106,7 +106,8 @@ int _dprintf(const char *function, int flen, int line, int level,
*/
int thread_id = syscall(SYS_gettid); /* perf issue ? */

- snprintf(prefixed, MAX_PRINT_SIZE,
+ int len = 0;
+ len = snprintf(prefixed+len, MAX_PRINT_SIZE,
"%s [%d] %s:%s:%d: %s",
trace_level_strings[level], thread_id, prefix, func,
line, raw);
--
2.7.4

0 comments on commit c25f131

Please sign in to comment.