AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-12-20 05:27:54 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

libkmod-module: Simplify kmod_module_insert_module()

Browse Source 
Store the file and elf pointer in the kmod_module structure and have it
freed together with the module.
This commit is contained in:
Michal Marek 2014-02-28 13:05:32 +01:00 committed by Lucas De Marchi
parent be29c40e25
commit c2f4d85a9a
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libkmod/libkmod-module.c
View File

@ -790,8 +790,7 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
int err;
const void *mem;
off_t size;
struct kmod_file *file;
struct kmod_elf *elf = NULL;
struct kmod_elf *elf;
const char *path;
const char *args = options ? options : "";
@ -804,13 +803,13 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
return -ENOSYS;
}
file = kmod_file_open(mod->ctx, path);
if (file == NULL) {
mod->file = kmod_file_open(mod->ctx, path);
if (mod->file == NULL) {
err = -errno;
return err;
}
if (kmod_file_get_direct(file)) {
if (kmod_file_get_direct(mod->file)) {
unsigned int kernel_flags = 0;
if (flags & KMOD_INSERT_FORCE_VERMAGIC)
@ -818,19 +817,16 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
if (flags & KMOD_INSERT_FORCE_MODVERSION)
kernel_flags |= MODULE_INIT_IGNORE_MODVERSIONS;
err = finit_module(kmod_file_get_fd(file), args, kernel_flags);
err = finit_module(kmod_file_get_fd(mod->file), args, kernel_flags);
if (err == 0 || errno != ENOSYS)
goto init_finished;
}
size = kmod_file_get_size(file);
mem = kmod_file_get_contents(file);
if (flags & (KMOD_INSERT_FORCE_VERMAGIC | KMOD_INSERT_FORCE_MODVERSION)) {
elf = kmod_elf_new(mem, size);
elf = kmod_file_get_elf(mod->file);
if (elf == NULL) {
err = -errno;
goto elf_failed;
return err;
}
if (flags & KMOD_INSERT_FORCE_MODVERSION) {
@ -846,7 +842,10 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
}
mem = kmod_elf_get_memory(elf);
} else {
mem = kmod_file_get_contents(mod->file);
}
size = kmod_file_get_size(mod->file);
err = init_module(mem, size, args);
init_finished:
@ -854,12 +853,6 @@ init_finished:
err = -errno;
INFO(mod->ctx, "Failed to insert module '%s': %m\n", path);
}
if (elf != NULL)
kmod_elf_unref(elf);
elf_failed:
kmod_file_unref(file);
return err;
}