245f9b044a
Now there are some patches after 4.1-rc1 and include them in this time too. So we update to latest upstream version this time. Resolves: bz1556591 Signed-off-by: Xiao Ni <xni@redhat.com>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From 40659392ff90fc9c2861ec18c34ed1bdb54f92ca Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <jsorensen@fb.com>
|
|
Date: Wed, 30 May 2018 11:56:37 -0400
|
|
Subject: [RHEL7.5 PATCH 14/26] super-intel: Avoid gcc-8.1 complaining about
|
|
truncating snprintf()
|
|
|
|
We know the max size of the volume name, so no need to play the
|
|
snprintf() game.
|
|
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
super-intel.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index cc53f0f..520d292 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -9881,6 +9881,7 @@ static void imsm_process_update(struct supertype *st,
|
|
/* sanity check that we are not affecting the uuid of
|
|
* an active array
|
|
*/
|
|
+ memset(name, 0, sizeof(name));
|
|
snprintf(name, MAX_RAID_SERIAL_LEN, "%s", (char *) u->name);
|
|
name[MAX_RAID_SERIAL_LEN] = '\0';
|
|
for (a = st->arrays; a; a = a->next)
|
|
@@ -9892,7 +9893,7 @@ static void imsm_process_update(struct supertype *st,
|
|
break;
|
|
}
|
|
|
|
- snprintf((char *) dev->volume, MAX_RAID_SERIAL_LEN, "%s", name);
|
|
+ memcpy(dev->volume, name, MAX_RAID_SERIAL_LEN);
|
|
super->updates_pending++;
|
|
break;
|
|
}
|
|
--
|
|
2.7.4
|
|
|