From: Rafał Miłecki <rafal@milecki.pl>
Date: Thu, 5 Sep 2019 21:07:21 +0000 (+0200)
Subject: system: fix uninitialized variables in firmware validation code
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0bcbbbf1abf76bf3aa8af5657308cac61f7de602;p=oweals%2Fprocd.git

system: fix uninitialized variables in firmware validation code

This fixes:
system.c: In function 'validate_firmware_image':
system.c:403:6: error: 'fd' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   if (fd >= 0) {
      ^
system.c:446:4: error: 'jsobj' may be used uninitialized in this function [-Werror=maybe-uninitialized]
    blobmsg_add_object(&b, jsobj);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes: e990e215e8a3 ("system: add "validate_firmware_image" ubus method")

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/system.c b/system.c
index 94bef1b..ad24a30 100644
--- a/system.c
+++ b/system.c
@@ -386,8 +386,8 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
 static int validate_firmware_image_call(const char *file)
 {
 	const char *path = "/usr/libexec/validate_firmware_image";
+	json_object *jsobj = NULL;
 	json_tokener *tok;
-	json_object *jsobj;
 	char buf[64];
 	ssize_t len;
 	int fds[2];
@@ -402,6 +402,7 @@ static int validate_firmware_image_call(const char *file)
 		return -errno;
 	case 0:
 		/* Set stdin & stderr to /dev/null */
+		fd = open("/dev/null", O_RDWR);
 		if (fd >= 0) {
 			dup2(fd, 0);
 			dup2(fd, 2);