From: Zhen Lei thunder.leizhen@huawei.com
stable inclusion from stable-v5.10.44 commit c9cb5837e92ee3052e0e46e3cd1eb1f7a903411d bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=451 CVE: NA
-------------------------------------------------
commit e8ba0b2b64126381643bb50df3556b139a60545a upstream.
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
Link: https://lkml.kernel.org/r/20210508034216.2277-1-thunder.leizhen@huawei.com
Fixes: a995e6bc0524 ("tools/bootconfig: Fix to check the write failure correctly") Reported-by: Hulk Robot hulkci@huawei.com Acked-by: Masami Hiramatsu mhiramat@kernel.org Signed-off-by: Zhen Lei thunder.leizhen@huawei.com Signed-off-by: Steven Rostedt (VMware) rostedt@goodmis.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Xiao zju_xhy@163.com --- tools/bootconfig/main.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c index 7362bef1a368..6cd6080cac04 100644 --- a/tools/bootconfig/main.c +++ b/tools/bootconfig/main.c @@ -399,6 +399,7 @@ static int apply_xbc(const char *path, const char *xbc_path) } /* TODO: Ensure the @path is initramfs/initrd image */ if (fstat(fd, &stat) < 0) { + ret = -errno; pr_err("Failed to get the size of %s\n", path); goto out; }