Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1397649

Re: [PATCH perf/core v2 5/8] perf header: Make topology checkers to check return value of strbuf

Show all headers | View raw

On Thu, 5 May 2016 20:55:18 -0300
Arnaldo Carvalho de Melo <acme@kernel.org> wrote:

> Em Sat, Apr 30, 2016 at 12:10:33AM +0900, Masami Hiramatsu escreveu:
> > Make topology checkers to check the return value of strbuf
> > APIs so that it can detect errors in it.
> 
> >  	}
> > @@ -1907,7 +1910,7 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse
> >  	u32 nr, node, i;
> >  	char *str;
> >  	uint64_t mem_total, mem_free;
> > -	struct strbuf sb;
> > +	struct strbuf sb = STRBUF_INIT;
> 
> Since you're going to call strbuf_init() later, is the above really
> needed?

Actually, this is for strbuf_release() at the error path at the
end of this function.
----
error:
        strbuf_release(&sb);
        return -1;
}
----

So, without initializing sb, strbuf_release tries to release random
address in sb.buf.
Of course we can just return -1 for such cases and avoid initializing :)

>   
> >  	/* nr nodes */
> >  	ret = readn(fd, &nr, sizeof(nr));
> > @@ -1918,7 +1921,8 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse
> >  		nr = bswap_32(nr);
> >  
> >  	ph->env.nr_numa_nodes = nr;
> > -	strbuf_init(&sb, 256);
> > +	if (strbuf_init(&sb, 256) < 0)
> > +		goto error;
> >  


-- 
Masami Hiramatsu <mhiramat@kernel.org>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH perf/core v2 0/8] perf tools: Update strbuf to remove xrealloc Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:10 +0200
  [PATCH perf/core v2 2/8] perf probe: Check the return value of strbuf APIs Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 2/8] perf probe: Check the return value of  strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 01:50 +0200
      Re: [PATCH perf/core v2 2/8] perf probe: Check the return value of  strbuf APIs Masami Hiramatsu <mhiramat@kernel.org> - 2016-05-10 04:40 +0200
  [PATCH perf/core v2 5/8] perf header: Make topology checkers to check return value of strbuf Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 5/8] perf header: Make topology checkers to  check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 02:00 +0200
      Re: [PATCH perf/core v2 5/8] perf header: Make topology checkers to  check return value of strbuf Masami Hiramatsu <mhiramat@kernel.org> - 2016-05-10 05:00 +0200
  [PATCH perf/core v2 8/8] perf tools: Remove xrealloc and ALLOC_GROW Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 8/8] perf tools: Remove xrealloc and  ALLOC_GROW Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 02:00 +0200
  [PATCH perf/core v2 3/8] perf help: Make check_emacsclient_version to check strbuf APIs Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 3/8] perf help: Make  check_emacsclient_version to check strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 02:00 +0200
  [PATCH perf/core v2 4/8] perf: Make alias handler to check return value of strbuf Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 4/8] perf: Make alias handler to check  return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 02:00 +0200
  [PATCH perf/core v2 6/8] perf pmu: Make pmu_formats_string to check return value of strbuf Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 6/8] perf pmu: Make pmu_formats_string to  check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 02:00 +0200
  [PATCH perf/core v2 7/8] perf help: Do not use ALLOC_GROW in add_cmd_list Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 7/8] perf help: Do not use ALLOC_GROW in  add_cmd_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 02:00 +0200
  Re: [PATCH perf/core v2 0/8] perf tools: Update strbuf to remove  xrealloc Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:20 +0200
  [PATCH perf/core v2 1/8] perf: Rewrite strbuf not to die Masami Hiramatsu <mhiramat@kernel.org> - 2016-04-29 17:20 +0200
    Re: [PATCH perf/core v2 1/8] perf: Rewrite strbuf not to die Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 01:30 +0200
      Re: [PATCH perf/core v2 1/8] perf: Rewrite strbuf not to die Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-06 01:50 +0200
      Re: [PATCH perf/core v2 1/8] perf: Rewrite strbuf not to die Masami Hiramatsu <mhiramat@kernel.org> - 2016-05-10 03:10 +0200

csiph-web