From nobody Sat Feb 7 16:01:57 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E602A21423C; Thu, 11 Dec 2025 22:18:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491488; cv=none; b=J2P/BD4X+OetXWrLjc6FRCha9nSmSH7lOykBHFucnATWw8oQN+9EGgKcC4vFN8Ob82UgAtHLn0F1UVEjKrLrKsQFxDvLEgvbWHq1RcxEWkRL5czdxXu/60niF+73DVGBMHvMthAtrb3nLFMVeXmCocfq689TDhj9LOqMVmMnaH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491488; c=relaxed/simple; bh=nOH1ZX9DzwGUJ1whuJFT388Azu1H/+zQWlzIVUweQSg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kgcD35Gp4zDDihgY0xnh9cRQrKsWtCry7QQRhzd6R2Gvj/GduIuoCV/X7UG81wLrgyF9++arBqzP/zwmdn68r/GnNjevLgtIc84hEfc2GW8pPTUZiIKCINjD1G/bFXbRbH99G4oBaEdQ2QueuGIARypopO5yZbEwcmSFliXbKXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FXO8i/xO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FXO8i/xO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F0B0C19422; Thu, 11 Dec 2025 22:18:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765491487; bh=nOH1ZX9DzwGUJ1whuJFT388Azu1H/+zQWlzIVUweQSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FXO8i/xOQSuc4SEjAdkvm8Aw0I+9Q1pUcjr9sN109KNryy5TeR/ElJmvgbzYBDj5a SR+CQJ8IeFTpnjdaLgg+gINYoPKRre6KIp0MfhMxmWuxdqT/LdwggGGFeCaeN7jteY BzuuaXxrHoRT3UVGcs4QAHBa6r7m/x+z3rJpdeu8QvHJX25jQPi8wowWLQCrhLW92S xslcr9zKuT8SfrNeAhSVvslqBEumgKhPGZuY/b5WYpYfCBXwDdTsQMjlKZ9fhe7mHr HOK4yJ+W1WVW9FAG8FVuNNqJRORcbsiGyVPhKoSiLzFqpv1peNgkiejo5nIQPqJyKw 5XjJtbS1N7OTA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo Subject: [PATCH 1/4] perf list: Remove unused 'sep' variable Date: Thu, 11 Dec 2025 19:17:53 -0300 Message-ID: <20251211221756.96294-2-acme@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251211221756.96294-1-acme@kernel.org> References: <20251211221756.96294-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is just being set to the return of strchr() but never used, just ditch it and with it get rid of a warning about it not being const on fedora 44. Signed-off-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers --- tools/perf/builtin-list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 5cbca0bacd35237e..ac7bd0e41aa1d5d6 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -648,7 +648,7 @@ int cmd_list(int argc, const char **argv) } =20 for (i =3D 0; i < argc; ++i) { - char *sep, *s; + char *s; =20 if (strcmp(argv[i], "tracepoint") =3D=3D 0) { char *old_pmu_glob =3D default_ps.pmu_glob; @@ -720,7 +720,7 @@ int cmd_list(int argc, const char **argv) else if (strcmp(argv[i], "pfm") =3D=3D 0) print_libpfm_events(&print_cb, ps); #endif - else if ((sep =3D strchr(argv[i], ':')) !=3D NULL) { + else if (strchr(argv[i], ':') !=3D NULL) { char *old_pmu_glob =3D ps->pmu_glob; char *old_event_glob =3D ps->event_glob; =20 --=20 2.52.0 From nobody Sat Feb 7 16:01:57 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E6092D6E5B; Thu, 11 Dec 2025 22:18:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491491; cv=none; b=B+LnXV8LpZcLRl1NgoBRxs+jGCuXIRotH308275pvXHQtErWU00KqSZt31MLcGaFRr9N0eY9PHv/Nwv77XnlBqM8FTeIsTq1Vtw2vqiCWoyFK1F/uwGIzH3nBEyYmaytwA1DyAXSFxSnqwlLlQpgb9pAvDyXUKTnEppMvFn0aME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491491; c=relaxed/simple; bh=w4yfUP3WqGg3ALDETvkl70tHP/a6zGD0PqOjs9hXsgs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D8XvG+iUYK53R1BxeevacrjZUSUyYzBG5LpZel/Fcmk5saejoUaD8b9BBWrUtAHQUyPJvkLdnqNUDimfdK//eNFTk0wwu7w1HqCzkWwMYgLNWp29sy6AlTsCwRfg70W3ELgT0PJaSJAbaZ0tGWW60xvbuk1wJnJUWj/oJbp3r1k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MPwPcZDv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MPwPcZDv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C88E3C4CEF7; Thu, 11 Dec 2025 22:18:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765491490; bh=w4yfUP3WqGg3ALDETvkl70tHP/a6zGD0PqOjs9hXsgs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MPwPcZDvlrCuRmoVa8KLDoVAP5BqleBzleYsG7sgBkh3ODi+TkPwGk5TroVBLfPOK vA89DJF7IDicjvA6HIby1ag71dW6eQtVnSI3tkqW2fPL2+YmJqPktgK3LIIiMe8kdz DbnLV26AGr+abT+KGturolIr7j8qKl8GQ8Ns3oHwl8CigcW5jmDW603okcj1pCJnYo ujHuB8e4hE2eVAtVKuYqO/gH+krjyYh1Wtk4zJc39UC0ybF1aSTWcfIV9nptKKDIfq S/X7HZWJ1MxwLbDLyo7i5fyovAVjwlXftNNeFunvZwnIZ0Xzpq99FWo5jjb+ntz+/p Hc1cZDHuepc2w== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo Subject: [PATCH 2/4] perf diff: Constify strchr() return variables Date: Thu, 11 Dec 2025 19:17:54 -0300 Message-ID: <20251211221756.96294-3-acme@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251211221756.96294-1-acme@kernel.org> References: <20251211221756.96294-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Newer glibc versions return const char for strchr() when the 's' arg is const, change the return variable to const to match that. Also we don't need to turn that ',' into a '\0', as strtol will stop in the first invalid char. No need to touch read only memory. First noticed with fedora 44. Signed-off-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers --- tools/perf/builtin-diff.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 53d5ea4a6a4f7b54..59bf1f72d12e226a 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -178,10 +178,9 @@ static struct header_column { } }; =20 -static int setup_compute_opt_wdiff(char *opt) +static int setup_compute_opt_wdiff(const char *opt) { - char *w1_str =3D opt; - char *w2_str; + const char *w1_str =3D opt, *w2_str; =20 int ret =3D -EINVAL; =20 @@ -192,8 +191,7 @@ static int setup_compute_opt_wdiff(char *opt) if (!w2_str) goto out; =20 - *w2_str++ =3D 0x0; - if (!*w2_str) + if (!*++w2_str) goto out; =20 compute_wdiff_w1 =3D strtol(w1_str, NULL, 10); @@ -214,7 +212,7 @@ static int setup_compute_opt_wdiff(char *opt) return ret; } =20 -static int setup_compute_opt(char *opt) +static int setup_compute_opt(const char *opt) { if (compute =3D=3D COMPUTE_WEIGHTED_DIFF) return setup_compute_opt_wdiff(opt); @@ -234,7 +232,7 @@ static int setup_compute(const struct option *opt, cons= t char *str, char *cstr =3D (char *) str; char buf[50]; unsigned i; - char *option; + const char *option; =20 if (!str) { *cp =3D COMPUTE_DELTA; --=20 2.52.0 From nobody Sat Feb 7 16:01:57 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BC392BEC5F; Thu, 11 Dec 2025 22:18:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491494; cv=none; b=XVCnaYSRmqXYiCT3BI4+bpjqhquSMyXjmMrNNabZ/jRE6U9ILxGKrWKwNVNn61H8ledGOJqWP/9J5ciXF+L5pZY3i8I3mlkoJhdhCYexXv2XNxQtwheucq+AvMBi/x36F0VULvGq/qhJ2GyqiDUcdFUJR7k5ODjb6ULdyfgImXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491494; c=relaxed/simple; bh=HN+YbeRKhYRIdIIuxnmwLla4awRI2Nl2a3IsnUvLQIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JoNwMFY4TUU9qsFZ/5MhsV2C0korb6NO/MtXOAcU+HIqn3H1lZJ7Vu134EqZ4Cwu+/tXo0evWxUokNrbFo/RT91bDiyyZxjS+PUdpBTl/I3k1zqrGaDHO7x1KWT2lLI5L7GKzrs4FoU/iOwNBMx4mM4NRc+9v7Er4PkAKGhRdHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pYATVGUI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pYATVGUI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E0F5C113D0; Thu, 11 Dec 2025 22:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765491494; bh=HN+YbeRKhYRIdIIuxnmwLla4awRI2Nl2a3IsnUvLQIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pYATVGUI4DSWrv5gl8k8u3sKP9y6Y38ZeRQ9kIEHRhCuHRSbCeFOavGGcNtSQ7fcu MmoXGH7S7X1GgNumXY7/0b8RG277WNUuKP2DjqbgwFkD035p4qCoPJBArA3nOGsjXJ 6J6QGFdxjPQp8O+KH1cbL3Veaf4B6E0WpPydyYZ1WomrZw3pI4gjL8waChmpdAtlpo fEfr/K2KhJpUBMIsM1cN4Wkd4+D3fbZU/lN0M7Rf4x3tu0IBDrD5X82AdiOo1aUKAV wEs0wUJzsr3V2A9oOauCk1zjE1Ql03iJpdMDQSmAeSWXVEC028yd6BmRG80tWRD4Su jvkWJWBx/6hNg== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo Subject: [PATCH 3/4] perf tools: Use const for variables receiving str{str,r?chr}() returns Date: Thu, 11 Dec 2025 19:17:55 -0300 Message-ID: <20251211221756.96294-4-acme@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251211221756.96294-1-acme@kernel.org> References: <20251211221756.96294-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Newer glibc versions return const char for str{str,chr}() where the haystack/s is const so to avoid warnings like these on fedora 44 change some variables to const: 36 8.17 fedora:44 : FAIL gcc version 15.2.1 20251= 111 (Red Hat 15.2.1-4) (GCC) libbpf.c: In function 'kallsyms_cb': libbpf.c:8489:13: error: assignment discards 'const' qualifier from poi= nter target type [-Werror=3Ddiscarded-qualifiers] 8489 | res =3D strstr(sym_name, ".llvm."); Signed-off-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers --- tools/perf/jvmti/libjvmti.c | 2 +- tools/perf/tests/parse-events.c | 4 ++-- tools/perf/util/evlist.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/perf/jvmti/libjvmti.c b/tools/perf/jvmti/libjvmti.c index 82514e6532b8c3af..87bfd4781003a331 100644 --- a/tools/perf/jvmti/libjvmti.c +++ b/tools/perf/jvmti/libjvmti.c @@ -142,7 +142,7 @@ copy_class_filename(const char * class_sign, const char= * file_name, char * resu */ if (*class_sign =3D=3D 'L') { size_t j, i =3D 0; - char *p =3D strrchr(class_sign, '/'); + const char *p =3D strrchr(class_sign, '/'); if (p) { /* drop the 'L' prefix and copy up to the final '/' */ for (i =3D 0; i < (size_t)(p - class_sign); i++) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 128d21dc389f869b..2bd6229721145e42 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -2609,8 +2609,8 @@ static int test_events(const struct evlist_test *even= ts, int cnt) for (int i =3D 0; i < cnt; i++) { struct evlist_test e =3D events[i]; int test_ret; - const char *pos =3D e.name; - char buf[1024], *buf_pos =3D buf, *end; + const char *pos =3D e.name, *end; + char buf[1024], *buf_pos =3D buf; =20 while ((end =3D strstr(pos, "default_core"))) { size_t len =3D end - pos; diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 03674d2cbd015e4f..64951962854104a5 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1945,7 +1945,8 @@ static int evlist__parse_control_fifo(const char *str= , int *ctl_fd, int *ctl_fd_ =20 int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, b= ool *ctl_fd_close) { - char *comma =3D NULL, *endptr =3D NULL; + const char *comma =3D NULL; + char *endptr =3D NULL; =20 *ctl_fd_close =3D false; =20 --=20 2.52.0 From nobody Sat Feb 7 16:01:57 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF0D42D24B6; Thu, 11 Dec 2025 22:18:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491497; cv=none; b=d7U452+Uv6lMK/hv+o2umK1msZbl9P4GsfwKvy99KJqJ93GJUBHJRksIdl35njXO0rQwQAuUN8F60PS/C7E2b0sCFgywoD/FuOv1EIlq9D56mMdUqE05BZA2avnz4lRgPyjoJCL0xSOLgazr6UHAvKRTATwPM7kjG9SJZ1DgTQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765491497; c=relaxed/simple; bh=C0V5aOJ0cXE0jisK65iUMGF3ss0ur1ph4+wirWwNY3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GcvKr2ztWQScYgVl2/C1XdqS1qF8SVqHSH1N4wsRMkjcmEU2V9MX6JJDbdzIfa9fQ1zC/awGMG728Cy7E6yXKo2iLmvkNaBIxB2jb+P4Pte51IbP0k7bPpAxBDP2bH2XM/WN8+YedeZrLkP4apKmIy5+YXioiXJH/7yKU/tVMZ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t4J3nVtF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="t4J3nVtF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 682A3C16AAE; Thu, 11 Dec 2025 22:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765491497; bh=C0V5aOJ0cXE0jisK65iUMGF3ss0ur1ph4+wirWwNY3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t4J3nVtFdfVFu/37oO5Df0vujoyDQYTZSP1P6VnUbFgRYSCKPUmWqelXEWDm3H/SO 1RzXTKxgKl0bOeucvR42AICjAoooOgZYlUEnZjA62bCthhp4UGfMIuosF46yClLmd/ vvT+3Yc+s9Q+hdfWleqc/iKBGDQQx3ccb4MnLEPxB04U5jSVs0KOKhyFbjXJYhdLES Uu4Ed1k6PNLYg5OX+D7mHls5ohfOfSL5uDr/ikKXQZ0o4nB/wYZ17mjJuNWlwIRSsH c9Fs2hFTPuh/F1I8+JAH2ZYubNkZYudCGcmnLddGWvHUNSafbKvZduyikrFy5Cr6nM 3cpN3zh8Qmiow== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo Subject: [PATCH 4/4] perf trace: Don't change const char strings Date: Thu, 11 Dec 2025 19:17:56 -0300 Message-ID: <20251211221756.96294-5-acme@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251211221756.96294-1-acme@kernel.org> References: <20251211221756.96294-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We got away with this so far but now with fedora 44 complaining about the return value of strchr et all, lets use strdup for good measure. Signed-off-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers --- tools/perf/builtin-trace.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index baee1f6956001d86..d49c1ae409d77df1 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -5173,8 +5173,8 @@ static int trace__parse_events_option(const struct op= tion *opt, const char *str, int unset __maybe_unused) { struct trace *trace =3D (struct trace *)opt->value; - const char *s =3D str; - char *sep =3D NULL, *lists[2] =3D { NULL, NULL, }; + const char *s; + char *strd, *sep =3D NULL, *lists[2] =3D { NULL, NULL, }; int len =3D strlen(str) + 1, err =3D -1, list, idx; char *strace_groups_dir =3D system_path(STRACE_GROUPS_DIR); char group_name[PATH_MAX]; @@ -5183,6 +5183,10 @@ static int trace__parse_events_option(const struct o= ption *opt, const char *str, if (strace_groups_dir =3D=3D NULL) return -1; =20 + s =3D strd =3D strdup(str); + if (strd =3D=3D NULL) + return -1; + if (*s =3D=3D '!') { ++s; trace->not_ev_qualifier =3D true; @@ -5257,8 +5261,7 @@ static int trace__parse_events_option(const struct op= tion *opt, const char *str, free(strace_groups_dir); free(lists[0]); free(lists[1]); - if (sep) - *sep =3D ','; + free(strd); =20 return err; } --=20 2.52.0