linux-kernel - linux-next: manual merge of the ftrace tree with the origin tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <aN6X7mvUjNw0DCn9@sirena.org.uk>
Date: Thu, 2 Oct 2025 16:19:10 +0100
From: Mark Brown <broonie@...nel.org>
To: Steven Rostedt <rostedt@...dmis.org>,
	Masami Hiramatsu <mhiramat@...nel.org>
Cc: Crystal Wood <crwood@...hat.com>,
	Ivan Pravdin <ipravdin.official@...il.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the ftrace tree with the origin tree

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  tools/tracing/rtla/src/actions.c

between commit:

  b1e0ff7209e95 ("rtla: Fix buffer overflow in actions_parse")

from the origin tree and commit:

  05b7e10687c69 ("tools/rtla: Add remaining support for osnoise actions")

from the ftrace tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc tools/tracing/rtla/src/actions.c
index 13ff1934d47c9,991139f9069f1..0000000000000
--- a/tools/tracing/rtla/src/actions.c
+++ b/tools/tracing/rtla/src/actions.c
@@@ -127,11 -127,11 +127,11 @@@ actions_add_continue(struct actions *se
   * actions_parse - add an action based on text specification
   */
  int
- actions_parse(struct actions *self, const char *trigger)
+ actions_parse(struct actions *self, const char *trigger, const char *tracefn)
  {
  	enum action_type type = ACTION_NONE;
- 	char *token;
+ 	const char *token;
 -	char trigger_c[strlen(trigger)];
 +	char trigger_c[strlen(trigger) + 1];
  
  	/* For ACTION_SIGNAL */
  	int signal = 0, pid = 0;

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)