850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 618f4e6d63c8c09d8d4002770e44617f3477f137 Mon Sep 17 00:00:00 2001
|
|
From: Xiao Ni <xni@redhat.com>
|
|
Date: Sat, 18 Mar 2017 10:33:44 +0800
|
|
Subject: [PATCH] Replace snprintf with strncpy at some places to avoid
|
|
truncation
|
|
|
|
In gcc7 there are some building errors like:
|
|
directive output may be truncated writing up to 31 bytes into a region of size 24
|
|
snprintf(str, MPB_SIG_LEN, %s, mpb->sig);
|
|
|
|
It just need to copy one string to target. So use strncpy to replace it.
|
|
|
|
For this line code: snprintf(str, MPB_SIG_LEN, %s, mpb->sig);
|
|
Because mpb->sig has the content of version after magic, so
|
|
it's better to use strncpy to replace snprintf too.
|
|
|
|
Signed-off-by: Xiao Ni <xni@redhat.com>
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
super-intel.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index d5e9517..343f20d 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -1811,7 +1811,8 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
|
|
__u32 reserved = imsm_reserved_sectors(super, super->disks);
|
|
struct dl *dl;
|
|
|
|
- snprintf(str, MPB_SIG_LEN, "%s", mpb->sig);
|
|
+ strncpy(str, (char *)mpb->sig, MPB_SIG_LEN);
|
|
+ str[MPB_SIG_LEN-1] = '\0';
|
|
printf(" Magic : %s\n", str);
|
|
snprintf(str, strlen(MPB_VERSION_RAID0), "%s", get_imsm_version(mpb));
|
|
printf(" Version : %s\n", get_imsm_version(mpb));
|
|
@@ -7142,14 +7143,16 @@ static int update_subarray_imsm(struct supertype *st, char *subarray,
|
|
|
|
u->type = update_rename_array;
|
|
u->dev_idx = vol;
|
|
- snprintf((char *) u->name, MAX_RAID_SERIAL_LEN, "%s", name);
|
|
+ strncpy((char *) u->name, name, MAX_RAID_SERIAL_LEN);
|
|
+ u->name[MAX_RAID_SERIAL_LEN-1] = '\0';
|
|
append_metadata_update(st, u, sizeof(*u));
|
|
} else {
|
|
struct imsm_dev *dev;
|
|
int i;
|
|
|
|
dev = get_imsm_dev(super, vol);
|
|
- snprintf((char *) dev->volume, MAX_RAID_SERIAL_LEN, "%s", name);
|
|
+ strncpy((char *) dev->volume, name, MAX_RAID_SERIAL_LEN);
|
|
+ dev->volume[MAX_RAID_SERIAL_LEN-1] = '\0';
|
|
for (i = 0; i < mpb->num_raid_devs; i++) {
|
|
dev = get_imsm_dev(super, i);
|
|
handle_missing(super, dev);
|
|
--
|
|
2.10.2
|
|
|