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 063A2346FAB for ; Sat, 11 Apr 2026 06:58:29 +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=1775890711; cv=none; b=pTpstjTlvTZRsMvouczjavc5IBtZ2a0i3ULuSMck/FtmBYpKZYN1cD5ZmEqFot4UkSTzjNKq552MXXsxj2Wp45NWqwxESlmJxOk6tabcN+O+1gv6tR+0lLkcwsFn7AmfwyBgPf7aAIOCy/n4LRUj40f45U3l1JCNUAM4Eh3oAK4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775890711; c=relaxed/simple; bh=zfGZAJWU2BQFTm93lpWy1haXcjHKon5TrlP2h6xOQqw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cdsls/t/spg4wPEYseW42ekfoUnd7DJLo0eNkoxVTlFj7MTmw0ZcfbZJlS5W1+akfAxJS7fnyvl9NjQdrRSfo74QEJzexswwx7GkoaZK1DIcGN2hl3iZ/hBaS+XuBU5/EAjXU/SFr5Aa/aESxJ/ZpLQUnaUDdP6sW1Cj4SmXo54= 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=CosY0wav; 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="CosY0wav" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2cc75e79b97so10171764eec.1 for ; Fri, 10 Apr 2026 23:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775890709; x=1776495509; 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=knO6Q3Qzbr0DksWoyH2XRDyuHYQRjRm3FvEd91Er+34=; b=CosY0wav95yihd+U7GLatmQI1jDkK+7i2trjymhH3bvgj1XRr8Wo86H9apkvugPLge x15h6gLorzxxqWhkM6a9cpcVrRKPbEKgjGlvOHPc+KlFCELJA3y400pk0H0opE40bazA 00kcTwFUj3PBNiqi/+MRTyS5FXilhK+R/VXoXI5g1qy3Z2H9xhqRGxsgyiUaYq70RbwK daqiSMj99yn23JoXAqpXNtZ4Iuu7VRu4UfyGVTosYmerBTL12Zta1D/mas3w1MHOW+DS d+TyhU8pEqbyitMlV7kGW4sOU56Ac4NxVNGNo6t4E/o/GW+WYE9ilXhHZtCrsTpjLn1H Lphw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775890709; x=1776495509; 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=knO6Q3Qzbr0DksWoyH2XRDyuHYQRjRm3FvEd91Er+34=; b=U0zQNDH39DUXGIN4lqo/31uxmSR88KpRLwcHv3ANLRif8uNob1CfuLgTPTH8xMnpR7 CxzN1v6MOjxUGTHcYXfWGj9sGKyYkDAsP3Cbp5SfcyGBqB6Tki2PZT8hqnJXxeuF0IIi 208RqPuky3FaVStk0szKgImhev888sNTgcxa8WXTjTECQIcPdXMJpF0dQzeySOVsUTMc uZ9HV4TEWbZ3IHOOBbfa6PdSSSLRH6P6+HH5S428TAng996tQN/WMnp3E3Mh9m18XNwq t+JP2PzByVr3MjrkErL3/y40ZMnnkfiCnOnh8/QsfEBb33UJ6fy24236xaQ0PRSoq22s kF2Q== X-Forwarded-Encrypted: i=1; AJvYcCV9CD1xfBOclD9H7K+unxORz1R0y4ct8smrgv69G+rB8Y25CIDpAjSUCnHu2mbCPGsnquImI0Oj2A3x//Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxgOWm1fHmrdU9eRu+lAKCMsHL0BW6Be76gJ3mVU4iHE5ZtQQw1 mQE8RDtNg5GXYxhYoiGYCw7Q+/+6+Ff7eFWA7DgpEBToJkgoVkSfSkQiKrN56xzzalFhrH4XG4S T/EMHy3+Fjg== X-Received: from dyr17.prod.google.com ([2002:a05:693c:4011:b0:2d2:de31:8da0]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:220d:b0:2c5:ed1b:c8a with SMTP id 5a478bee46e88-2d5871bcb9emr3846515eec.5.1775890708904; Fri, 10 Apr 2026 23:58:28 -0700 (PDT) Date: Fri, 10 Apr 2026 23:57:17 -0700 In-Reply-To: <20260411065718.372240-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: <20260408072601.210837-1-irogers@google.com> <20260411065718.372240-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260411065718.372240-29-irogers@google.com> Subject: [PATCH v8 28/29] perf kwork: Fix address sanitizer issues From: Ian Rogers To: namhyung@kernel.org Cc: irogers@google.com, acme@kernel.org, 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" There is a double free in the record array due to how parse_options will mutate the array. Fix by keeping an array that isn't mutated. Ensure kwork_usage is freed on all paths. Signed-off-by: Ian Rogers --- tools/perf/builtin-kwork.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index ab17d3198b93..8430a79a02ba 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -2258,7 +2258,7 @@ static void setup_event_list(struct perf_kwork *kwork, static int perf_kwork__record(struct perf_kwork *kwork, int argc, const char **argv) { - const char **rec_argv; + const char **rec_argv, **to_free; unsigned int rec_argc, i, j; struct kwork_class *class; int ret; @@ -2279,6 +2279,9 @@ static int perf_kwork__record(struct perf_kwork *kwork, rec_argv = calloc(rec_argc + 1, sizeof(char *)); if (rec_argv == NULL) return -ENOMEM; + to_free = calloc(rec_argc + 1, sizeof(char *)); + if (to_free == NULL) + return -ENOMEM; for (i = 0; i < ARRAY_SIZE(record_args); i++) rec_argv[i] = STRDUP_FAIL_EXIT(record_args[i]); @@ -2296,15 +2299,20 @@ static int perf_kwork__record(struct perf_kwork *kwork, BUG_ON(i != rec_argc); pr_debug("record comm: "); - for (j = 0; j < rec_argc; j++) + for (j = 0; j < rec_argc; j++) { pr_debug("%s ", rec_argv[j]); + /* Save the pointers as the array will be mutated by cmd_record. */ + to_free[j] = rec_argv[j]; + } pr_debug("\n"); ret = cmd_record(i, rec_argv); EXIT: for (i = 0; i < rec_argc; i++) - free((void *)rec_argv[i]); + free((void *)to_free[i]); + + free(to_free); free(rec_argv); return ret; } @@ -2447,6 +2455,7 @@ int cmd_kwork(int argc, const char **argv) const char *const kwork_subcommands[] = { "record", "report", "latency", "timehist", "top", NULL }; + int ret = 0; perf_tool__init(&kwork.tool, /*ordered_events=*/true); kwork.tool.mmap = perf_event__process_mmap; @@ -2463,7 +2472,7 @@ int cmd_kwork(int argc, const char **argv) if (strlen(argv[0]) > 2 && strstarts("record", argv[0])) { setup_event_list(&kwork, kwork_options, kwork_usage); - return perf_kwork__record(&kwork, argc, argv); + ret = perf_kwork__record(&kwork, argc, argv); } else if (strlen(argv[0]) > 2 && strstarts("report", argv[0])) { kwork.sort_order = default_report_sort_order; if (argc > 1) { @@ -2474,7 +2483,7 @@ int cmd_kwork(int argc, const char **argv) kwork.report = KWORK_REPORT_RUNTIME; setup_sorting(&kwork, report_options, report_usage); setup_event_list(&kwork, kwork_options, kwork_usage); - return perf_kwork__report(&kwork); + ret = perf_kwork__report(&kwork); } else if (strlen(argv[0]) > 2 && strstarts("latency", argv[0])) { kwork.sort_order = default_latency_sort_order; if (argc > 1) { @@ -2485,7 +2494,7 @@ int cmd_kwork(int argc, const char **argv) kwork.report = KWORK_REPORT_LATENCY; setup_sorting(&kwork, latency_options, latency_usage); setup_event_list(&kwork, kwork_options, kwork_usage); - return perf_kwork__report(&kwork); + ret = perf_kwork__report(&kwork); } else if (strlen(argv[0]) > 2 && strstarts("timehist", argv[0])) { if (argc > 1) { argc = parse_options(argc, argv, timehist_options, timehist_usage, 0); @@ -2494,7 +2503,7 @@ int cmd_kwork(int argc, const char **argv) } kwork.report = KWORK_REPORT_TIMEHIST; setup_event_list(&kwork, kwork_options, kwork_usage); - return perf_kwork__timehist(&kwork); + ret = perf_kwork__timehist(&kwork); } else if (strlen(argv[0]) > 2 && strstarts("top", argv[0])) { kwork.sort_order = default_top_sort_order; if (argc > 1) { @@ -2507,12 +2516,12 @@ int cmd_kwork(int argc, const char **argv) kwork.event_list_str = "sched, irq, softirq"; setup_event_list(&kwork, kwork_options, kwork_usage); setup_sorting(&kwork, top_options, top_usage); - return perf_kwork__top(&kwork); + ret = perf_kwork__top(&kwork); } else usage_with_options(kwork_usage, kwork_options); /* free usage string allocated by parse_options_subcommand */ free((void *)kwork_usage[0]); - return 0; + return ret; } -- 2.53.0.1213.gd9a14994de-goog