File 0028-Monitor-use-devname-as-char-array-instead-... of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File 0028-Monitor-use-devname-as-char-array-instead-of-pointer.patch of Package mdadm (Revision 1e9e1822f9b0ebc631287e432535cf6e)

Currently displaying revision 1e9e1822f9b0ebc631287e432535cf6e , Show latest

From c8d1c398505b62d9129a4e711f17e4469f4327ff Mon Sep 17 00:00:00 2001
From: Kinga Tanska <kinga.tanska@intel.com>
Date: Thu, 14 Jul 2022 09:02:10 +0200
Subject: [PATCH 29/61] Monitor: use devname as char array instead of pointer
Patch-mainline: mdadm-4.2+
References: jsc#PED-1009

Device name wasn't filled properly due to incorrect use of strcpy.
Strcpy was used twice. Firstly to fill devname with "/dev/md/"
and then to add chosen name. First strcpy result was overwritten by
second one (as a result <device_name> instead of "/dev/md/<device_name>"
was assigned). This commit changes this implementation to use snprintf
and devname with fixed size.

Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Signed-off-by: Coly Li <colyli@suse.de>
---
 Monitor.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Monitor.c b/Monitor.c
index 6ca1ebe..a5b11ae 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -190,9 +190,11 @@ int Monitor(struct mddev_dev *devlist,
 			if (mdlist->devname[0] == '/')
 				st->devname = xstrdup(mdlist->devname);
 			else {
-				st->devname = xmalloc(8+strlen(mdlist->devname)+1);
-				strcpy(strcpy(st->devname, "/dev/md/"),
-				       mdlist->devname);
+				/* length of "/dev/md/" + device name + terminating byte */
+				size_t _len = sizeof("/dev/md/") + strnlen(mdlist->devname, PATH_MAX);
+
+				st->devname = xcalloc(_len, sizeof(char));
+				snprintf(st->devname, _len, "/dev/md/%s", mdlist->devname);
 			}
 			if (!is_mddev(mdlist->devname))
 				return 1;
-- 
2.35.3

Places

File 0028-Monitor-use-devname-as-char-array-instead-of-pointer.patch of Package mdadm (Revision 1e9e1822f9b0ebc631287e432535cf6e)

Places