From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Luis Chamberlain <mcgrof@kernel.org>, Jessica Yu <jeyu@kernel.org>
Cc: "linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>,
"kgdb-bugreport@lists.sourceforge.net"
<kgdb-bugreport@lists.sourceforge.net>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: [PATCH 2/7] modules: Add within_module_text() macro
Date: Mon, 24 Jan 2022 09:22:19 +0000 [thread overview]
Message-ID: <0cd6fff65c1038286f62c4207c0d2e90b78c5cd4.1643015752.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1643015752.git.christophe.leroy@csgroup.eu>
Add a macro to check whether an address is within module's text.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
include/linux/module.h | 13 +++++++++++++
kernel/module.c | 17 +++++------------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/include/linux/module.h b/include/linux/module.h
index 33b4db8f5ca5..fc7adb110a81 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -570,6 +570,19 @@ static inline bool within_range(unsigned long addr, void *base, unsigned int siz
return addr >= (unsigned long)base && addr < (unsigned long)base + size;
}
+static inline bool within_module_layout_text(unsigned long addr,
+ const struct module_layout *layout)
+{
+ return within_range(addr, layout->base, layout->text_size);
+}
+
+static inline bool within_module_text(unsigned long addr,
+ const struct module *mod)
+{
+ return within_module_layout_text(addr, &mod->core_layout) ||
+ within_module_layout_text(addr, &mod->init_layout);
+}
+
static inline bool within_module_layout(unsigned long addr,
const struct module_layout *layout)
{
diff --git a/kernel/module.c b/kernel/module.c
index 84a9141a5e15..201d27643c84 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4224,11 +4224,6 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
return load_module(&info, uargs, flags);
}
-static inline int within(unsigned long addr, void *start, unsigned long size)
-{
- return ((void *)addr >= start && (void *)addr < start + size);
-}
-
#ifdef CONFIG_KALLSYMS
/*
* This ignores the intensely annoying "mapping symbols" found
@@ -4765,13 +4760,11 @@ bool is_module_text_address(unsigned long addr)
struct module *__module_text_address(unsigned long addr)
{
struct module *mod = __module_address(addr);
- if (mod) {
- /* Make sure it's within the text section. */
- if (!within(addr, mod->init_layout.base, mod->init_layout.text_size)
- && !within(addr, mod->core_layout.base, mod->core_layout.text_size))
- mod = NULL;
- }
- return mod;
+
+ if (mod && within_module_text(addr, mod))
+ return mod;
+
+ return NULL;
}
/* Don't grab lock, we're oopsing. */
--
2.33.1
next prev parent reply other threads:[~2022-01-24 9:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 9:22 [PATCH 0/7] Allocate module text and data separately Christophe Leroy
2022-01-24 9:22 ` [PATCH 1/7] modules: Refactor within_module_core() and within_module_init() Christophe Leroy
2022-01-24 12:32 ` Christoph Hellwig
2022-01-24 13:01 ` Christophe Leroy
2022-01-27 11:32 ` Christophe Leroy
2022-01-26 21:36 ` Mike Rapoport
2022-01-27 11:33 ` Christophe Leroy
2022-01-24 9:22 ` Christophe Leroy [this message]
2022-01-24 9:22 ` [PATCH 3/7] modules: Always have struct mod_tree_root Christophe Leroy
2022-01-24 9:22 ` [PATCH 4/7] modules: Prepare for handling several RB trees Christophe Leroy
2022-01-24 9:22 ` [PATCH 5/7] modules: Introduce data_layout Christophe Leroy
2022-01-24 9:22 ` [PATCH 6/7] modules: Add CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC Christophe Leroy
2022-01-24 21:43 ` Doug Anderson
2022-01-25 5:43 ` Christophe Leroy
2022-01-25 21:10 ` Luis Chamberlain
2022-01-26 6:38 ` Christophe Leroy
2022-02-02 23:34 ` Luis Chamberlain
2022-01-27 16:05 ` Miroslav Benes
2022-01-27 18:04 ` Christophe Leroy
2022-01-24 9:22 ` [PATCH 7/7] powerpc: Select ARCH_WANTS_MODULES_DATA_IN_VMALLOC on book3s/32 and 8xx Christophe Leroy
2022-01-24 12:27 ` kernel test robot
2022-01-25 20:52 ` [PATCH 0/7] Allocate module text and data separately Luis Chamberlain
2022-01-26 5:54 ` Christophe Leroy
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=0cd6fff65c1038286f62c4207c0d2e90b78c5cd4.1643015752.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=jeyu@kernel.org \
--cc=kgdb-bugreport@lists.sourceforge.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mcgrof@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).