Merge tag 'trace-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index b24c573934af10fa93c41abeab05bef223c9ee89..3740aca79fe73aaa9a51653124c5c3c23c831052 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5770,7 +5770,7 @@ bool ftrace_filter_param __initdata;
 static int __init set_ftrace_notrace(char *str)
 {
        ftrace_filter_param = true;
-       strlcpy(ftrace_notrace_buf, str, FTRACE_FILTER_SIZE);
+       strscpy(ftrace_notrace_buf, str, FTRACE_FILTER_SIZE);
        return 1;
 }
 __setup("ftrace_notrace=", set_ftrace_notrace);
@@ -5778,7 +5778,7 @@ __setup("ftrace_notrace=", set_ftrace_notrace);
 static int __init set_ftrace_filter(char *str)
 {
        ftrace_filter_param = true;
-       strlcpy(ftrace_filter_buf, str, FTRACE_FILTER_SIZE);
+       strscpy(ftrace_filter_buf, str, FTRACE_FILTER_SIZE);
        return 1;
 }
 __setup("ftrace_filter=", set_ftrace_filter);
@@ -5790,14 +5790,14 @@ static int ftrace_graph_set_hash(struct ftrace_hash *hash, char *buffer);
 
 static int __init set_graph_function(char *str)
 {
-       strlcpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);
+       strscpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);
        return 1;
 }
 __setup("ftrace_graph_filter=", set_graph_function);
 
 static int __init set_graph_notrace_function(char *str)
 {
-       strlcpy(ftrace_graph_notrace_buf, str, FTRACE_FILTER_SIZE);
+       strscpy(ftrace_graph_notrace_buf, str, FTRACE_FILTER_SIZE);
        return 1;
 }
 __setup("ftrace_graph_notrace=", set_graph_notrace_function);
@@ -6606,8 +6606,8 @@ static int ftrace_get_trampoline_kallsym(unsigned int symnum,
                        continue;
                *value = op->trampoline;
                *type = 't';
-               strlcpy(name, FTRACE_TRAMPOLINE_SYM, KSYM_NAME_LEN);
-               strlcpy(module_name, FTRACE_TRAMPOLINE_MOD, MODULE_NAME_LEN);
+               strscpy(name, FTRACE_TRAMPOLINE_SYM, KSYM_NAME_LEN);
+               strscpy(module_name, FTRACE_TRAMPOLINE_MOD, MODULE_NAME_LEN);
                *exported = 0;
                return 0;
        }
@@ -6970,7 +6970,7 @@ ftrace_func_address_lookup(struct ftrace_mod_map *mod_map,
                if (off)
                        *off = addr - found_func->ip;
                if (sym)
-                       strlcpy(sym, found_func->name, KSYM_NAME_LEN);
+                       strscpy(sym, found_func->name, KSYM_NAME_LEN);
 
                return found_func->name;
        }
@@ -7024,8 +7024,8 @@ int ftrace_mod_get_kallsym(unsigned int symnum, unsigned long *value,
 
                        *value = mod_func->ip;
                        *type = 'T';
-                       strlcpy(name, mod_func->name, KSYM_NAME_LEN);
-                       strlcpy(module_name, mod_map->mod->name, MODULE_NAME_LEN);
+                       strscpy(name, mod_func->name, KSYM_NAME_LEN);
+                       strscpy(module_name, mod_map->mod->name, MODULE_NAME_LEN);
                        *exported = 1;
                        preempt_enable();
                        return 0;