From nobody Fri Jul 24 04:44:03 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 C6A60317170 for ; Fri, 24 Jul 2026 03:05:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784862330; cv=none; b=YMiVX3jtGEM+Uamxh6YRPP6FnxoRRsC8Q++9UGfLJpLOYRe8uS9ybGuAT6Y/BL5b+puPg6JT7WVSUKjfgtqZCsATz/g9DLLFeLf7sQrHJTIqwEUdf2jIwhwxJgTsP/mW50j12REl1rsZ9QpVRnp6Avv9qD9hYp2uZudeJVpfxm0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784862330; c=relaxed/simple; bh=gWtTBUfQ079blUxszBgnicGvuf0vMoPOa2nISSnwh4I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=W7e/rxJuK9FwU7BFcilhrrB2aF8lLrrH9R1EHQ45WhsxANkZDi0sqqfNXf2Q1i2Fm9iLCWHj4ajMqFjCQlcSOHCU2mNQMyj+tR09Ocow+XDLpLUPqQ4240xOPG+YwmzizoeUvbckafDe/tScgrWFjMks1lYjOzTzXix1PbNi6AE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=sKGMppB1; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sKGMppB1" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-4758bd3731bso906913f8f.0 for ; Thu, 23 Jul 2026 20:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784862327; x=1785467127; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=/SNsZTXwCXf/3KWca6mZAHrbZy6nzp6GZVhlgsJbqGo=; b=sKGMppB1sz/IdANJKNLLJtFziiWHhPoKde8jinZts0knJuMn2cyle3OlOBTlgYM1n8 N72+YJGBQVrGybRb9bwJZYQM/erUVO9dPh8SdDHJ2i62lJjWyG/g5y795yGSeW9ZKNtU ms/0cXN7sCoFrBkawIhKIR3kdlrtGieYIA0Ao/NearwfL2AAF04r0dk30aNJtb56VSA2 fF7py42SH8eJLmOak2f7R5AhlxPKU/Ogh2I4L84jO5cz2mI4a8rvdursL/EPKc/sJw7x bJsuJ/RmHXYWyj/5prHCthZptKHZrs8XkYwhEPIh1pB3Qnvl26pN1udZp7yyiPus65bu TQaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784862327; x=1785467127; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/SNsZTXwCXf/3KWca6mZAHrbZy6nzp6GZVhlgsJbqGo=; b=FMv8t2u6NYd0UNVB7MzYaPE0lH+Tu/1e/SrB493BB7hHl74bRYg+igvMjD0QNGLad0 tkcT+IWcgc0gkAzeqmZRVFJUjxzy4SWAD2p8IRAPlyRSkglq6Ejr260Lv3JSOJNpYrpW UnHBUlYMSoCX/Vmr/9rSQ7RkkRB0Ms2H3NvRSXCc+B4DMSi+7hZOGnzJyJDOCH46dp83 OU5r9hbCfpdJ3q47jatJLPBMrGpgcYfeR1RlX8OHWcY4A7bOgZqKuohiuxuW03Yacxm4 PHJ6ezgdb6V4kKkdItCApnfxE3RMkZAf7OMFUubPv7soqHj8sXHQZlwxUy3Y2kYj153G 1aLA== X-Forwarded-Encrypted: i=1; AHgh+Rr3l2aC7JdXig7DsaZiV62rPNVIuzxy16f0w9UOJhOQ2qIwsssx4x5G2k0qecYhUsXOvCGGvnP+Dtr8fcU=@vger.kernel.org X-Gm-Message-State: AOJu0YzwSInrbHhMzqfp+OiVWgOopOOXHnCZwRVvkvXapT26+tahn3xM /+j1VD+ip1gOGYKuNZAAN4pgka/saG5VGOZaIRzw2EU/stRIGxbYp6mI X-Gm-Gg: AR+sD13nGS/nCQFyT0VpnApXZGV5do4tlww0zP+YNJmBf4bOEb7DE6FYSO1+UlJ+GAY VazzPKp/93rBXL52bqqWrt7i9Zyj2JyTMUBe+QuD/aJdCkSRkohQTOuqe2YiqbdeAVaN23H3ZYk YyXDrJJMhlXoe9FSuONIvQyrlcxN6EYIErAYoFxVitjOA+FknZbgDFOtZzHOao9me63ZXRz8vkt Id7uqF107q64GmuEFcIUi65Ae1piYb28mCnxwikwNbOJJjflmgxEL550Klyl71OQ31AQnlrza/i hgOpVqM8l6BQ2Szkc5QFewJI4FmDTFf59EuLwRFZo2PQ3u8M8SltBEZ+3aAzy25qYzlRZYmSr5p sVBuaci4gfsuy+Xmme3rDOkVTu3bOweaHqTJZMvSlh9wTAMOKUmcdGMGr73BgU08SAiTX/+Ajkh bLJuScJKDwT8O7l0jhehTE/MjS7r1YnEmc1y+92HM5eUh/45fgXPltTKLejF6GVA== X-Received: by 2002:a05:6000:220e:b0:47f:924a:655b with SMTP id ffacd0b85a97d-47f924a659dmr5140052f8f.26.1784862326858; Thu, 23 Jul 2026 20:05:26 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f85c531basm20280576f8f.19.2026.07.23.20.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 20:05:26 -0700 (PDT) From: David Carlier To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, David Carlier Subject: [PATCH v4] tracing: Fix use-after-free freeing trigger private data Date: Fri, 24 Jul 2026 04:05:17 +0100 Message-ID: <20260724030523.19081-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 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" Commit 61d445af0a7c ("tracing: Add bulk garbage collection of freeing event_trigger_data") moved the kfree() of event_trigger_data to a kthread that runs tracepoint_synchronize_unregister() before freeing. That removed the synchronization the trigger .free callbacks used to get implicitly and inline from trigger_data_free(). event_hist_trigger_free(), event_hist_trigger_named_free() and event_enable_trigger_free() free their satellite data (hist_data, cmd_ops, enable_data) right after trigger_data_free() returns. With the synchronization now deferred to the kthread, a concurrent tracepoint handler can still reach that data through the list_del_rcu()'d trigger, causing a use-after-free. The histogram teardown must stay synchronous: remove_hist_vars() and unregister_field_var_hists() have to detach a synthetic event from the histogram before the trigger-removal write returns, otherwise a following command races in and the synthetic-event removal fails with -EBUSY, as the trigger-synthetic-eprobe.tc selftest catches. Make those callbacks wait with the correct barrier - tracepoint_synchronize_unregister(), matching the free kthread - before freeing. The enable trigger has no such synchronous requirement, and a blocking synchronize there would re-serialize the path that commit deliberately deferred. Give it an optional private_data_free() callback that the free kthread runs after its grace period, and free enable_data from there. Suggested-by: Masami Hiramatsu (Google) Suggested-by: Steven Rostedt Fixes: 61d445af0a7c ("tracing: Add bulk garbage collection of freeing event= _trigger_data") Signed-off-by: David Carlier --- kernel/trace/trace.h | 1 + kernel/trace/trace_events_hist.c | 2 ++ kernel/trace/trace_events_trigger.c | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 80fe152af1dd..bf77331f56a4 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1941,6 +1941,7 @@ struct event_trigger_data { struct list_head named_list; struct event_trigger_data *named_data; struct llist_node llist; + void (*private_data_free)(struct event_trigger_data *data); }; =20 /* Avoid typos */ diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_h= ist.c index 82ce492ab268..58d28cd1afa3 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -6349,6 +6349,7 @@ static void event_hist_trigger_free(struct event_trig= ger_data *data) =20 trigger_data_free(data); =20 + tracepoint_synchronize_unregister(); remove_hist_vars(hist_data); =20 unregister_field_var_hists(hist_data); @@ -6388,6 +6389,7 @@ static void event_hist_trigger_named_free(struct even= t_trigger_data *data) =20 del_named_trigger(data); trigger_data_free(data); + tracepoint_synchronize_unregister(); kfree(cmd_ops); } } diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_event= s_trigger.c index 655db2e82513..46e60b70a4bb 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -38,6 +38,13 @@ static void trigger_create_kthread_locked(void) } } =20 +static void trigger_data_free_one(struct event_trigger_data *data) +{ + if (data->private_data_free) + data->private_data_free(data); + kfree(data); +} + static void trigger_data_free_queued_locked(void) { struct event_trigger_data *data, *tmp; @@ -52,7 +59,7 @@ static void trigger_data_free_queued_locked(void) tracepoint_synchronize_unregister(); =20 llist_for_each_entry_safe(data, tmp, llnodes, llist) - kfree(data); + trigger_data_free_one(data); } =20 /* Bulk garbage collection of event_trigger_data elements */ @@ -75,7 +82,7 @@ static int trigger_kthread_fn(void *ignore) tracepoint_synchronize_unregister(); =20 llist_for_each_entry_safe(data, tmp, llnodes, llist) - kfree(data); + trigger_data_free_one(data); } =20 return 0; @@ -1717,6 +1724,11 @@ int event_enable_trigger_print(struct seq_file *m, return 0; } =20 +static void enable_trigger_private_data_free(struct event_trigger_data *da= ta) +{ + kfree(data->private_data); +} + void event_enable_trigger_free(struct event_trigger_data *data) { struct enable_trigger_data *enable_data =3D data->private_data; @@ -1728,9 +1740,9 @@ void event_enable_trigger_free(struct event_trigger_d= ata *data) if (!data->ref) { /* Remove the SOFT_MODE flag */ trace_event_enable_disable(enable_data->file, 0, 1); + data->private_data_free =3D enable_trigger_private_data_free; trace_event_put_ref(enable_data->file->event_call); trigger_data_free(data); - kfree(enable_data); } } =20 --=20 2.53.0