6 files changed, 15 insertions, 20 deletions

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 554b517c61a0..eac9ce2c57a2 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4456,7 +4456,6 @@ unregister_ftrace_function_probe_func(char *glob, struct trace_array *tr,
                 func_g.type = filter_parse_regex(glob, strlen(glob),
                                                  &func_g.search, &not);
                 func_g.len = strlen(func_g.search);
-                func_g.search = glob;
 
                 /* we do not support '!' for function probes */
                 if (WARN_ON(not))
@@ -5015,7 +5014,6 @@ int ftrace_regex_release(struct inode *inode, struct file *file)
 
         parser = &iter->parser;
         if (trace_parser_loaded(parser)) {
-                parser->buffer[parser->idx] = 0;
                 ftrace_match_records(iter->hash, parser->buffer, parser->idx);
         }
 
@@ -5329,7 +5327,6 @@ ftrace_graph_release(struct inode *inode, struct file *file)
                 parser = &fgd->parser;
 
                 if (trace_parser_loaded((parser))) {
-                        parser->buffer[parser->idx] = 0;
                         ret = ftrace_graph_set_hash(fgd->new_hash,
                                                     parser->buffer);
                 }
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 32c069bbf41b..56608538a4ad 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -530,8 +530,6 @@ int trace_pid_write(struct trace_pid_list *filtered_pids,
                 ubuf += ret;
                 cnt -= ret;
 
-                parser.buffer[parser.idx] = 0;
-
                 ret = -EINVAL;
                 if (kstrtoul(parser.buffer, 0, &val))
                         break;
@@ -1236,18 +1234,18 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
                         cnt--;
                 }
 
+                parser->idx = 0;
+
                 /* only spaces were written */
-                if (isspace(ch)) {
+                if (isspace(ch) || !ch) {
                         *ppos += read;
                         ret = read;
                         goto out;
                 }
-
-                parser->idx = 0;
         }
 
         /* read the non-space input */
-        while (cnt && !isspace(ch)) {
+        while (cnt && !isspace(ch) && ch) {
                 if (parser->idx < parser->size - 1)
                         parser->buffer[parser->idx++] = ch;
                 else {
@@ -1262,12 +1260,14 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
         }
 
         /* We either got finished input or we have to wait for another call. */
-        if (isspace(ch)) {
+        if (isspace(ch) || !ch) {
                 parser->buffer[parser->idx] = 0;
                 parser->cont = false;
         } else if (parser->idx < parser->size - 1) {
                 parser->cont = true;
                 parser->buffer[parser->idx++] = ch;
+                /* Make sure the parsed string always terminates with '\0'. */
+                parser->buffer[parser->idx] = 0;
         } else {
                 ret = -EINVAL;
                 goto out;
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 1b87157edbff..05c7172c6667 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -885,8 +885,6 @@ ftrace_event_write(struct file *file, const char __user *ubuf,
                 if (*parser.buffer == '!')
                         set = 0;
 
-                parser.buffer[parser.idx] = 0;
-
                 ret = ftrace_set_clr_event(tr, parser.buffer + !set, set);
                 if (ret)
                         goto out_put;
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 61e7f0678d33..a764aec3c9a1 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -400,7 +400,6 @@ enum regex_type filter_parse_regex(char *buff, int len, char **search, int *not)
         for (i = 0; i < len; i++) {
                 if (buff[i] == '*') {
                         if (!i) {
-                                *search = buff + 1;
                                 type = MATCH_END_ONLY;
                         } else if (i == len - 1) {
                                 if (type == MATCH_END_ONLY)
@@ -410,14 +409,14 @@ enum regex_type filter_parse_regex(char *buff, int len, char **search, int *not)
                                 buff[i] = 0;
                                 break;
                         } else {        /* pattern continues, use full glob */
-                                type = MATCH_GLOB;
-                                break;
+                                return MATCH_GLOB;
                         }
                 } else if (strchr("[?\\", buff[i])) {
-                        type = MATCH_GLOB;
-                        break;
+                        return MATCH_GLOB;
                 }
         }
+        if (buff[0] == '*')
+                *search = buff + 1;
 
         return type;
 }
diff --git a/kernel/trace/trace_selftest_dynamic.c b/kernel/trace/trace_selftest_dynamic.c
index 8cda06a10d66..c364cf777e1a 100644
--- a/kernel/trace/trace_selftest_dynamic.c
+++ b/kernel/trace/trace_selftest_dynamic.c
@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0
+#include <linux/compiler.h>
 #include "trace.h"
 
-int DYN_FTRACE_TEST_NAME(void)
+noinline __noclone int DYN_FTRACE_TEST_NAME(void)
 {
         /* used to call mcount */
         return 0;
 }
 
-int DYN_FTRACE_TEST_NAME2(void)
+noinline __noclone int DYN_FTRACE_TEST_NAME2(void)
 {
         /* used to call mcount */
         return 0;
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 40592e7b3568..268029ae1be6 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -608,7 +608,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
 
         /* Don't print "0x  (null)" when offset is 0 */
         if (tu->offset) {
-                seq_printf(m, "0x%p", (void *)tu->offset);
+                seq_printf(m, "0x%px", (void *)tu->offset);
         } else {
                 switch (sizeof(void *)) {
                 case 4: