1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From fd5b09c9a9107f0393ce194c4aac6e7b8f163e85 Mon Sep 17 00:00:00 2001
|
|
From: Krzysztof Smolinski <krzysztof.smolinski@intel.com>
|
|
Date: Fri, 16 Aug 2019 11:06:17 +0200
|
|
Subject: [PATCH] mdadm: check value returned by snprintf against errors
|
|
Git-commit: fd5b09c9a9107f0393ce194c4aac6e7b8f163e85
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
GCC 8 checks possible truncation during snprintf more strictly
|
|
than GCC 7 which result in compilation errors. To fix this
|
|
problem checking result of snprintf against errors has been added.
|
|
|
|
Signed-off-by: Krzysztof Smolinski <krzysztof.smolinski@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
sysfs.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sysfs.c b/sysfs.c
|
|
index c313781..2995713 100644
|
|
--- a/sysfs.c
|
|
+++ b/sysfs.c
|
|
@@ -1023,12 +1023,20 @@ int sysfs_rules_apply_check(const struct mdinfo *sra,
|
|
char dname[MAX_SYSFS_PATH_LEN];
|
|
char resolved_path[PATH_MAX];
|
|
char resolved_dir[PATH_MAX];
|
|
+ int result;
|
|
|
|
if (sra == NULL || ent == NULL)
|
|
return -1;
|
|
|
|
- snprintf(dname, MAX_SYSFS_PATH_LEN, "/sys/block/%s/md/", sra->sys_name);
|
|
- snprintf(fname, MAX_SYSFS_PATH_LEN, "%s/%s", dname, ent->name);
|
|
+ result = snprintf(dname, MAX_SYSFS_PATH_LEN,
|
|
+ "/sys/block/%s/md/", sra->sys_name);
|
|
+ if (result < 0 || result >= MAX_SYSFS_PATH_LEN)
|
|
+ return -1;
|
|
+
|
|
+ result = snprintf(fname, MAX_SYSFS_PATH_LEN,
|
|
+ "%s/%s", dname, ent->name);
|
|
+ if (result < 0 || result >= MAX_SYSFS_PATH_LEN)
|
|
+ return -1;
|
|
|
|
if (realpath(fname, resolved_path) == NULL ||
|
|
realpath(dname, resolved_dir) == NULL)
|
|
--
|
|
2.25.0
|
|
|