Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From bf457a83834932ba06de3528b8779a023e73fa7b Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 12 Mar 2019 16:17:29 +0800 |
| 4 | Subject: [PATCH] mdadm: gcc8 maybe-uninitialized/format-overflow warning |
| 5 | |
| 6 | while compiled with -Werror=maybe-uninitialized/-Werror=format-overflow=, |
| 7 | it 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] |
| 16 | super-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 | |
| 21 | Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/36] |
| 22 | |
| 23 | Signed-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 | |
| 29 | diff --git a/Incremental.c b/Incremental.c |
| 30 | index 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; |
| 42 | diff --git a/super-intel.c b/super-intel.c |
| 43 | index 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 | -- |
| 59 | 2.7.4 |
| 60 | |