From 630281663893cdcfa9c4323b717b415d87d5510f Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 12 Mar 2019 17:41:58 +0800 Subject: 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); | ^~ Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- ...maybe-uninitialized-format-overflow-warni.patch | 60 ++++++++++++++++++++++ meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch (limited to 'meta') 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 @@ +From bf457a83834932ba06de3528b8779a023e73fa7b Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 12 Mar 2019 16:17:29 +0800 +Subject: [PATCH] mdadm: 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); +| ^~ + +Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/36] + +Signed-off-by: Changqing Li +--- + Incremental.c | 2 +- + super-intel.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Incremental.c b/Incremental.c +index a4ff7d4..b667868 100644 +--- a/Incremental.c ++++ b/Incremental.c +@@ -1500,7 +1500,7 @@ static int Incremental_container(struct supertype *st, char *devname, + return 0; + } + for (ra = list ; ra ; ra = ra->next) { +- int mdfd; ++ int mdfd = 0; + char chosen_name[1024]; + struct map_ent *mp; + struct mddev_ident *match = NULL; +diff --git a/super-intel.c b/super-intel.c +index 10d7218..c3741ea 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -9612,9 +9612,9 @@ static int apply_takeover_update(struct imsm_update_takeover *u, + du->major = 0; + du->index = (i * 2) + 1; + sprintf((char *)du->disk.serial, +- " MISSING_%d", du->index); ++ " MISSING_%hu", du->index); + sprintf((char *)du->serial, +- "MISSING_%d", du->index); ++ "MISSING_%hu", du->index); + du->next = super->missing; + super->missing = du; + } +-- +2.7.4 + 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 \ file://0001-fix-gcc-8-format-truncation-warning.patch \ file://mdadm.init \ file://mdmonitor.service \ + file://0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch \ " SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" -- cgit 1.2.3-korg