From: Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@kernel.org> To: linux-modules@vger.kernel.org Cc: Emil Velikov <emil.l.velikov@gmail.com> Subject: [PATCH kmod 12/13] libkmod: keep KMOD_FILE_COMPRESSION_NONE/load_reg in comp_types Date: Mon, 12 Feb 2024 17:23:13 +0000 [thread overview] Message-ID: <20240212-decompression-fixes-v1-12-06f92ad07985@gmail.com> (raw) In-Reply-To: <20240212-decompression-fixes-v1-0-06f92ad07985@gmail.com> From: Emil Velikov <emil.l.velikov@gmail.com> It's cleaner to handle all compression types and load functions in the same style. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> --- libkmod/libkmod-file.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c index db775a6..f162a10 100644 --- a/libkmod/libkmod-file.c +++ b/libkmod/libkmod-file.c @@ -385,7 +385,7 @@ static const struct comp_type { {sizeof(magic_zstd), KMOD_FILE_COMPRESSION_ZSTD, magic_zstd, load_zstd}, {sizeof(magic_xz), KMOD_FILE_COMPRESSION_XZ, magic_xz, load_xz}, {sizeof(magic_zlib), KMOD_FILE_COMPRESSION_ZLIB, magic_zlib, load_zlib}, - {0, KMOD_FILE_COMPRESSION_NONE, NULL, NULL} + {0, KMOD_FILE_COMPRESSION_NONE, NULL, load_reg} }; struct kmod_elf *kmod_file_get_elf(struct kmod_file *file) @@ -409,7 +409,6 @@ struct kmod_file *kmod_file_open(const struct kmod_ctx *ctx, const char *filename) { struct kmod_file *file = calloc(1, sizeof(struct kmod_file)); - const struct comp_type *itr; char buf[7]; ssize_t sz; @@ -439,19 +438,17 @@ struct kmod_file *kmod_file_open(const struct kmod_ctx *ctx, return NULL; } - for (itr = comp_types; itr->load != NULL; itr++) { - if (memcmp(buf, itr->magic_bytes, itr->magic_size) == 0) { - file->load = itr->load; - file->compression = itr->compression; + for (unsigned int i = 0; i < ARRAY_SIZE(comp_types); i++) { + const struct comp_type *itr = &comp_types[i]; + + file->load = itr->load; + file->compression = itr->compression; + if (itr->magic_size && + memcmp(buf, itr->magic_bytes, itr->magic_size) == 0) { break; } } - if (file->load == NULL) { - file->load = load_reg; - file->compression = KMOD_FILE_COMPRESSION_NONE; - } - file->ctx = ctx; return file; -- 2.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Emil Velikov <emil.l.velikov@gmail.com> To: linux-modules@vger.kernel.org Cc: Emil Velikov <emil.l.velikov@gmail.com> Subject: [PATCH kmod 12/13] libkmod: keep KMOD_FILE_COMPRESSION_NONE/load_reg in comp_types Date: Mon, 12 Feb 2024 17:23:13 +0000 [thread overview] Message-ID: <20240212-decompression-fixes-v1-12-06f92ad07985@gmail.com> (raw) In-Reply-To: <20240212-decompression-fixes-v1-0-06f92ad07985@gmail.com> It's cleaner to handle all compression types and load functions in the same style. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> --- libkmod/libkmod-file.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c index db775a6..f162a10 100644 --- a/libkmod/libkmod-file.c +++ b/libkmod/libkmod-file.c @@ -385,7 +385,7 @@ static const struct comp_type { {sizeof(magic_zstd), KMOD_FILE_COMPRESSION_ZSTD, magic_zstd, load_zstd}, {sizeof(magic_xz), KMOD_FILE_COMPRESSION_XZ, magic_xz, load_xz}, {sizeof(magic_zlib), KMOD_FILE_COMPRESSION_ZLIB, magic_zlib, load_zlib}, - {0, KMOD_FILE_COMPRESSION_NONE, NULL, NULL} + {0, KMOD_FILE_COMPRESSION_NONE, NULL, load_reg} }; struct kmod_elf *kmod_file_get_elf(struct kmod_file *file) @@ -409,7 +409,6 @@ struct kmod_file *kmod_file_open(const struct kmod_ctx *ctx, const char *filename) { struct kmod_file *file = calloc(1, sizeof(struct kmod_file)); - const struct comp_type *itr; char buf[7]; ssize_t sz; @@ -439,19 +438,17 @@ struct kmod_file *kmod_file_open(const struct kmod_ctx *ctx, return NULL; } - for (itr = comp_types; itr->load != NULL; itr++) { - if (memcmp(buf, itr->magic_bytes, itr->magic_size) == 0) { - file->load = itr->load; - file->compression = itr->compression; + for (unsigned int i = 0; i < ARRAY_SIZE(comp_types); i++) { + const struct comp_type *itr = &comp_types[i]; + + file->load = itr->load; + file->compression = itr->compression; + if (itr->magic_size && + memcmp(buf, itr->magic_bytes, itr->magic_size) == 0) { break; } } - if (file->load == NULL) { - file->load = load_reg; - file->compression = KMOD_FILE_COMPRESSION_NONE; - } - file->ctx = ctx; return file; -- 2.43.0
next prev parent reply other threads:[~2024-02-12 17:23 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-02-12 17:23 [PATCH kmod 00/13] Load compressed modules with compression-less kmod Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-02-12 17:23 ` [PATCH kmod 01/13] libkmod: use a dup()'d fd for zlib Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:13 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 02/13] libkmod: keep gzFile gzf local to load_zlib() Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 21:52 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 03/13] libkmod: remove kmod_file::{zstd,xz}_used flags Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 21:54 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 04/13] libkmod: clear file->memory if map fails Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:13 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 05/13] libkmod: nuke struct file_ops Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:13 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 06/13] libkmod: propagate {zstd,xz,zlib}_load errors Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:14 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 07/13] libkmod: move kmod_file_load_contents as applicable Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:14 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 08/13] libkmod: always detect the module compression Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-02-13 16:33 ` Emil Velikov 2024-04-29 23:13 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 09/13] libkmod: swap alloca usage for a few assert_cc Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:19 ` Lucas De Marchi 2024-04-30 17:39 ` Lucas De Marchi 2024-04-30 17:54 ` Emil Velikov 2024-04-30 18:17 ` Lucas De Marchi 2024-04-30 18:27 ` Emil Velikov 2024-04-30 18:43 ` Lucas De Marchi 2024-04-30 18:47 ` Emil Velikov 2024-04-30 20:36 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 10/13] libkmod: tidy-up kmod_file_open() Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:25 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 11/13] libkmod: move load_reg() further up Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:30 ` Lucas De Marchi 2024-02-12 17:23 ` Emil Velikov via B4 Relay [this message] 2024-02-12 17:23 ` [PATCH kmod 12/13] libkmod: keep KMOD_FILE_COMPRESSION_NONE/load_reg in comp_types Emil Velikov 2024-04-29 23:32 ` Lucas De Marchi 2024-02-12 17:23 ` [PATCH kmod 13/13] libkmod: always fallback to do_init_module() Emil Velikov via B4 Relay 2024-02-12 17:23 ` Emil Velikov 2024-04-29 23:39 ` Lucas De Marchi 2024-04-30 17:48 ` Emil Velikov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240212-decompression-fixes-v1-12-06f92ad07985@gmail.com \ --to=devnull+emil.l.velikov.gmail.com@kernel.org \ --cc=emil.l.velikov@gmail.com \ --cc=linux-modules@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.