]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tools/bootconfig: Fix apply_xbc() to return zero on success
authorSteven Rostedt (VMware) <rostedt@goodmis.org>
Fri, 8 May 2020 15:07:56 +0000 (11:07 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 May 2020 15:48:21 +0000 (17:48 +0200)
[ Upstream commit 9d82ccda2bc5c148060543d249d54f8703741bb4 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/bootconfig/main.c

index 5dbe893cf00cc9d19de362a4eb8780db94acc9e1..37fb2e85de12c0bca2a7b2eb19fb7fc8e2a1644f 100644 (file)
@@ -310,6 +310,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);