From: Krzysztof Smolinski Date: Fri, 16 Aug 2019 09:06:17 +0000 (+0200) Subject: mdadm: check value returned by snprintf against errors X-Git-Tag: mdadm-4.2-rc1~98 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=fd5b09c9a9107f0393ce194c4aac6e7b8f163e85 mdadm: check value returned by snprintf against errors 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 Signed-off-by: Jes Sorensen --- diff --git a/sysfs.c b/sysfs.c index c3137818..2995713d 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)