OSDN Git Service

modpost: file2alias: check prototype of handler
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 22 Nov 2018 04:28:42 +0000 (13:28 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Apr 2019 07:34:41 +0000 (09:34 +0200)
commit f880eea68fe593342fa6e09be9bb661f3c297aec upstream.

Use specific prototype instead of an opaque pointer so that the
compiler can catch function prototype mismatch.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
scripts/mod/file2alias.c

index 6e3ae94..55b4c0d 100644 (file)
@@ -47,7 +47,7 @@ typedef struct {
 struct devtable {
        const char *device_id; /* name of table, __mod_<name>__*_device_table. */
        unsigned long id_size;
-       void *function;
+       int (*do_entry)(const char *filename, void *symval, char *alias);
 };
 
 /* Define a variable f that holds the value of field f of struct devid
@@ -1228,12 +1228,11 @@ static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 static void do_table(void *symval, unsigned long size,
                     unsigned long id_size,
                     const char *device_id,
-                    void *function,
+                    int (*do_entry)(const char *filename, void *symval, char *alias),
                     struct module *mod)
 {
        unsigned int i;
        char alias[500];
-       int (*do_entry)(const char *, void *entry, char *alias) = function;
 
        device_id_check(mod->name, device_id, size, id_size, symval);
        /* Leave last one: it's the terminator. */
@@ -1346,7 +1345,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
 
                        if (sym_is(name, namelen, p->device_id)) {
                                do_table(symval, sym->st_size, p->id_size,
-                                        p->device_id, p->function, mod);
+                                        p->device_id, p->do_entry, mod);
                                break;
                        }
                }