File 0037-mdadm-check-value-returned-by-snprintf-aga... of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File 0037-mdadm-check-value-returned-by-snprintf-against-error.patch of Package mdadm (Revision f6325db75e5027e2a80cf7d231df7fe6)

Currently displaying revision f6325db75e5027e2a80cf7d231df7fe6 , Show latest

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

Places

File 0037-mdadm-check-value-returned-by-snprintf-against-error.patch of Package mdadm (Revision f6325db75e5027e2a80cf7d231df7fe6)

Places