From: Lucas De Marchi <lucas.demarchi@intel.com>
To: <emil.l.velikov@gmail.com>
Cc: <linux-modules@vger.kernel.org>
Subject: Re: [PATCH kmod 04/13] libkmod: clear file->memory if map fails
Date: Mon, 29 Apr 2024 18:13:31 -0500 [thread overview]
Message-ID: <dqayzwd635hfjtxaiiy3ad76o3cs2kzyabh3j4ldfzn4lavslp@xpsnjpupu4l3> (raw)
In-Reply-To: <20240212-decompression-fixes-v1-4-06f92ad07985@gmail.com>
On Mon, Feb 12, 2024 at 05:23:05PM GMT, Emil Velikov via B4 Relay wrote:
>From: Emil Velikov <emil.l.velikov@gmail.com>
>
>On mmap failure file->memory is set to -1, which we'll happily pass down
>to munmap later on.
>
>More importantly, since we do a NULL check in kmod_file_load_contents()
>we will exit the function without (re)attempting the load again.
>
>Since we ignore the return code for the load function(s), one can end up
>calling kmod_elf_get_memory() and feed that -1 into init_module.
>
>Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Lucas De Marchi
>---
> libkmod/libkmod-file.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c
>index abd4723..b408aed 100644
>--- a/libkmod/libkmod-file.c
>+++ b/libkmod/libkmod-file.c
>@@ -392,8 +392,10 @@ static int load_reg(struct kmod_file *file)
> file->size = st.st_size;
> file->memory = mmap(NULL, file->size, PROT_READ, MAP_PRIVATE,
> file->fd, 0);
>- if (file->memory == MAP_FAILED)
>+ if (file->memory == MAP_FAILED) {
>+ file->memory = NULL;
> return -errno;
>+ }
>
> return 0;
> }
>
>--
>2.43.0
>
next prev parent reply other threads:[~2024-04-29 23:14 UTC|newest]
Thread overview: 36+ 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 ` [PATCH kmod 01/13] libkmod: use a dup()'d fd for zlib Emil Velikov via B4 Relay
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-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-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-04-29 23:13 ` Lucas De Marchi [this message]
2024-02-12 17:23 ` [PATCH kmod 05/13] libkmod: nuke struct file_ops Emil Velikov via B4 Relay
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-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-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-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-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-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-04-29 23:30 ` Lucas De Marchi
2024-02-12 17:23 ` [PATCH kmod 12/13] libkmod: keep KMOD_FILE_COMPRESSION_NONE/load_reg in comp_types Emil Velikov via B4 Relay
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-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=dqayzwd635hfjtxaiiy3ad76o3cs2kzyabh3j4ldfzn4lavslp@xpsnjpupu4l3 \
--to=lucas.demarchi@intel.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).