public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 5/7] perf intel-pt: Fix next 'err' value, walking trace
Date: Fri, 10 Dec 2021 18:23:01 +0200	[thread overview]
Message-ID: <20211210162303.2288710-6-adrian.hunter@intel.com> (raw)
In-Reply-To: <20211210162303.2288710-1-adrian.hunter@intel.com>

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")
Cc: stable@vger.kernel.org # v5.15+
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 845b0ca866a4..75b504aed7f4 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -2942,6 +2942,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


  parent reply	other threads:[~2021-12-10 16:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-10 16:22 [PATCH 0/7] perf intel-pt: Fixes Adrian Hunter
2021-12-10 16:22 ` [PATCH 1/7] perf intel-pt: Fix some PGE usage Adrian Hunter
2021-12-10 16:22 ` [PATCH 2/7] perf intel-pt: Fix sync state Adrian Hunter
2021-12-10 16:22 ` [PATCH 3/7] perf intel-pt: Fix intel_pt_fup_event() assumptions Adrian Hunter
2021-12-10 16:23 ` [PATCH 4/7] perf intel-pt: Fix overflow state Adrian Hunter
2021-12-10 16:23 ` Adrian Hunter [this message]
2021-12-10 16:23 ` [PATCH 6/7] perf intel-pt: Fix missing 'instruction' events with 'q' option Adrian Hunter
2021-12-10 16:23 ` [PATCH 7/7] perf intel-pt: Fix error timestamp Adrian Hunter
2021-12-10 18:40 ` [PATCH 0/7] perf intel-pt: Fixes Arnaldo Carvalho de Melo

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=20211210162303.2288710-6-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=acme@kernel.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@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