summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-06-22 11:44:12 +0800
committerJia Zhang <zhang.jia@linux.alibaba.com>2021-07-07 14:26:51 +0800
commit31502fb8f29eb99b0f6fc607877812fb850c0b06 (patch)
tree72355d8a1f3bcd206756040059ecfbb803a9425d
parent551137d4ebfd410a4995f705e70a85e4fa0192f4 (diff)
downloadmeta-secure-core-31502fb8f29eb99b0f6fc607877812fb850c0b06.tar.gz
sbsigntool: fix compile error when enable DEBUG_BUILD
Fixes the following errors when set DEBUG_BUILD = "1": fileio.c: In function ‘__fileio_read_file’: fileio.c:179:12: error: ‘len’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 179 | *out_len = len; | ~~~~~~~~~^~~~~ fileio.c:178:12: error: ‘buf’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 178 | *out_buf = buf; | ~~~~~~~~~^~~~~ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-rw-r--r--meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-fileio.c-initialize-local-variables-before-use-in-fu.patch43
-rw-r--r--meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb3
2 files changed, 44 insertions, 2 deletions
diff --git a/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-fileio.c-initialize-local-variables-before-use-in-fu.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-fileio.c-initialize-local-variables-before-use-in-fu.patch
new file mode 100644
index 0000000..634225a
--- /dev/null
+++ b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-fileio.c-initialize-local-variables-before-use-in-fu.patch
@@ -0,0 +1,43 @@
1From 8a2dfef2fbb68d72ee8b5a542cfb22817050ebdb Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 22 Jun 2021 11:20:17 +0800
4Subject: [PATCH] fileio.c: initialize local variables before use in function
5 __fileio_read_file
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Fixes:
11fileio.c: In function ‘__fileio_read_file’:
12fileio.c:179:26: error: ‘len’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
13 179 | *out_len = len;
14 | ~~~~~~~~~^~~~~
15fileio.c:178:26: error: ‘buf’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
16 178 | *out_buf = buf;
17 | ~~~~~~~~~^~~~~
18
19Upstream-Status: Pending
20
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
22---
23 src/fileio.c | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/src/fileio.c b/src/fileio.c
27index 032eb1e..929bb00 100644
28--- a/src/fileio.c
29+++ b/src/fileio.c
30@@ -142,8 +142,8 @@ static int __fileio_read_file(void *ctx, const char *filename,
31 uint8_t **out_buf, size_t *out_len, int flags)
32 {
33 struct stat statbuf;
34- uint8_t *buf;
35- size_t len;
36+ uint8_t *buf = NULL;
37+ size_t len = 0;
38 int fd, rc;
39
40 rc = -1;
41--
422.17.1
43
diff --git a/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb
index c38fa42..b742e08 100644
--- a/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb
+++ b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb
@@ -17,6 +17,7 @@ SRC_URI = " \
17 file://0002-docs-Don-t-build-man-pages.patch \ 17 file://0002-docs-Don-t-build-man-pages.patch \
18 file://0003-sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch \ 18 file://0003-sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch \
19 file://0001-src-Makefile.am-Add-read_write_all.c-to-common_SOURC.patch \ 19 file://0001-src-Makefile.am-Add-read_write_all.c-to-common_SOURC.patch \
20 file://0001-fileio.c-initialize-local-variables-before-use-in-fu.patch \
20" 21"
21SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826" 22SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826"
22SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5" 23SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5"
@@ -42,8 +43,6 @@ def efi_arch(d):
42# --with-libtool-sysroot \ 43# --with-libtool-sysroot \
43#" 44#"
44 45
45CFLAGS += "-Wno-error=maybe-uninitialized"
46
47HOST_EXTRACFLAGS += "\ 46HOST_EXTRACFLAGS += "\
48 INCLUDES+='-I${S}/lib/ccan.git/ \ 47 INCLUDES+='-I${S}/lib/ccan.git/ \
49 -I${STAGING_INCDIR_NATIVE}/efi \ 48 -I${STAGING_INCDIR_NATIVE}/efi \