From: Adrian Hunter <adrian.hunter@intel.com>
To: stable@vger.kernel.org
Subject: [PATCH 5.10 6/8] perf intel-pt: Fix next 'err' value, walking trace
Date: Mon, 13 Dec 2021 17:45:46 +0200 [thread overview]
Message-ID: <20211213154548.122728-7-adrian.hunter@intel.com> (raw)
In-Reply-To: <20211213154548.122728-1-adrian.hunter@intel.com>
commit a32e6c5da599dbf49e60622a4dfb5b9b40ece029 upstream.
Code after label 'next:' in intel_pt_walk_trace() assumes 'err' is zero,
but it may not be, if arrived at via a 'goto'. Ensure it is zero.
Fixes: 7c1b16ba0e26e6 ("perf intel-pt: Add support for decoding FUP/TIP only")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: stable@vger.kernel.org # v5.15+
Link: https://lore.kernel.org/r/20211210162303.2288710-6-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
[Adrian: Backport to v5.10]
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index 27a3c3eb48da..aaae2ef36f5d 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -2068,6 +2068,7 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)
if (err)
return err;
next:
+ err = 0;
if (decoder->cyc_threshold) {
if (decoder->sample_cyc && last_packet_type != INTEL_PT_CYC)
decoder->sample_cyc = false;
--
2.25.1
next prev parent reply other threads:[~2021-12-13 15:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 15:45 [PATCH 5.10 0/8] perf intel_pt: Fixes for v5.10 Adrian Hunter
2021-12-13 15:45 ` [PATCH 5.10 1/8] perf inject: Fix itrace space allowed for new attributes Adrian Hunter
2021-12-13 15:45 ` [PATCH 5.10 2/8] perf intel-pt: Fix some PGE (packet generation enable/control flow packets) usage Adrian Hunter
2021-12-13 15:45 ` [PATCH 5.10 3/8] perf intel-pt: Fix sync state when a PSB (synchronization) packet is found Adrian Hunter
2021-12-13 15:45 ` [PATCH 5.10 4/8] perf intel-pt: Fix intel_pt_fup_event() assumptions about setting state type Adrian Hunter
2021-12-13 15:45 ` [PATCH 5.10 5/8] perf intel-pt: Fix state setting when receiving overflow (OVF) packet Adrian Hunter
2021-12-13 15:45 ` Adrian Hunter [this message]
2021-12-13 15:45 ` [PATCH 5.10 7/8] perf intel-pt: Fix missing 'instruction' events with 'q' option Adrian Hunter
2021-12-13 15:45 ` [PATCH 5.10 8/8] perf intel-pt: Fix error timestamp setting on the decoder error path Adrian Hunter
2021-12-15 14:00 ` [PATCH 5.10 0/8] perf intel_pt: Fixes for v5.10 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211213154548.122728-7-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).