summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2018-05-09 11:59:32 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-05-11 10:56:42 -0400
commitdc432c3d7f9bceb3de6f5b44fb9c657c9810ed6d (patch)
tree3d482664e656bb402a4b16c5d4e88ec1f57cb8df /kernel
parent75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff)
downloadop-kernel-dev-dc432c3d7f9bceb3de6f5b44fb9c657c9810ed6d.zip
op-kernel-dev-dc432c3d7f9bceb3de6f5b44fb9c657c9810ed6d.tar.gz
tracing: Fix regex_match_front() to not over compare the test string
The regex match function regex_match_front() in the tracing filter logic, was fixed to test just the pattern length from testing the entire test string. That is, it went from strncmp(str, r->pattern, len) to strcmp(str, r->pattern, r->len). The issue is that str is not guaranteed to be nul terminated, and if r->len is greater than the length of str, it can access more memory than is allocated. The solution is to add a simple test if (len < r->len) return 0. Cc: stable@vger.kernel.org Fixes: 285caad415f45 ("tracing/filters: Fix MATCH_FRONT_ONLY filter matching") Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_events_filter.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 1f951b3..7d306b7 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -762,6 +762,9 @@ static int regex_match_full(char *str, struct regex *r, int len)
static int regex_match_front(char *str, struct regex *r, int len)
{
+ if (len < r->len)
+ return 0;
+
if (strncmp(str, r->pattern, r->len) == 0)
return 1;
return 0;
OpenPOWER on IntegriCloud