From: Steven Rostedt (VMware) <rostedt@goodmis.org>
Date: Fri, 8 May 2020 15:07:56 +0000 (-0400)
Subject: tools/bootconfig: Fix apply_xbc() to return zero on success
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9d82ccda2bc5c148060543d249d54f8703741bb4;p=openwrt%2Fstaging%2Fblogic.git

tools/bootconfig: Fix apply_xbc() to return zero on success

The return of apply_xbc() returns the result of the last write() call, which
is not what is expected. It should only return zero on success.

Link: https://lore.kernel.org/r/20200508093059.GF9365@kadam

Fixes: 8842604446d1 ("tools/bootconfig: Fix resource leak in apply_xbc()")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Tested-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---

diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
index 001076c51712..0efaf45f7367 100644
--- a/tools/bootconfig/main.c
+++ b/tools/bootconfig/main.c
@@ -337,6 +337,7 @@ int apply_xbc(const char *path, const char *xbc_path)
 		pr_err("Failed to apply a boot config magic: %d\n", ret);
 		goto out;
 	}
+	ret = 0;
 out:
 	close(fd);
 	free(data);