From: Karel Zak <kzak@redhat.com>
Date: Thu, 16 May 2019 11:56:34 +0000 (+0200)
Subject: blkid: improve strcpy() usage [coverity scan]
X-Git-Tag: v2.34-rc2~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa1b64da96d83e0da1000725f237127a18f01450;p=thirdparty%2Futil-linux.git

blkid: improve strcpy() usage [coverity scan]

The old deprecated list output format ("-o list") copies gettex string
into fixed buffer, that's really bad idea.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 2b13f71c0f..f2583d2b88 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -225,13 +225,18 @@ static void pretty_print_dev(blkid_dev dev)
 	mtpt[0] = 0;
 	retval = check_mount_point(devname, &mount_flags, mtpt, sizeof(mtpt));
 	if (retval == 0) {
+		const char *msg = NULL;
+
 		if (mount_flags & MF_MOUNTED) {
 			if (!mtpt[0])
-				strcpy(mtpt, _("(mounted, mtpt unknown)"));
+				msg = _("(mounted, mtpt unknown)");
 		} else if (mount_flags & MF_BUSY)
-			strcpy(mtpt, _("(in use)"));
+			msg = _("(in use)");
 		else
-			strcpy(mtpt, _("(not mounted)"));
+			msg = _("(not mounted)");
+
+		if (msg)
+			xstrncpy(mtpt, msg, sizeof(mtpt));
 	}
 
 	pretty_print_line(devname, fs_type, label, mtpt, uuid);