[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-6760d77b708571b925e2dd2b61f847cbee6e0f21@git.kernel.org>
Date: Mon, 24 Oct 2016 12:01:38 -0700
From: tip-bot for Stefano Sanfilippo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: rmcilroy@...omium.org, linux-kernel@...r.kernel.org,
peterz@...radead.org, jolsa@...hat.com, tglx@...utronix.de,
eranian@...gle.com, mingo@...nel.org, namhyung@...nel.org,
anton@...abs.org, ssanfilippo@...omium.org, hpa@...or.com,
acme@...hat.com
Subject: [tip:perf/core] perf jit: Check JITHEADER_VERSION
Commit-ID: 6760d77b708571b925e2dd2b61f847cbee6e0f21
Gitweb: http://git.kernel.org/tip/6760d77b708571b925e2dd2b61f847cbee6e0f21
Author: Stefano Sanfilippo <ssanfilippo@...omium.org>
AuthorDate: Thu, 13 Oct 2016 03:59:42 -0700
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 24 Oct 2016 11:07:40 -0300
perf jit: Check JITHEADER_VERSION
Check the version number when opening a jitdump file. Accept older
versions, but not newer ones.
Signed-off-by: Stefano Sanfilippo <ssanfilippo@...omium.org>
Signed-off-by: Ross McIlroy <rmcilroy@...omium.org>
Reviewed-by: Stephane Eranian <eranian@...gle.com>
Cc: Anton Blanchard <anton@...abs.org>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/1476356383-30100-9-git-send-email-eranian@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/jitdump.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
index 6a2688d..c9a941e 100644
--- a/tools/perf/util/jitdump.c
+++ b/tools/perf/util/jitdump.c
@@ -180,6 +180,12 @@ jit_open(struct jit_buf_desc *jd, const char *name)
header.elf_mach,
jd->use_arch_timestamp);
+ if (header.version > JITHEADER_VERSION) {
+ pr_err("wrong jitdump version %u, expected " STR(JITHEADER_VERSION),
+ header.version);
+ goto error;
+ }
+
if (header.flags & JITDUMP_FLAGS_RESERVED) {
pr_err("jitdump file contains invalid or unsupported flags 0x%llx\n",
(unsigned long long)header.flags & JITDUMP_FLAGS_RESERVED);
Powered by blists - more mailing lists