From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f12.google.com (mail-pj2-f12.google.com [74.125.227.140]) (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 B6F352F0661 for ; Sun, 13 Sep 2026 20:31:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789331507; cv=none; b=ru+Oo6wIMvlEGnwrEZFcyjp+r8JI/l2JV0g4qZKqIDxHw5btO+nOZKb+6R9/PaypnGI7abKRlzD6UCBgFxr0MAX2uBtgGt6sJ54EZLWy9k26So330vh+TItr7uSpCT/oTgWeC2vtXyUEgrI91LfITZju1n2D8y0AqDzVBklZm9Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789331507; c=relaxed/simple; bh=ZxKFKkRM8oXFOFl97A/fFfxND2n+rPDeZs/wlH5nD1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cid7HTj824iHhpga+b6+ifNncIquWBQQeOdXisI9UPWeDdPL2vZzI6ph38MJlM8hydb++ly8KkUuxpznPil2WiZHJaBvoWIkP0sqUv+RCuRnr1MYSyZ6gIi3dlwzWXbSQhd8fCNWxIcg11OVbVOcdnFwyYpDoGt6tfNNO1WySFs= 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=a7JWDkOt; arc=none smtp.client-ip=74.125.227.140 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="a7JWDkOt" Received: by mail-pj2-f12.google.com with SMTP id 98e67ed59e1d1-39b9184fa80so1308549a91.2 for ; Sun, 13 Sep 2026 13:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789331505; x=1789936305; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=d5jASMuUqBprwXkBkHSWhbe8r2/E5/xJ7OJmCuBUolA=; b=a7JWDkOt+9MeYruo4fRFTgsm6zQ88d8VrKV3jMuHYErofOEDhMrbzM8eFlwrZS5DPf k+Dcl5h3zP1i9gptSWPjNBLOUJE9uxZSJ5RYDv24OU993pAx8lmJpq6YWxuUscniOVjb ExwGraszTG9uUbdKUrfB4HpPYQOMd1V57hhWINpFZ3VFolsI/MjdS8JGpochhEZAYgyh fBH+oLVuUiICxpRSpijY3zMUxSY/l1r9aCxefFGIO6oRSzQxxk3JYJzgH3CTZO8C/Xu2 POH7cKsS4XHsK9akATj1RsveY6lQQYytoBcR6jjS7Pmiyf0wQARmoaoAkT4XTLIu5O1E eB8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789331505; x=1789936305; h=content-transfer-encoding:mime-version:references:in-reply-to :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=d5jASMuUqBprwXkBkHSWhbe8r2/E5/xJ7OJmCuBUolA=; b=hHBoon8HphqM8mkPgqlIyCG8AG1rZ0pdLv+cdy001NWG7yfDEIEWsyL/bV5ibcLDTn mEyZPEBpXnldU9Tn+Ogobw2gjCOcz4XlIN4BHMgG7wSbFGAcS9NCkNuPV8OBcxTT4g6w DqQJSGDELG5J8opdiBgSxhtkOdy15tvN5mkVDDqjv67FTPiVFIz6anUyQOvcMmmkZrWT Dw0Rtq5nkFHM35GRDtWHpPPeqTe3mS9ItM/+XkLj0juxbfyAru3jY8/iIC2cMExRYMM8 agIfSu5Fp+ZYW0oEcVsVxT/Z9X41jf0KaunREoc1BcZTV2s5jpM53vsXMgQnePZq5dMw ZJRw== X-Forwarded-Encrypted: i=1; AKwUvBwSyW6FO7+CIPFExMa8jTbfirkBeYXri7fopomxm0lKPMc+p9vPgLg0VOUgSGfTCoJ0bCZClGKL20+TGN0=@vger.kernel.org X-Gm-Message-State: AFuF++nbwjSPAs/BzvJmwALu1qKcx8As5TLM1dlRuX+PfxZM7jOW16tu bUPyNvqwJQa2fsISjMxl/qm5EHt36PW9T/h3A58YxONR1zpvdPmrSck= X-Gm-Gg: AYBFou1JM7VmtRWpV6frUclvUzGQNcjAwXf1SCrb7pkGtrny9+YecxBXn9kJk6fyaCu m41LcOe8fXmi01z2gDBCUXOmba8xr6IryROtwlVpwkwCBU/u9mda7NAvPRtREPAHLMB7H92kufi zn6t9b/bRJRQ9ULqKgYR2Z+xHEmsUbHaUQyh+qPTdyhCJOq/rFZitcNrAfsD17X3dQEBix9827d GETMIeo9oJcrB0QmuVa5azH819StaZ4g3pQnNpx3pIUHMnh/S63Wg+oApf3TZGptcGhJavd5dYx fxxe/mJahVsmaBv4WQxl1a3UDWtbdBccebHDMTZaFBmPAQBKGI3JJZBUXJIrDixmMCzGVCPXxy8 MS3Us8pxsd74+J6bxZiZkYTFcrtkoYNIq5itEiefdseZnSXzrEeB3IxxQH4SHQDHHNHYOSjtbZQ Ny1KAcqQMIc/XiRoGj2wY7vdcqFmOIoG5lUeU4d/Vsn6QVp0H5Q+PxbjYF9CzYeMnZcB33SmHbk qw5vFxcpEhH2PGikrVC9w+HXw== X-Received: by 2002:a17:90b:5785:b0:39d:e9b6:cec9 with SMTP id 98e67ed59e1d1-39de9b6d48bmr415809a91.7.1789331505011; Sun, 13 Sep 2026 13:31:45 -0700 (PDT) Received: from ydg-Zenbook-14-UM3406GA ([2001:2d8:7f00:8c85:b91:ff81:c860:362e]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39d94744dfdsm17530220a91.0.2026.09.13.13.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2026 13:31:44 -0700 (PDT) From: Donggeun Yoo To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , Tom Zanussi , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Donggeun Yoo , stable@vger.kernel.org Subject: [PATCH v2 2/2] tracing: Fix NULL dereference when copying keys for a field variable Date: Mon, 14 Sep 2026 05:31:29 +0900 Message-ID: <20260913203129.941270-3-donggeunyoo.kernel@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260913203129.941270-1-donggeunyoo.kernel@gmail.com> References: <20260913203129.941270-1-donggeunyoo.kernel@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In event_hist_trigger_parse() where it needs to create actions like "onmatch", it calls: event_hist_trigger_parse() { create_actions() { action_create() { trace_action_create() { trace_action_create_field_var() { create_field_var_hist() Where create_field_var_hist() does a loop on the hist_data representing the keys. The issue is, if the keys uses one of the pseudo field types (like common_cpu), the hist_data field element will have NULL for its field member causing a NULL pointer dereference when accessing the key_field->field->name. # echo 'hist:keys=common_cpu:ts0=common_timestamp.usecs' > \ events/sched/sched_waking/trigger # echo 'my_synth u64 lat; int prio' > synthetic_events # echo 'hist:keys=common_cpu:wakeup_lat=common_timestamp.usecs-$ts0:\ onmatch(sched.sched_waking).my_synth($wakeup_lat,prio)' > \ events/sched/sched_switch/trigger KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] RIP: 0010:create_field_var_hist+0x771/0x1380 Call Trace: trace_action_create_field_var+0x360/0x600 trace_action_create+0x393/0xe80 event_hist_trigger_parse+0x3e47/0x69e0 trigger_process_regex+0x1a6/0x250 event_trigger_write+0xce/0x160 Instead of accessing it directly, use the proper handler expr_field_str() to get the name. A .buckets key needs the previous patch to render, so apply that first. Cc: stable@vger.kernel.org Fixes: 02205a6752f2 ("tracing: Add support for 'field variables'") Signed-off-by: Donggeun Yoo Assisted-by: Claude:claude-fable-5 --- kernel/trace/trace_events_hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 9d7ce01fda36..b43b83d7c6f3 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -3097,7 +3097,7 @@ create_field_var_hist(struct hist_trigger_data *target_hist_data, key_field = hist_data->fields[i]; if (!first) seq_buf_putc(&s, ','); - seq_buf_puts(&s, key_field->field->name); + expr_field_str(key_field, &s); first = false; } -- 2.53.0