modpost: check for NULL filename pointer in find_module()
PATCH 1/1 modpost: check for NULL filename pointer in find_module()
Pointer for dump filename can be NULL when a module is not created from a dump file in modpost. The find_module() function should therefore check whether the dump filename pointers are NULL before comparing them using strcmp().
--- scripts/mod/modpost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
scripts/mod/modpost.c +6 -2
@@ -178,8 +178,12 @@ static struct module *find_module(const char *filename, const char *modname)struct module *mod;list_for_each_entry (mod, &modules, list) { -if (!strcmp (mod->dump_file, filename) && - !strcmp (mod->name, modname)) +if (strcmp (mod->name, modname) !=0 ) +continue ; +if (!mod->dump_file && !filename) +return mod; +if (mod->dump_file && filename && + !strcmp (mod->dump_file, filename))return mod; }return NULL ;
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
Quoted 5 lines · Siddharth Nayyar
Pointer for dump filename can be NULL when a module is not created from a dump file in modpost. The
find_module()function should therefore check whether the dump filename pointers are NULL before comparing them usingstrcmp().
I do not understand.
I do not think that scenario would happen.
There are two call-sites for new_module():
[1] https://github.com/torvalds/linux/blob/v6.15/scripts/mod/modpost.c#L1576
[2] https://github.com/torvalds/linux/blob/v6.15/scripts/mod/modpost.c#L2117
For [2], mod->dump_file is set in the next line.
[1] is always called after read_dump(), where
is the only user of find_module(). [3]
[3]: https://github.com/torvalds/linux/blob/v6.15/scripts/mod/modpost.c#L2115
Quoted 27 lines
Signed-off-by Siddharth Nayyar <[email protected]>--- scripts/mod/modpost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)scripts/mod/modpost.c +6
-3@@ -178,8 +178,12 @@ static struct module *find_module(const char *filename, const char *modname)struct module *mod;list_for_each_entry (mod, &modules, list) { -if (!strcmp (mod->dump_file, filename) && - !strcmp (mod->name, modname)) +if (strcmp (mod->name, modname) !=0 ) +continue ; +if (!mod->dump_file && !filename) +return mod; +if (mod->dump_file && filename && + !strcmp (mod->dump_file, filename))return mod; }return NULL ; --2.50.0.727.gbf7dc18ff4-goog
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 16 lines · Masahiro Yamada
Quoted 5 lines · Siddharth Nayyar
Pointer for dump filename can be NULL when a module is not created from a dump file in modpost. The
find_module()function should therefore check whether the dump filename pointers are NULL before comparing them usingstrcmp().I do not understand.
I do not think that scenario would happen.There are two call-sites for
new_module():
[1] https://github.com/torvalds/linux/blob/v6.15/scripts/mod/modpost.c#L1576
[2] https://github.com/torvalds/linux/blob/v6.15/scripts/mod/modpost.c#L2117
Quoted 6 lines
For [2],
mod->dump_fileis set in the next line.[1] is always called after
read_dump(), where
is the only user offind_module(). [3][3]: https://github.com/torvalds/linux/blob/v6.15/scripts/mod/modpost.c#L2115
I see that this is not broken at the moment.
I was working on a patch series where I am making use of find_module() after read_symbols() is called on vmlinux and other object files for modules. I realised that find_module() does not work as expected and decided to send a fix generally. If you think find_module() does not need to support the general case of finding modules after read_symbols(), I can keep this change in my patch series and not submit it separately.
--
Regards,
Sid