From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 15 Aug 2021 10:52:20 +0000 (+0100)
Subject: system: fix issues reported by Coverity
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=040fecc1c14f812c0f8bdc3426366539ad88fe64;p=project%2Fprocd.git

system: fix issues reported by Coverity

Coverity CID: 1490346 Buffer not null terminated
Coverity CID: 1490345 Dereference null return value

Fixes: 9f233f5 ("system: make rootfs type accessible through board call")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/system.c b/system.c
index bd3f76c..c208e3e 100644
--- a/system.c
+++ b/system.c
@@ -60,6 +60,9 @@ static const char *system_rootfs_type(void) {
 		return fstype;
 
 	mounts = fopen(proc_mounts, "r");
+	if (!mounts)
+		return NULL;
+
 	while ((nread = getline(&mountstr, &len, mounts)) != -1) {
 		found = false;
 
@@ -101,8 +104,9 @@ static const char *system_rootfs_type(void) {
 	}
 
 	if (found)
-		strncpy(fstype, tmp, sizeof(fstype));
+		strncpy(fstype, tmp, sizeof(fstype) - 1);
 
+	fstype[sizeof(fstype) - 1]= '\0';
 	free(mountstr);
 	fclose(mounts);