summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorKarel Zak2019-05-16 13:56:34 +0200
committerKarel Zak2019-05-16 13:56:34 +0200
commitfa1b64da96d83e0da1000725f237127a18f01450 (patch)
tree72aaa8a2afa0db3a3df756c8dd411fc376fe1992 /misc-utils
parentutmpdump: check ftello() return value (diff)
downloadkernel-qcow2-util-linux-fa1b64da96d83e0da1000725f237127a18f01450.tar.gz
kernel-qcow2-util-linux-fa1b64da96d83e0da1000725f237127a18f01450.tar.xz
kernel-qcow2-util-linux-fa1b64da96d83e0da1000725f237127a18f01450.zip
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>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/blkid.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 2b13f71c0..f2583d2b8 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);