From: Karel Zak <kzak@redhat.com>
Date: Thu, 30 Mar 2017 10:10:01 +0000 (+0200)
Subject: zramctl: make mm_stat parser more robust
X-Git-Tag: v2.30-rc1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2546d54bd8b0ceac75d6d7e6c483479022d97509;p=thirdparty%2Futil-linux.git

zramctl: make mm_stat parser more robust

Let's fallback to attribute files if mm_stat file is incomplete. It
should not happen, but I have seen RHEL7 kernel where is no
num_migrated/pages_compacted attribute...

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

diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 29bdb85189..b5fc08edf2 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -359,8 +359,12 @@ static char *get_mm_stat(struct zram *z, size_t idx, int bytes)
 		str = sysfs_strdup(sysfs, "mm_stat");
 		if (str) {
 			z->mm_stat = strv_split(str, " ");
-			if (strv_length(z->mm_stat) < ARRAY_SIZE(mm_stat_names))
-				errx(EXIT_FAILURE, _("Failed to parse mm_stat"));
+
+			/* make sure kernel provides mm_stat as expected */
+			if (strv_length(z->mm_stat) < ARRAY_SIZE(mm_stat_names)) {
+				strv_free(z->mm_stat);
+				z->mm_stat = NULL;
+			}
 		}
 		z->mm_stat_probed = 1;
 		free(str);