From: Karel Zak <kzak@redhat.com>
Date: Fri, 15 Apr 2016 12:48:29 +0000 (+0200)
Subject: libmount: make kernel_fs_postparse() more robust
X-Git-Tag: v2.29-rc1~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a772281dff903b9e761c4d8a6c2ecad7d5f944ba;p=thirdparty%2Futil-linux.git

libmount: make kernel_fs_postparse() more robust

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

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 264b8ca370..3f5e14abb1 100644
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -589,10 +589,12 @@ static int kernel_fs_postparse(struct libmnt_table *tb,
 		if (rc == 0 && real) {
 			DBG(TAB, ul_debugobj(tb, "canonical root FS: %s", real));
 			rc = __mnt_fs_set_source_ptr(fs, real);
+
+		} else if (rc == 1) {
+			/* mnt_guess_system_root() returns 1 if not able to conver to
+			 * the real devname; ignore this problem */
+			rc = 0;
 		}
-		/* mnt_guess_system_root() returns 1 if not able to conver to
-		 * the real devname; ignore this problem */
-		rc = 0;
 	}
 
 	return rc;