From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Oct 2017 12:59:16 +0000 (+0200)
Subject: libmount: make sure we call stat() propely [coverity scan]
X-Git-Tag: v2.31~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78c57214ade665eb692c3450b0d6e410e615147a;p=thirdparty%2Futil-linux.git

libmount: make sure we call stat() propely [coverity scan]

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

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 8ef8063146..c6a794d7e2 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -1534,13 +1534,13 @@ int mnt_context_get_mount_excode(
 			return MNT_EX_SUCCESS;
 		if (!buf)
 			break;
-		if (stat(src, &st))
+		if (src && stat(src, &st))
 			snprintf(buf, bufsz, _("%s is not a block device, and stat(2) fails?"), src);
-		else if (S_ISBLK(st.st_mode))
+		else if (src && S_ISBLK(st.st_mode))
 			snprintf(buf, bufsz,
 				_("the kernel does not recognize %s as a block device; "
 				  "maybe \"modprobe driver\" is necessary"), src);
-		else if (S_ISREG(st.st_mode))
+		else if (src && S_ISREG(st.st_mode))
 			snprintf(buf, bufsz, _("%s is not a block device; try \"-o loop\""), src);
 		else
 			snprintf(buf, bufsz, _("%s is not a block device"), src);
@@ -1580,7 +1580,8 @@ int mnt_context_get_mount_excode(
 
 	case EBADMSG:
 		/* Bad CRC for classic filesystems (e.g. extN or XFS) */
-		if (buf && (S_ISBLK(st.st_mode) || S_ISREG(st.st_mode))) {
+		if (buf && src && stat(src, &st) == 0
+		    && (S_ISBLK(st.st_mode) || S_ISREG(st.st_mode))) {
 			snprintf(buf, bufsz, _("cannot mount; probably corrupted filesystem on %s"), src);
 			break;
 		}