Re: [PATCH] tools/bootconfig: Fix apply_xbc() to return zero on success

[Masami Hiramatsu]

On Sat, 9 May 2020 08:14:24 +0900
Masami Hiramatsu <mhiramat@xxxxxxxxxx> wrote:

> On Fri, 8 May 2020 11:13:49 -0400
> Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
> 
> > From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>
> > 
> > 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: 20200508093059.GF9365@kadam">https://lore.kernel.org/r/20200508093059.GF9365@kadam
> > 
> 
> Thanks for fixing!
> 
> Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> 

Oh, and tested too.

---
...
test case 40 (samples/good-tree.bconf)... 
Apply samples/good-tree.bconf to ./initrd-tNhd
	Number of nodes: 16
	Size: 136 bytes
	Checksum: 9171
		[OK]

All tests passed
---

Tested-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>

BTW, I might better add a test summary to the test script (and move it
into kselftest?)

Thank you,

> 
> > Fixes: 8842604446d1 ("tools/bootconfig: Fix resource leak in apply_xbc()")
> > Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> > Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
> > ---
> >  tools/bootconfig/main.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > 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);
> > -- 
> > 2.20.1
> > 
> 
> 
> -- 
> Masami Hiramatsu <mhiramat@xxxxxxxxxx>


-- 
Masami Hiramatsu <mhiramat@xxxxxxxxxx>