mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [GIT PULL] rtla: Couple of fixes for 6.17
@ 2025-09-27 12:52 Steven Rostedt
  2025-09-27 18:25 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Steven Rostedt @ 2025-09-27 12:52 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: LKML, Ivan Pravdin, Wander Lairson Costa, Tomas Glozar


Linus,

Two fixes for rtla in v6.17:

- Fix a buffer overflow in actions_parse()

  The "trigger_c" variable did not account for the nul byte when
  determining its size.

- Fix a compare that had the values reversed

  actions_destroy() is to reallocate when len is greater than the current size,
  but the compare was testing if size is greater than the new length.


Please pull the latest trace-tools-v6.17-rc5 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
trace-tools-v6.17-rc5

Tag SHA1: 5f0fc72cedf3fd11f298253d0687eb69ea921dfd
Head SHA1: 2227f273b7dc25a791ae6b152550098aa6934b2f


Ivan Pravdin (1):
      rtla: Fix buffer overflow in actions_parse

Wander Lairson Costa (1):
      rtla/actions: Fix condition for buffer reallocation

----
 tools/tracing/rtla/src/actions.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---------------------------
diff --git a/tools/tracing/rtla/src/actions.c b/tools/tracing/rtla/src/actions.c
index aaf0808125d7..13ff1934d47c 100644
--- a/tools/tracing/rtla/src/actions.c
+++ b/tools/tracing/rtla/src/actions.c
@@ -49,7 +49,7 @@ actions_destroy(struct actions *self)
 static struct action *
 actions_new(struct actions *self)
 {
-	if (self->size >= self->len) {
+	if (self->len >= self->size) {
 		self->size *= 2;
 		self->list = realloc(self->list, self->size * sizeof(struct action));
 	}
@@ -131,7 +131,7 @@ actions_parse(struct actions *self, const char *trigger)
 {
 	enum action_type type = ACTION_NONE;
 	char *token;
-	char trigger_c[strlen(trigger)];
+	char trigger_c[strlen(trigger) + 1];
 
 	/* For ACTION_SIGNAL */
 	int signal = 0, pid = 0;

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] rtla: Couple of fixes for 6.17
  2025-09-27 12:52 [GIT PULL] rtla: Couple of fixes for 6.17 Steven Rostedt
@ 2025-09-27 18:25 ` pr-tracker-bot
  0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2025-09-27 18:25 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Linus Torvalds, LKML, Ivan Pravdin, Wander Lairson Costa, Tomas Glozar

The pull request you sent on Sat, 27 Sep 2025 08:52:34 -0400:

> git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-tools-v6.17-rc5

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/51a24b7deaae5c3561965f5b4b27bb9d686add1c

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-09-27 18:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-09-27 12:52 [GIT PULL] rtla: Couple of fixes for 6.17 Steven Rostedt
2025-09-27 18:25 ` pr-tracker-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®