Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7de43cb7 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

modpost: file2alias: check prototype of handler 



[ Upstream commit f880eea68fe593342fa6e09be9bb661f3c297aec ]

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

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarMathieu Malaterre <malat@debian.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aa0e8cc9

scripts/mod/file2alias.c

+3 −4
Original line number Diff line number Diff line
@@ -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
@@ -1288,12 +1288,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. */
@@ -1410,7 +1409,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;

			}

		}