From: Dmitry Antipov Date: Fri, 19 May 2023 09:36:30 +0000 (+0300) Subject: libkmod, depmod: prefer -ENODATA over -ENOENT if no section found X-Git-Tag: v31~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c004af29daf38119cc472dc8f1f080f10da6d82;p=thirdparty%2Fkmod.git libkmod, depmod: prefer -ENODATA over -ENOENT if no section found When the module is definitely present but CONFIG_MODVERSIONS is disabled, the following error message may be somewhat confusing: modprobe --dump-modversions /path/to/module.ko.xz modprobe: FATAL: could not get modversions of /path/to/module.ko.xz: No such file or directory Choosing among the convenient errno values, I would suggest to use ENODATA when the module lacks a particular ELF section (and vermagic as well). So now it is expected to be: modprobe: FATAL: could not get modversions of /path/to/module.ko.xz: No data available Reviewed-by: Christophe Leroy Signed-off-by: Dmitry Antipov Link: https://lore.kernel.org/r/20230519093630.474185-1-dmantipov@yandex.ru --- diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c index ef4a8a31..fb2e3d92 100644 --- a/libkmod/libkmod-elf.c +++ b/libkmod/libkmod-elf.c @@ -392,7 +392,7 @@ static int elf_find_section(const struct kmod_elf *elf, const char *section) return i; } - return -ENOENT; + return -ENODATA; } int kmod_elf_get_section(const struct kmod_elf *elf, const char *section, const void **buf, uint64_t *buf_size) @@ -422,7 +422,7 @@ int kmod_elf_get_section(const struct kmod_elf *elf, const char *section, const return 0; } - return -ENOENT; + return -ENODATA; } /* array will be allocated with strings in a single malloc, just free *array */ @@ -653,7 +653,7 @@ int kmod_elf_strip_vermagic(struct kmod_elf *elf) } ELFDBG(elf, "no vermagic found in .modinfo\n"); - return -ENOENT; + return -ENODATA; } diff --git a/tools/depmod.c b/tools/depmod.c index a2c39b3f..1d1d41db 100644 --- a/tools/depmod.c +++ b/tools/depmod.c @@ -1586,7 +1586,7 @@ static int depmod_load_modules(struct depmod *depmod) struct kmod_list *l, *list = NULL; int err = kmod_module_get_symbols(mod->kmod, &list); if (err < 0) { - if (err == -ENOENT) + if (err == -ENODATA) DBG("ignoring %s: no symbols\n", mod->path); else ERR("failed to load symbols from %s: %s\n",