@@ -5743,15 +5743,15 @@ bool ftrace_filter_param __initdata;
5743
5743
static int __init set_ftrace_notrace (char * str )
5744
5744
{
5745
5745
ftrace_filter_param = true;
5746
- strlcpy (ftrace_notrace_buf , str , FTRACE_FILTER_SIZE );
5746
+ strscpy (ftrace_notrace_buf , str , FTRACE_FILTER_SIZE );
5747
5747
return 1 ;
5748
5748
}
5749
5749
__setup ("ftrace_notrace=" , set_ftrace_notrace );
5750
5750
5751
5751
static int __init set_ftrace_filter (char * str )
5752
5752
{
5753
5753
ftrace_filter_param = true;
5754
- strlcpy (ftrace_filter_buf , str , FTRACE_FILTER_SIZE );
5754
+ strscpy (ftrace_filter_buf , str , FTRACE_FILTER_SIZE );
5755
5755
return 1 ;
5756
5756
}
5757
5757
__setup ("ftrace_filter=" , set_ftrace_filter );
@@ -5763,14 +5763,14 @@ static int ftrace_graph_set_hash(struct ftrace_hash *hash, char *buffer);
5763
5763
5764
5764
static int __init set_graph_function (char * str )
5765
5765
{
5766
- strlcpy (ftrace_graph_buf , str , FTRACE_FILTER_SIZE );
5766
+ strscpy (ftrace_graph_buf , str , FTRACE_FILTER_SIZE );
5767
5767
return 1 ;
5768
5768
}
5769
5769
__setup ("ftrace_graph_filter=" , set_graph_function );
5770
5770
5771
5771
static int __init set_graph_notrace_function (char * str )
5772
5772
{
5773
- strlcpy (ftrace_graph_notrace_buf , str , FTRACE_FILTER_SIZE );
5773
+ strscpy (ftrace_graph_notrace_buf , str , FTRACE_FILTER_SIZE );
5774
5774
return 1 ;
5775
5775
}
5776
5776
__setup ("ftrace_graph_notrace=" , set_graph_notrace_function );
@@ -6569,8 +6569,8 @@ static int ftrace_get_trampoline_kallsym(unsigned int symnum,
6569
6569
continue ;
6570
6570
* value = op -> trampoline ;
6571
6571
* type = 't' ;
6572
- strlcpy (name , FTRACE_TRAMPOLINE_SYM , KSYM_NAME_LEN );
6573
- strlcpy (module_name , FTRACE_TRAMPOLINE_MOD , MODULE_NAME_LEN );
6572
+ strscpy (name , FTRACE_TRAMPOLINE_SYM , KSYM_NAME_LEN );
6573
+ strscpy (module_name , FTRACE_TRAMPOLINE_MOD , MODULE_NAME_LEN );
6574
6574
* exported = 0 ;
6575
6575
return 0 ;
6576
6576
}
@@ -6933,7 +6933,7 @@ ftrace_func_address_lookup(struct ftrace_mod_map *mod_map,
6933
6933
if (off )
6934
6934
* off = addr - found_func -> ip ;
6935
6935
if (sym )
6936
- strlcpy (sym , found_func -> name , KSYM_NAME_LEN );
6936
+ strscpy (sym , found_func -> name , KSYM_NAME_LEN );
6937
6937
6938
6938
return found_func -> name ;
6939
6939
}
@@ -6987,8 +6987,8 @@ int ftrace_mod_get_kallsym(unsigned int symnum, unsigned long *value,
6987
6987
6988
6988
* value = mod_func -> ip ;
6989
6989
* type = 'T' ;
6990
- strlcpy (name , mod_func -> name , KSYM_NAME_LEN );
6991
- strlcpy (module_name , mod_map -> mod -> name , MODULE_NAME_LEN );
6990
+ strscpy (name , mod_func -> name , KSYM_NAME_LEN );
6991
+ strscpy (module_name , mod_map -> mod -> name , MODULE_NAME_LEN );
6992
6992
* exported = 1 ;
6993
6993
preempt_enable ();
6994
6994
return 0 ;
0 commit comments