Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8DE82377A82; Thu, 20 Aug 2026 16:36:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787243787; cv=none; b=HVhOswDY3AxqiaikzLcwWCAIxVQIC1sijNbPAMlSt6brfziqFYbOvtU7SBYOqSVUHWR+070rLM8PZRAlf2jZ55kSgfJVMkXejJRd6YDYdQeFHGXIkLWeHMtJc6xhDmKX3ylxCfSy5Dp9gVKz93xJqpAJlgSopF3VBi4RYP3nA90= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787243787; c=relaxed/simple; bh=/88EdfVG/4i/yGiF1MR7RcqwdljtLDdg8E9wDfng4FE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qvG+nT4TCgDhZ4Q9qLC3ewUXPm3gu9e1cxD0BqRDOAHlmWJSvUFoSkEIvBaEaiWOBJcDFCuLL7miAuxWC5hraYBXDFLM3H+gf1DXL2Qgr+02xt2snHPBmPtyuUb4wm2aNsXZPajPyPP9W77GuLjw8vcaZ3JsNpxSrHgQQMmM8RU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BTEUioMD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BTEUioMD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8C2B1F00A3A; Thu, 20 Aug 2026 16:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787243786; bh=xoovg7RmaTBeDw6PRdnwr606wBM0cAjOyfP25RBPXeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BTEUioMDgNOqPMg38Zc7XSZSlcfLWJS50UtOXdGOvDycd0G5Qs+BT12BuuOQhNAfL rI7frx1wqE0nvVd1UiQyeynZgClzB9sls/J9p9q2zMGayxXRPlqxSfitxVmJoo+sza AovT2QL6zqKrRFpkPR0CqSUw3UgWvqwCm5YQLM3Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tengda Wu , Steven Rostedt , Sasha Levin Subject: [PATCH 5.15 216/272] ftrace: Add global mutex to serialize trace_parser access Date: Thu, 20 Aug 2026 16:56:40 +0200 Message-ID: <20260820145238.085528110@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145231.229664293@linuxfoundation.org> References: <20260820145231.229664293@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tengda Wu [ Upstream commit 7720b63bcef3f54c7fe288774b720a227d54a306 ] In ftrace, the trace_parser structure is allocated and initialized when a trace file is opened, and is subsequently used across write and release handlers to parse user input. The affected handler paths and their specific functions are: - Open paths: ftrace_regex_open(), ftrace_graph_open() - Write paths: ftrace_regex_write(), ftrace_graph_write() - Release paths: ftrace_regex_release(), ftrace_graph_release() If userspace opens a trace file descriptor and shares it across multiple threads, concurrent write calls will race on the parser's internal state, specifically the 'idx', 'cont', and 'buffer' fields, leading to corrupted input or undefined behavior. Fix this by adding a global mutex, parser_lock, to serialize all access to trace_parser across write and release paths, preventing concurrent corruption of parser state. Fixes: e704eff3ff51 ("ftrace: Have set_graph_function handle multiple functions in one write") Fixes: 689fd8b65d66 ("tracing: trace parser support for function and graph") Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260725024721.1983675-1-wutengda@huaweicloud.com Signed-off-by: Tengda Wu Signed-off-by: Steven Rostedt [ Replaced `guard(mutex)(&parser_lock)` with explicit `mutex_lock`/`mutex_unlock` pairs because 5.15 builds `-std=gnu89` with `-Werror=declaration-after-statement`. ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- kernel/trace/ftrace.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1043,6 +1043,12 @@ struct ftrace_ops global_ops = { }; /* + * parser_lock - Protects trace_parser state against concurrent operations. + * Held across trace_get_user() and subsequent buffer parsing to prevent races. + */ +static DEFINE_MUTEX(parser_lock); + +/* * Used by the stack unwinder to know about dynamic ftrace trampolines. */ struct ftrace_ops *ftrace_ops_trampoline(unsigned long addr) @@ -4928,6 +4934,8 @@ ftrace_regex_write(struct file *file, co /* iter->hash is a local copy, so we don't need regex_lock */ parser = &iter->parser; + + mutex_lock(&parser_lock); read = trace_get_user(parser, ubuf, cnt, ppos); if (read >= 0 && trace_parser_loaded(parser) && @@ -4941,6 +4949,7 @@ ftrace_regex_write(struct file *file, co ret = read; out: + mutex_unlock(&parser_lock); return ret; } @@ -5675,12 +5684,14 @@ int ftrace_regex_release(struct inode *i iter = file->private_data; parser = &iter->parser; + mutex_lock(&parser_lock); if (trace_parser_loaded(parser)) { int enable = !(iter->flags & FTRACE_ITER_NOTRACE); ftrace_process_regex(iter, parser->buffer, parser->idx, enable); } + mutex_unlock(&parser_lock); trace_parser_put(parser); @@ -5998,10 +6009,12 @@ ftrace_graph_release(struct inode *inode parser = &fgd->parser; + mutex_lock(&parser_lock); if (trace_parser_loaded((parser))) { ret = ftrace_graph_set_hash(fgd->new_hash, parser->buffer); } + mutex_unlock(&parser_lock); trace_parser_put(parser); @@ -6121,6 +6134,7 @@ ftrace_graph_write(struct file *file, co parser = &fgd->parser; + mutex_lock(&parser_lock); read = trace_get_user(parser, ubuf, cnt, ppos); if (read >= 0 && trace_parser_loaded(parser) && @@ -6134,6 +6148,7 @@ ftrace_graph_write(struct file *file, co if (!ret) ret = read; + mutex_unlock(&parser_lock); return ret; }