From 40fd2ccf9faa3e8b6d67d40c8ee52a2b3d1f07bd Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 4 Mar 2021 16:10:18 -0500
Subject: [PATCH] event-rule: Normalize pattern for syscall and tracepoint
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: If5bae2cd5df76db3f9bd626f95fcace114fcc420
---
 src/common/event-rule/syscall.c    | 7 ++++---
 src/common/event-rule/tracepoint.c | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/event-rule/syscall.c b/src/common/event-rule/syscall.c
index 8103eaa61..fbaa65310 100644
--- a/src/common/event-rule/syscall.c
+++ b/src/common/event-rule/syscall.c
@@ -14,6 +14,7 @@
 #include <common/runas.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
+#include <common/string-utils/string-utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/syscall-internal.h>
 
@@ -414,9 +415,9 @@ enum lttng_event_rule_status lttng_event_rule_syscall_set_pattern(
 		goto end;
 	}
 
-	if (syscall->pattern) {
-		free(syscall->pattern);
-	}
+	strutils_normalize_star_glob_pattern(pattern_copy);
+
+	free(syscall->pattern);
 
 	syscall->pattern = pattern_copy;
 	pattern_copy = NULL;
diff --git a/src/common/event-rule/tracepoint.c b/src/common/event-rule/tracepoint.c
index 62a53f978..65e2c16a7 100644
--- a/src/common/event-rule/tracepoint.c
+++ b/src/common/event-rule/tracepoint.c
@@ -15,6 +15,7 @@
 #include <common/runas.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
+#include <common/string-utils/string-utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/log-level-rule.h>
@@ -952,6 +953,9 @@ enum lttng_event_rule_status lttng_event_rule_tracepoint_set_pattern(
 		goto end;
 	}
 
+	/* Normalize the pattern. */
+	strutils_normalize_star_glob_pattern(pattern_copy);
+
 	free(tracepoint->pattern);
 
 	tracepoint->pattern = pattern_copy;
-- 
2.34.1