From: Namhyung Kim <[email protected]> When setup_sorting() is called, 'str' is passed to strtok_r() but it's not checked to have a valid pointer. As strtok_r() accepts NULL pointer on a first argument and use the third argument in that case, it can cause a trouble since our third argument, tmp, is not initialized.
Cc: Stephane Eranian <[email protected]> Signed-off-by: Namhyung Kim <[email protected]> --- tools/perf/util/sort.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index c02964cabdd0..9f827e25a2b5 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -552,6 +552,11 @@ void setup_sorting(const char * const usagestr[], const struct option *opts) { char *tmp, *tok, *str = strdup(sort_order); + if (str == NULL) { + error("Not enough memory to setup sort keys"); + exit(-1); + } + for (tok = strtok_r(str, ", ", &tmp); tok; tok = strtok_r(NULL, ", ", &tmp)) { if (sort_dimension__add(tok) < 0) { -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
