ftrace: drop a VLA in module_exists()
PATCH 1/1 ftrace: drop a VLA in module_exists()
Avoid a VLA[1] by using a real constant expression instead of a variable. The compiler should be able to optimize the original code and avoid using an actual VLA. Anyway this change is useful because it will avoid a false positive with -Wvla, it might also help the compiler generating better code.
[1] https://lkml.org/lkml/2018/3/7/621
--- kernel/trace/ftrace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +3 -4
@@ -3902,14 +3902,13 @@ static bool module_exists(const char *module) {/* All modules have the symbol __this_module */ const char this_mod[] ="__this_module" ; -const int modname_size =MAX_PARAM_PREFIX_LEN +sizeof (this_mod) +1 ; -char modname[modname_size +1 ]; +char modname[MAX_PARAM_PREFIX_LEN +sizeof (this_mod) +1 ];unsigned long val;int n; - n =snprintf (modname, modname_size +1 ,"%s:%s" , module, this_mod); + n =snprintf (modname,sizeof (modname),"%s:%s" , module, this_mod); -if (n > modname_size) +if (n >sizeof (modname) -1 )return false; val =module_kallsyms_lookup_name (modname);
Signature · 1 line
1.9.1
Quoted 18 lines · Salvatore Mesoraca
Avoid a VLA[1] by using a real constant expression instead of a variable. The compiler should be able to optimize the original code and avoid using an actual VLA. Anyway this change is useful because it will avoid a false positive with -Wvla, it might also help the compiler generating better code.
[1] https://lkml.org/lkml/2018/3/7/621
Signed-off-by Salvatore Mesoraca <[email protected]>--- kernel/trace/ftrace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)kernel/trace/ftrace.c +0
-0
kernel/trace/ftrace.c static bool module_exists(const char *module) · line 3905
Quoted 6 lines
kernel/trace/ftrace.c +1
-2@@ -3902,14 +3902,13 @@ static bool module_exists(const char *module) {/* All modules have the symbol __this_module */ const char this_mod[] ="__this_module" ; -const int modname_size =MAX_PARAM_PREFIX_LEN +sizeof (this_mod) +1 ; -char modname[modname_size +1 ]; +char modname[MAX_PARAM_PREFIX_LEN +sizeof (this_mod) +1 ];
Actually, I think this needs to be "+ 2" (":" and NULL).
kernel/trace/ftrace.c static bool module_exists(const char *module) · line 3914
Quoted 11 lines
kernel/trace/ftrace.c +2
-2unsigned long val;int n; - n =snprintf (modname, modname_size +1 ,"%s:%s" , module, this_mod); + n =snprintf (modname,sizeof (modname),"%s:%s" , module, this_mod); -if (n > modname_size) +if (n >sizeof (modname) -1 )return false; val =module_kallsyms_lookup_name (modname);
Otherwise, looks good!
-Kees
Signature · 2 lines
Kees Cook Pixel Security
2018-03-27 1:16 GMT+02:00 Kees Cook <[email protected]>:
Quoted 15 lines
Quoted 13 lines · Salvatore Mesoraca
Avoid a VLA[1] by using a real constant expression instead of a variable. The compiler should be able to optimize the original code and avoid using an actual VLA. Anyway this change is useful because it will avoid a false positive with -Wvla, it might also help the compiler generating better code.
[1] https://lkml.org/lkml/2018/3/7/621
Signed-off-by Salvatore Mesoraca <[email protected]>--- kernel/trace/ftrace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Quoted 13 lines
kernel/trace/ftrace.c static bool module_exists(const char *module) · line 3905
Quoted 11 lines
kernel/trace/ftrace.c +1
-2@@ -3902,14 +3902,13 @@ static bool module_exists(const char *module) {/* All modules have the symbol __this_module */ const char this_mod[] ="__this_module" ; -const int modname_size =MAX_PARAM_PREFIX_LEN +sizeof (this_mod) +1 ; -char modname[modname_size +1 ]; +char modname[MAX_PARAM_PREFIX_LEN +sizeof (this_mod) +1 ];Actually, I think this needs to be "+ 2" (":" and NULL).
Ah, right! I'll fix it ASAP :)
Quoted 7 lines
Quoted 7 lines
kernel/trace/ftrace.c +1
-1unsigned long val;int n; - n =snprintf (modname, modname_size +1 ,"%s:%s" , module, this_mod); + n =snprintf (modname,sizeof (modname),"%s:%s" , module, this_mod);
Quoted 7 lines
kernel/trace/ftrace.c static bool module_exists(const char *module) · line 3914
Quoted 5 lines
kernel/trace/ftrace.c +1
-1-if (n > modname_size) +if (n >sizeof (modname) -1 )return false; val =module_kallsyms_lookup_name (modname);Otherwise, looks good!
Thank you!
Salvatore