diff --git a/[refs] b/[refs]
index 1bad6074af12..56295dbddc06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 553099857702bb77e541c47bde47f6863834d2e2
+refs/heads/master: 5936f54d6ca2857d81188dcdff8c61b8fc482f53
diff --git a/trunk/tools/perf/util/sort.c b/trunk/tools/perf/util/sort.c
index d8b48827a17e..d41926cb9e3f 100644
--- a/trunk/tools/perf/util/sort.c
+++ b/trunk/tools/perf/util/sort.c
@@ -570,6 +570,11 @@ int setup_sorting(void)
 	char *tmp, *tok, *str = strdup(sort_order);
 	int ret = 0;
 
+	if (str == NULL) {
+		error("Not enough memory to setup sort keys");
+		return -ENOMEM;
+	}
+
 	for (tok = strtok_r(str, ", ", &tmp);
 			tok; tok = strtok_r(NULL, ", ", &tmp)) {
 		ret = sort_dimension__add(tok);