From nobody Sat Feb 7 06:14:11 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 9D76F1F16B for ; Sat, 8 Mar 2025 01:28:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741397341; cv=none; b=SeCTl9AzUZH14arPeKWoDWpcfztq2LuTbEJaogFf497BelWdhrdALJln6KbM7m8wNFvvJy3mPvozhxDWMuZyeSvmgpa7XnVzKc9MH5FwkW4bnzr1wYrL2J47j6OgOlW6rkswqif1qKgFsMH8VivdxB+wLioQChFGDHtUf2IPkeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741397341; c=relaxed/simple; bh=mjB7SHjMyD3+60oYpIH6M9GjPdL1jvipRXeQly6Vugs=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=aPUZexFqWAfUZse8X+wXyr8XfrP2L+ROazVy+I2B84PCUU1QNQKOOqfirkuInp8KWlsaX+EqhxWkq+f8/2zhMNeVcM5Gn4ANrLtgCtnwBBDhK9rRISRh4IoAAHtXwndB6TN+xHNRjNmUbqeSaoxwhYkTY2s9MS/Iw9nLtYqNjLE= 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=lE3zDUUb; arc=none smtp.client-ip=209.85.214.202 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="lE3zDUUb" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-225107fbdc7so4856915ad.0 for ; Fri, 07 Mar 2025 17:28:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741397338; x=1742002138; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=Pyj6AZWfv+qMjw7lV9Ur69GdqhGZug8FYcSTlsx6gAs=; b=lE3zDUUbVBgUTY4zRrokDWDcXjgAFAkIySLZgSV/8vdR6B47G56pUFOss9E43FxQAL /fRYNqjAC+eiaTQrymwcxCfS0DNnYDPuFFqSYd3Wcw/1XbdjyNb+2aLc+55eK42BeEkg NEog0xMzp7GIjtx45wNvHG+PsorPoFyQKGg70SYKq/ymN3KTMxSopIxwlj5ZWal93xeR UQIUXoXiJ0SXWQy4LDzEkmLvScIuN4+GM2jO/Lunza+jTSifbdmukm4h3ANr33MnajQ8 LTmRJEqzus+hN86K/gekqrXJENbrKgx4Tcl5SNhELIYHk/BXCnikTm23o4cgN549g8n2 0now== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741397338; x=1742002138; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Pyj6AZWfv+qMjw7lV9Ur69GdqhGZug8FYcSTlsx6gAs=; b=C5qbIJOJaUWV8Cjp12WM28TED/EDzS04rlfvRkhMnubGT6lujSrFoEkpWhCXIsRfGM iucvvE2n9zKrQLuAirnlzEFZj6DcAYulnSSbJvZwE0EMKjSikXN30+/RQFCv7AeDx/0T uPFoMcF5M3dMyA8ZaJ7w+nX/ODbljkFarI4S38LK1TeA5Pz+jTjQ/+yxdfD0pnmAckYf Hf5L4BOjP5XzM1lx7neH88hxoFV0P2ZAe2vokj1EknXCYK4hLy8yhDhwFMcuGRM7GEY4 Q+TmRRiRxHYH84VMedwpjNw9YyATIAAQYPgU3atmEz6zJN5FJvmoYez5qjnB16ypJ/PE XKSQ== X-Forwarded-Encrypted: i=1; AJvYcCUd2sb4jv0RMnYJ1tnNlL3Ieolk3vcM4N1vL++22y7Lc0+VBhM0092QPFBeeL+dP6CkVsAQL/4A+zzKRMQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyzVpmpAk772L3f/ohOfh7a6ABR0dn7nKTHlk3OJjDPXU2xfU1O Pc8QZAhydspvr3fwZOljHAlpLturWyFy7nE1bLrOxo1OGPevCCYUWeG8ESfYAVJI4KmtLRXEFmE 6/W/G+A== X-Google-Smtp-Source: AGHT+IED5QlnRA25ko42jmssPzmz+EG+3wQ5kfZuvC1JYesVp3sRrXdQE0TkZQTO7SQP7TEsytBQsJOVhHvM X-Received: from pjk14.prod.google.com ([2002:a17:90b:558e:b0:2fc:2c9c:880]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ec91:b0:223:5e54:c521 with SMTP id d9443c01a7336-22428407e93mr86368975ad.0.1741397337884; Fri, 07 Mar 2025 17:28:57 -0800 (PST) Date: Fri, 7 Mar 2025 17:28:53 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250308012853.1384762-1-irogers@google.com> Subject: [PATCH v2] perf mem: Don't leak mem event names From: Ian Rogers To: Kan Liang , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Leo Yan , Thomas Falcon , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When preparing the mem events for the argv copies are intentionally made. These copies are leaked and cause runs of perf using address sanitizer to fail. Rather than leak the memory allocate a chunk of memory for the mem event names upfront and build the strings in this - the storage is sized larger than the previous buffer size. The caller is then responsible for clearing up this memory. As part of this change, remove the mem_loads_name and mem_stores_name global buffers then change the perf_pmu__mem_events_name to write to an out argument buffer. Tested-by: Thomas Falcon Signed-off-by: Ian Rogers Reviewed-by: Leo Yan --- v2. Add return -ENOMEM suggested by Kan Liang. --- tools/perf/builtin-c2c.c | 4 ++- tools/perf/builtin-mem.c | 12 ++++--- tools/perf/util/mem-events.c | 67 +++++++++++++++++++++--------------- tools/perf/util/mem-events.h | 3 +- 4 files changed, 53 insertions(+), 33 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 15e1fce71c72..5d5bb0f32334 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -3239,6 +3239,7 @@ static int perf_c2c__record(int argc, const char **ar= gv) { int rec_argc, i =3D 0, j; const char **rec_argv; + char *event_name_storage =3D NULL; int ret; bool all_user =3D false, all_kernel =3D false; bool event_set =3D false; @@ -3300,7 +3301,7 @@ static int perf_c2c__record(int argc, const char **ar= gv) rec_argv[i++] =3D "--phys-data"; rec_argv[i++] =3D "--sample-cpu"; =20 - ret =3D perf_mem_events__record_args(rec_argv, &i); + ret =3D perf_mem_events__record_args(rec_argv, &i, &event_name_storage); if (ret) goto out; =20 @@ -3327,6 +3328,7 @@ static int perf_c2c__record(int argc, const char **ar= gv) =20 ret =3D cmd_record(i, rec_argv); out: + free(event_name_storage); free(rec_argv); return ret; } diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index 99d5e1491a28..5ec83cd85650 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -74,6 +74,7 @@ static int __cmd_record(int argc, const char **argv, stru= ct perf_mem *mem, int rec_argc, i =3D 0, j; int start, end; const char **rec_argv; + char *event_name_storage =3D NULL; int ret; struct perf_mem_event *e; struct perf_pmu *pmu; @@ -140,7 +141,7 @@ static int __cmd_record(int argc, const char **argv, st= ruct perf_mem *mem, rec_argv[i++] =3D "--data-page-size"; =20 start =3D i; - ret =3D perf_mem_events__record_args(rec_argv, &i); + ret =3D perf_mem_events__record_args(rec_argv, &i, &event_name_storage); if (ret) goto out; end =3D i; @@ -170,6 +171,7 @@ static int __cmd_record(int argc, const char **argv, st= ruct perf_mem *mem, =20 ret =3D cmd_record(i, rec_argv); out: + free(event_name_storage); free(rec_argv); return ret; } @@ -521,6 +523,7 @@ int cmd_mem(int argc, const char **argv) NULL, NULL }; + int ret; =20 argc =3D parse_options_subcommand(argc, argv, mem_options, mem_subcommand= s, mem_usage, PARSE_OPT_STOP_AT_NON_OPTION); @@ -536,14 +539,15 @@ int cmd_mem(int argc, const char **argv) } =20 if (strlen(argv[0]) > 2 && strstarts("record", argv[0])) - return __cmd_record(argc, argv, &mem, record_options); + ret =3D __cmd_record(argc, argv, &mem, record_options); else if (strlen(argv[0]) > 2 && strstarts("report", argv[0])) - return __cmd_report(argc, argv, &mem, report_options); + ret =3D __cmd_report(argc, argv, &mem, report_options); else usage_with_options(mem_usage, mem_options); =20 /* free usage string allocated by parse_options_subcommand */ free((void *)mem_usage[0]); + free(sort_order_help); =20 - return 0; + return ret; } diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 0277d3e1505c..9011784b950d 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -31,9 +31,6 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MA= X] =3D { =20 bool perf_mem_record[PERF_MEM_EVENTS__MAX] =3D { 0 }; =20 -static char mem_loads_name[100]; -static char mem_stores_name[100]; - struct perf_mem_event *perf_pmu__mem_events_ptr(struct perf_pmu *pmu, int = i) { if (i >=3D PERF_MEM_EVENTS__MAX || !pmu) @@ -81,7 +78,8 @@ int perf_pmu__mem_events_num_mem_pmus(struct perf_pmu *pm= u) return num; } =20 -static const char *perf_pmu__mem_events_name(int i, struct perf_pmu *pmu) +static const char *perf_pmu__mem_events_name(struct perf_pmu *pmu, int i, + char *buf, size_t buf_size) { struct perf_mem_event *e; =20 @@ -96,31 +94,31 @@ static const char *perf_pmu__mem_events_name(int i, str= uct perf_pmu *pmu) if (e->ldlat) { if (!e->aux_event) { /* ARM and Most of Intel */ - scnprintf(mem_loads_name, sizeof(mem_loads_name), + scnprintf(buf, buf_size, e->name, pmu->name, perf_mem_events__loads_ldlat); } else { /* Intel with mem-loads-aux event */ - scnprintf(mem_loads_name, sizeof(mem_loads_name), + scnprintf(buf, buf_size, e->name, pmu->name, pmu->name, perf_mem_events__loads_ldlat); } } else { if (!e->aux_event) { /* AMD and POWER */ - scnprintf(mem_loads_name, sizeof(mem_loads_name), + scnprintf(buf, buf_size, e->name, pmu->name); - } else + } else { return NULL; + } } - - return mem_loads_name; + return buf; } =20 if (i =3D=3D PERF_MEM_EVENTS__STORE) { - scnprintf(mem_stores_name, sizeof(mem_stores_name), + scnprintf(buf, buf_size, e->name, pmu->name); - return mem_stores_name; + return buf; } =20 return NULL; @@ -238,55 +236,69 @@ void perf_pmu__mem_events_list(struct perf_pmu *pmu) int j; =20 for (j =3D 0; j < PERF_MEM_EVENTS__MAX; j++) { + char buf[128]; struct perf_mem_event *e =3D perf_pmu__mem_events_ptr(pmu, j); =20 fprintf(stderr, "%-*s%-*s%s", e->tag ? 13 : 0, e->tag ? : "", e->tag && verbose > 0 ? 25 : 0, - e->tag && verbose > 0 ? perf_pmu__mem_events_name(j, pmu) : "", + e->tag && verbose > 0 + ? perf_pmu__mem_events_name(pmu, j, buf, sizeof(buf)) + : "", e->supported ? ": available\n" : ""); } } =20 -int perf_mem_events__record_args(const char **rec_argv, int *argv_nr) +int perf_mem_events__record_args(const char **rec_argv, int *argv_nr, char= **event_name_storage_out) { const char *mnt =3D sysfs__mount(); struct perf_pmu *pmu =3D NULL; - struct perf_mem_event *e; int i =3D *argv_nr; - const char *s; - char *copy; struct perf_cpu_map *cpu_map =3D NULL; - int ret; + size_t event_name_storage_size =3D + perf_pmu__mem_events_num_mem_pmus(NULL) * PERF_MEM_EVENTS__MAX * 128; + size_t event_name_storage_remaining =3D event_name_storage_size; + char *event_name_storage =3D malloc(event_name_storage_size); + char *event_name_storage_ptr =3D event_name_storage; + + if (!event_name_storage) + return -ENOMEM; =20 + *event_name_storage_out =3D NULL; while ((pmu =3D perf_pmus__scan_mem(pmu)) !=3D NULL) { for (int j =3D 0; j < PERF_MEM_EVENTS__MAX; j++) { - e =3D perf_pmu__mem_events_ptr(pmu, j); + const char *s; + struct perf_mem_event *e =3D perf_pmu__mem_events_ptr(pmu, j); + int ret; =20 if (!perf_mem_record[j]) continue; =20 if (!e->supported) { + char buf[128]; + pr_err("failed: event '%s' not supported\n", - perf_pmu__mem_events_name(j, pmu)); + perf_pmu__mem_events_name(pmu, j, buf, sizeof(buf))); + free(event_name_storage); return -1; } =20 - s =3D perf_pmu__mem_events_name(j, pmu); + s =3D perf_pmu__mem_events_name(pmu, j, event_name_storage_ptr, + event_name_storage_remaining); if (!s || !perf_pmu__mem_events_supported(mnt, pmu, e)) continue; =20 - copy =3D strdup(s); - if (!copy) - return -1; - rec_argv[i++] =3D "-e"; - rec_argv[i++] =3D copy; + rec_argv[i++] =3D event_name_storage_ptr; + event_name_storage_remaining -=3D strlen(event_name_storage_ptr) + 1; + event_name_storage_ptr +=3D strlen(event_name_storage_ptr) + 1; =20 ret =3D perf_cpu_map__merge(&cpu_map, pmu->cpus); - if (ret < 0) + if (ret < 0) { + free(event_name_storage); return ret; + } } } =20 @@ -301,6 +313,7 @@ int perf_mem_events__record_args(const char **rec_argv,= int *argv_nr) } =20 *argv_nr =3D i; + *event_name_storage_out =3D event_name_storage; return 0; } =20 diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index 8dc27db9fd52..a5c19d39ee37 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -38,7 +38,8 @@ int perf_pmu__mem_events_num_mem_pmus(struct perf_pmu *pm= u); bool is_mem_loads_aux_event(struct evsel *leader); =20 void perf_pmu__mem_events_list(struct perf_pmu *pmu); -int perf_mem_events__record_args(const char **rec_argv, int *argv_nr); +int perf_mem_events__record_args(const char **rec_argv, int *argv_nr, + char **event_name_storage_out); =20 int perf_mem__tlb_scnprintf(char *out, size_t sz, const struct mem_info *m= em_info); int perf_mem__lvl_scnprintf(char *out, size_t sz, const struct mem_info *m= em_info); --=20 2.49.0.rc0.332.g42c0ae87b1-goog