|
 |
2c1b57 |
From 618f4e6d63c8c09d8d4002770e44617f3477f137 Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: Xiao Ni <xni@redhat.com>
|
|
|
2c1b57 |
Date: Sat, 18 Mar 2017 10:33:44 +0800
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 015/169] Replace snprintf with strncpy at some
|
|
|
2c1b57 |
places to avoid truncation
|
|
|
2c1b57 |
|
|
|
2c1b57 |
In gcc7 there are some building errors like:
|
|
|
2c1b57 |
directive output may be truncated writing up to 31 bytes into a region of size 24
|
|
|
2c1b57 |
snprintf(str, MPB_SIG_LEN, %s, mpb->sig);
|
|
|
2c1b57 |
|
|
|
2c1b57 |
It just need to copy one string to target. So use strncpy to replace it.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
For this line code: snprintf(str, MPB_SIG_LEN, %s, mpb->sig);
|
|
|
2c1b57 |
Because mpb->sig has the content of version after magic, so
|
|
|
2c1b57 |
it's better to use strncpy to replace snprintf too.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Signed-off-by: Xiao Ni <xni@redhat.com>
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
super-intel.c | 9 ++++++---
|
|
|
2c1b57 |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/super-intel.c b/super-intel.c
|
|
|
2c1b57 |
index d5e9517..343f20d 100644
|
|
|
2c1b57 |
--- a/super-intel.c
|
|
|
2c1b57 |
+++ b/super-intel.c
|
|
|
2c1b57 |
@@ -1811,7 +1811,8 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
|
|
|
2c1b57 |
__u32 reserved = imsm_reserved_sectors(super, super->disks);
|
|
|
2c1b57 |
struct dl *dl;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
- snprintf(str, MPB_SIG_LEN, "%s", mpb->sig);
|
|
|
2c1b57 |
+ strncpy(str, (char *)mpb->sig, MPB_SIG_LEN);
|
|
|
2c1b57 |
+ str[MPB_SIG_LEN-1] = '\0';
|
|
|
2c1b57 |
printf(" Magic : %s\n", str);
|
|
|
2c1b57 |
snprintf(str, strlen(MPB_VERSION_RAID0), "%s", get_imsm_version(mpb));
|
|
|
2c1b57 |
printf(" Version : %s\n", get_imsm_version(mpb));
|
|
|
2c1b57 |
@@ -7142,14 +7143,16 @@ static int update_subarray_imsm(struct supertype *st, char *subarray,
|
|
|
2c1b57 |
|
|
|
2c1b57 |
u->type = update_rename_array;
|
|
|
2c1b57 |
u->dev_idx = vol;
|
|
|
2c1b57 |
- snprintf((char *) u->name, MAX_RAID_SERIAL_LEN, "%s", name);
|
|
|
2c1b57 |
+ strncpy((char *) u->name, name, MAX_RAID_SERIAL_LEN);
|
|
|
2c1b57 |
+ u->name[MAX_RAID_SERIAL_LEN-1] = '\0';
|
|
|
2c1b57 |
append_metadata_update(st, u, sizeof(*u));
|
|
|
2c1b57 |
} else {
|
|
|
2c1b57 |
struct imsm_dev *dev;
|
|
|
2c1b57 |
int i;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
dev = get_imsm_dev(super, vol);
|
|
|
2c1b57 |
- snprintf((char *) dev->volume, MAX_RAID_SERIAL_LEN, "%s", name);
|
|
|
2c1b57 |
+ strncpy((char *) dev->volume, name, MAX_RAID_SERIAL_LEN);
|
|
|
2c1b57 |
+ dev->volume[MAX_RAID_SERIAL_LEN-1] = '\0';
|
|
|
2c1b57 |
for (i = 0; i < mpb->num_raid_devs; i++) {
|
|
|
2c1b57 |
dev = get_imsm_dev(super, i);
|
|
|
2c1b57 |
handle_missing(super, dev);
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|