From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A2583FF8A0 for ; Wed, 20 May 2026 19:06:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779303993; cv=none; b=tS0qxr+I4aKzOgHgv8Q1uJxlcTZc67zeu71aa/ZdAwmwAe4XMt1ss+qYzFF4Y8PrqE0TBUNW+DyYpPSB0bIjC9HqXf/rcYJ+Qgk/bDFOsTmaIHRZFjio+4BrclOBtxQA7zp5rVKJh7VLIQ3fMPXRmF35F5NoJHv1SpmOzSMFE2s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779303993; c=relaxed/simple; bh=+0gdfy/AVYG5UC2nehDz4H+EDi+cTZFhZPNhz1XLddU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SwDeQl5OANuK8imVdsoZfBZQIvE35PPvDS9uYOacaBJMJBoMI61UPqzDgdQpjyiE+UppPaVDewgnFAzOmqQU8fWPxhVrTZhN05ngCnmhPRqVISXMO/hYWx5oUvl/2lWFxEnI3uCCUGR8lsEB2nzLXNFsoHBfbfTAXMUlJMPIXgc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ONX3mLRs; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ONX3mLRs" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-303b38ec2f6so7339254eec.0 for ; Wed, 20 May 2026 12:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779303991; x=1779908791; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NFymczVs1hMjDcX59Oa5tRS59UyGpjhJDS247h+StqQ=; b=ONX3mLRsEWxF8jdptaMUkXGCSd8bJP6anGvilRI8qkm6DFkM3fIImW9GvkkRXNpi5g KIWfkZ5ejX0/f8DQ4EWWrrFc/ojlMqfSnCCrczuco2c05jfdbyjIUaWXTu2YnQIl3GyB HcRzDVFyX047AMtSv6LjtVhx1OB8gceBmqJ8xjMubkUaYNMQ1cgkgK0SRg8h1b/uOSXn hBgQEHo4/teOwyxg87WyitVKlsNk0Vt13ZNd0Xt0JGG1AlklLwOkRjEdEoBbzbPtJEO1 szfrajEZXd73qn8U6ZRt9be1mAhRdQBW/E6VkjOq+Es57odnbhCU8qw5Gldm1pZmHwbB MQoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779303991; x=1779908791; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NFymczVs1hMjDcX59Oa5tRS59UyGpjhJDS247h+StqQ=; b=cvf80pYTkHZzqxB0qhmw7hJf8wde4h0SK7qdMLCmjMZp2QK6Sha/Odb9rIfuUJGUkA spP/rdQmRAPsOS0xEmC5uydZH0y4YVW2Xq2/ftJcRpFwucSi+5f/OKIJY7COBfb3EtTo aefye007f/bDmbPN8z8FNNGEdbHe87ikWg+o06rnKqZqmejTv+hl6FpvdMm/r6yM+YTn J4DaoLvlbib3X9Qkd4jHOm3K9wcxcpt+WIsMW/e+E/RIz/ZzKpnYKB0NYvBUTtF4MTJy A9f1AyPEQ/1gS48zS0h9GZwL+GD06FbuVbo7tVGrTIG9It/ZyFj5wUud1U4lJfIe+Dmy P4kw== X-Forwarded-Encrypted: i=1; AFNElJ84zzTwn5xtTJd+gHikK3GsDP5m27dptRIfiisO3J8fzUtSCSAlHPJISaeDErWNGA4lg8/nHN+9uCNVCEo=@vger.kernel.org X-Gm-Message-State: AOJu0YywXrf2pWFC12C0ScgyRViRykwZVo299SsWtwTFTehFw6KSHmPV WVuYTrxwG2X/7Ok4aZWJbNtC9brWcVJgb+gJRwyKQ1Gj+4Uash71Jk7Il22Q9eSEebigHPPj6g+ ke2RehTuSsA== X-Received: from dybmi9.prod.google.com ([2002:a05:7301:f89:b0:2f9:af7:5053]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:dc17:b0:2ed:e12:376c with SMTP id 5a478bee46e88-303986bbe04mr11583793eec.34.1779303990974; Wed, 20 May 2026 12:06:30 -0700 (PDT) Date: Wed, 20 May 2026 12:05:29 -0700 In-Reply-To: <20260520190538.142018-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512223001.2952848-1-irogers@google.com> <20260520190538.142018-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260520190538.142018-24-irogers@google.com> Subject: [PATCH v14 23/32] perf lock: Avoid segv if event is missing a callchain From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, ajones@ventanamicro.com, ak@linux.intel.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, anup@brainfault.org, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, blakejones@google.com, ctshao@google.com, dapeng1.mi@linux.intel.com, derek.foreman@collabora.com, dvyukov@google.com, howardchu95@gmail.com, hrishikesh123s@gmail.com, james.clark@linaro.org, jolsa@kernel.org, krzysztof.m.lopatowski@gmail.com, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux@treblig.org, mingo@redhat.com, nichen@iscas.ac.cn, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, ravi.bangoria@amd.com, swapnil.sapkal@amd.com, tanze@kylinos.cn, thomas.falcon@intel.com, tianyou.li@intel.com, yujie.liu@intel.com, zhouquan@iscas.ac.cn Content-Type: text/plain; charset="UTF-8" Avoid a potential segmentation fault if a parsed sample unexpectedly lacks a valid callchain pointer. Add a check for a NULL sample->callchain pointer in get_callstack(). If the callchain is missing, return NULL to safely skip the event and log a debug warning rather than causing a tool segfault. Signed-off-by: Ian Rogers Acked-by: Namhyung Kim --- tools/perf/builtin-lock.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 89a40d385b27..064b3aa4bad7 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -938,9 +938,16 @@ static u64 *get_callstack(struct perf_sample *sample, int max_stack) u64 i; int c; + if (!sample->callchain) { + pr_debug("Sample unexpectedly missing callchain\n"); + return NULL; + } + callstack = calloc(max_stack, sizeof(*callstack)); - if (callstack == NULL) + if (callstack == NULL) { + pr_debug("Failed to allocate callstack\n"); return NULL; + } for (i = 0, c = 0; i < sample->callchain->nr && c < max_stack; i++) { u64 ip = sample->callchain->ips[i]; @@ -1059,7 +1066,7 @@ static int report_lock_contention_begin_event(struct perf_sample *sample) if (needs_callstack()) { u64 *callstack = get_callstack(sample, max_stack_depth); if (callstack == NULL) - return -ENOMEM; + return 0; if (!match_callstack_filter(machine, callstack, max_stack_depth)) { free(callstack); -- 2.54.0.746.g67dd491aae-goog