Commit a761a2d8 authored by Alan Cox's avatar Alan Cox Committed by Arnaldo Carvalho de Melo

perf tools: Ensure sscanf does not overrun the "mem" field

Make the parsing robust.

(perf has some other assumptions that BUFSIZE <= MAX_PATH which are
 not touched here)

Reported-by: Jackie Chang
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-g2uoiwbrpiimb63rx32qv8ne@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8a398897
...@@ -930,7 +930,7 @@ static int write_topo_node(int fd, int node) ...@@ -930,7 +930,7 @@ static int write_topo_node(int fd, int node)
/* skip over invalid lines */ /* skip over invalid lines */
if (!strchr(buf, ':')) if (!strchr(buf, ':'))
continue; continue;
if (sscanf(buf, "%*s %*d %s %"PRIu64, field, &mem) != 2) if (sscanf(buf, "%*s %*d %31s %"PRIu64, field, &mem) != 2)
goto done; goto done;
if (!strcmp(field, "MemTotal:")) if (!strcmp(field, "MemTotal:"))
mem_total = mem; mem_total = mem;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment