[PATCH v1] perf branch: Avoid incrementing NULL

Ian Rogers posted 1 patch 3 weeks, 4 days ago
tools/perf/util/branch.h | 3 +++
1 file changed, 3 insertions(+)
[PATCH v1] perf branch: Avoid incrementing NULL
Posted by Ian Rogers 3 weeks, 4 days ago
If the entry is NULL the value is meaningless so early return NULL to
avoid an increment of NULL. This was happening in calls from
has_stitched_lbr when running the "perf record LBR tests". The return
value isn't used in that case, so returning NULL as no effect.

Fixes: 42bbabed09ce ("perf tools: Add hw_idx in struct branch_stack")
Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/util/branch.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h
index 7429530fa774..a1d4736497c4 100644
--- a/tools/perf/util/branch.h
+++ b/tools/perf/util/branch.h
@@ -66,6 +66,9 @@ static inline struct branch_entry *perf_sample__branch_entries(struct perf_sampl
 {
 	u64 *entry = (u64 *)sample->branch_stack;
 
+	if (entry == NULL)
+		return NULL;
+
 	entry++;
 	if (sample->no_hw_idx)
 		return (struct branch_entry *)entry;
-- 
2.53.0.851.ga537e3e6e9-goog
Re: [PATCH v1] perf branch: Avoid incrementing NULL
Posted by Namhyung Kim 3 weeks, 2 days ago
On Thu, Mar 12, 2026 at 03:31:31PM -0700, Ian Rogers wrote:
> If the entry is NULL the value is meaningless so early return NULL to
> avoid an increment of NULL. This was happening in calls from
> has_stitched_lbr when running the "perf record LBR tests". The return
> value isn't used in that case, so returning NULL as no effect.
> 
> Fixes: 42bbabed09ce ("perf tools: Add hw_idx in struct branch_stack")
> Signed-off-by: Ian Rogers <irogers@google.com>

Applied to perf-tools-next, thanks!

Best regards,
Namhyung