AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-11-23 23:10:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

libkmod: always detect the module compression

Browse Source 
Currently, when built w/o given compression we'll incorrectly report a
"compression_none".

As we reach do_finit_module(), we'll naively assume that the kernel can
handle the compressed module, yet omit the MODULE_INIT_COMPRESSED_FILE
flag.

As result the kernel will barf at us, do_finit_module will fail with non
-ENOSYS and we won't end in the do_init_module codepath (which will also
fail).

In other words: with this change, you can build kmod without zstd, xz
and zlib support and the kernel will load the modules, assuming it
supports the format \o/

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
This commit is contained in:
Emil Velikov 2024-02-12 17:23:09 +00:00 committed by Lucas De Marchi
parent 8cc475f7da
commit 0c12738807
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libkmod/libkmod-file.c
View File

@ -174,9 +174,14 @@ out:
free((void *)zst_outb.dst);
return ret;
}
#else
static int load_zstd(struct kmod_file *file)
{
return -ENOSYS;
}
#endif
static const char magic_zstd[] = {0x28, 0xB5, 0x2F, 0xFD};
#endif
#ifdef ENABLE_XZ
static void xz_uncompress_belch(struct kmod_file *file, lzma_ret ret)
@ -275,9 +280,14 @@ static int load_xz(struct kmod_file *file)
lzma_end(&strm);
return ret;
}
#else
static int load_xz(struct kmod_file *file)
{
return -ENOSYS;
}
#endif
static const char magic_xz[] = {0xfd, '7', 'z', 'X', 'Z', 0};
#endif
#ifdef ENABLE_ZLIB
#define READ_STEP (4 * 1024 * 1024)
@ -339,9 +349,14 @@ error:
gzclose(gzf); /* closes the gzfd */
return err;
}
#else
static int load_zlib(struct kmod_file *file)
{
return -ENOSYS;
}
#endif
static const char magic_zlib[] = {0x1f, 0x8b};
#endif
static const struct comp_type {
size_t magic_size;
@ -349,15 +364,9 @@ static const struct comp_type {
const char *magic_bytes;
int (*load)(struct kmod_file *file);
} comp_types[] = {
#ifdef ENABLE_ZSTD
{sizeof(magic_zstd), KMOD_FILE_COMPRESSION_ZSTD, magic_zstd, load_zstd},
#endif
#ifdef ENABLE_XZ
{sizeof(magic_xz), KMOD_FILE_COMPRESSION_XZ, magic_xz, load_xz},
#endif
#ifdef ENABLE_ZLIB
{sizeof(magic_zlib), KMOD_FILE_COMPRESSION_ZLIB, magic_zlib, load_zlib},
#endif
{0, KMOD_FILE_COMPRESSION_NONE, NULL, NULL}
};