summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-03-12 17:41:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-18 11:12:26 +0000
commit31f653278271fd6c6fbabcdcec168f627f6afdb5 (patch)
tree549822154000cbf69e52e527c2d2f441896b77dd /meta
parentbc853f87567bf977ab56e95aaa922fe194fdf990 (diff)
downloadpoky-31f653278271fd6c6fbabcdcec168f627f6afdb5.tar.gz
mdadm: fix gcc8 maybe-uninitialized/format-overflow warning
while compiled with -Werror=maybe-uninitialized/-Werror=format-overflow=, it failed [snip] | Incremental.c: In function 'Incremental_container': | Incremental.c:1593:3: error: 'mdfd' may be used uninitialized in this function [-Werror=maybe-uninitialized] | close(mdfd); | ^~~~~~~~~~~ [snip] super-intel.c: In function 'apply_takeover_update': | super-intel.c:9615:15: error: '%d' directive writing between 1 and 11 bytes into a region of size 7 [-Werror=format-overflow=] | " MISSING_%d", du->index); | ^~ (From OE-Core rev: 630281663893cdcfa9c4323b717b415d87d5510f) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch60
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb1
2 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch
new file mode 100644
index 0000000000..237f83a87e
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch
@@ -0,0 +1,60 @@
1From bf457a83834932ba06de3528b8779a023e73fa7b Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 12 Mar 2019 16:17:29 +0800
4Subject: [PATCH] mdadm: gcc8 maybe-uninitialized/format-overflow warning
5
6while compiled with -Werror=maybe-uninitialized/-Werror=format-overflow=,
7it failed
8
9[snip]
10| Incremental.c: In function 'Incremental_container':
11| Incremental.c:1593:3: error: 'mdfd' may be used uninitialized in this function [-Werror=maybe-uninitialized]
12| close(mdfd);
13| ^~~~~~~~~~~
14
15[snip]
16super-intel.c: In function 'apply_takeover_update':
17| super-intel.c:9615:15: error: '%d' directive writing between 1 and 11 bytes into a region of size 7 [-Werror=format-overflow=]
18| " MISSING_%d", du->index);
19| ^~
20
21Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/36]
22
23Signed-off-by: Changqing Li <changqing.li@windriver.com>
24---
25 Incremental.c | 2 +-
26 super-intel.c | 4 ++--
27 2 files changed, 3 insertions(+), 3 deletions(-)
28
29diff --git a/Incremental.c b/Incremental.c
30index a4ff7d4..b667868 100644
31--- a/Incremental.c
32+++ b/Incremental.c
33@@ -1500,7 +1500,7 @@ static int Incremental_container(struct supertype *st, char *devname,
34 return 0;
35 }
36 for (ra = list ; ra ; ra = ra->next) {
37- int mdfd;
38+ int mdfd = 0;
39 char chosen_name[1024];
40 struct map_ent *mp;
41 struct mddev_ident *match = NULL;
42diff --git a/super-intel.c b/super-intel.c
43index 10d7218..c3741ea 100644
44--- a/super-intel.c
45+++ b/super-intel.c
46@@ -9612,9 +9612,9 @@ static int apply_takeover_update(struct imsm_update_takeover *u,
47 du->major = 0;
48 du->index = (i * 2) + 1;
49 sprintf((char *)du->disk.serial,
50- " MISSING_%d", du->index);
51+ " MISSING_%hu", du->index);
52 sprintf((char *)du->serial,
53- "MISSING_%d", du->index);
54+ "MISSING_%hu", du->index);
55 du->next = super->missing;
56 super->missing = du;
57 }
58--
592.7.4
60
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 2d7ade68c5..d79c533f21 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -19,6 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
19 file://0001-fix-gcc-8-format-truncation-warning.patch \ 19 file://0001-fix-gcc-8-format-truncation-warning.patch \
20 file://mdadm.init \ 20 file://mdadm.init \
21 file://mdmonitor.service \ 21 file://mdmonitor.service \
22 file://0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch \
22 " 23 "
23SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" 24SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
24SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" 25SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"