mirror of
https://github.com/torvalds/linux.git
synced 2025-12-01 07:26:02 +07:00
Merge tag 'trace-tools-v6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull rtla tool fixes from Steven Rostedt: - 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 supposed to reallocate when len is greater than the current size, but the compare was testing if size is greater than the new length * tag 'trace-tools-v6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: rtla/actions: Fix condition for buffer reallocation rtla: Fix buffer overflow in actions_parse
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user