From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 24 Nov 2017 20:31:47 +0000 (+0100)
Subject: shared/dissect-image: fix return value for probe_filesystem()
X-Git-Tag: v236~81^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=995fa2e5e10f2eeff1aad1c5cb6f38480bc92af1;p=thirdparty%2Fsystemd.git

shared/dissect-image: fix return value for probe_filesystem()

blkid_new_probe_from_filename() sets errno, for example EPERM.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index a7679a14230..3c16f60b838 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -57,9 +57,10 @@ int probe_filesystem(const char *node, char **ret_fstype) {
         const char *fstype;
         int r;
 
+        errno = 0;
         b = blkid_new_probe_from_filename(node);
         if (!b)
-                return -ENOMEM;
+                return -errno ?: -ENOMEM;
 
         blkid_probe_enable_superblocks(b, 1);
         blkid_probe_set_superblocks_flags(b, BLKID_SUBLKS_TYPE);