LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Laura Abbott <lauraa@codeaurora.org>
To: Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <lauraa@codeaurora.org>,
Rusty Russell <rusty@rustcorp.com.au>,
Russell King <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/3] arm64: Don't use is_module_addr in setting page attributes
Date: Wed, 25 Feb 2015 14:14:55 -0800 [thread overview]
Message-ID: <1424902497-32141-2-git-send-email-lauraa@codeaurora.org> (raw)
In-Reply-To: <1424902497-32141-1-git-send-email-lauraa@codeaurora.org>
The set_memory_* functions currently only support module
addresses. The addresses are validated using is_module_addr.
That function is special though and relies on internal state
in the module subsystem to work properly. At the time of
module initialization and calling set_memory_*, it's too early
for is_module_addr to work properly so it always returns
false. Rather than be subject to the whims of the module state,
just bounds check against the module virtual address range.
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
---
arch/arm64/mm/pageattr.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index bb0ea94..1d3ec3d 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -51,7 +51,10 @@ static int change_memory_common(unsigned long addr, int numpages,
WARN_ON_ONCE(1);
}
- if (!is_module_address(start) || !is_module_address(end - 1))
+ if (start < MODULES_VADDR || start >= MODULES_END)
+ return -EINVAL;
+
+ if (end < MODULES_VADDR || end >= MODULES_END)
return -EINVAL;
data.set_mask = set_mask;
--
Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2015-02-25 22:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-25 22:14 [PATCH 0/3] CONFIG_DEBUG_SET_MODULE_RONX fixups Laura Abbott
2015-02-25 22:14 ` Laura Abbott [this message]
2015-03-04 16:47 ` [PATCH 1/3] arm64: Don't use is_module_addr in setting page attributes Catalin Marinas
2015-02-25 22:14 ` [PATCH 2/3] arm: " Laura Abbott
2015-02-25 22:14 ` [PATCH 3/3] kernel/module.c: Update debug alignment after symtable generation Laura Abbott
2015-02-26 1:33 ` Rusty Russell
2015-02-25 22:17 ` [PATCH 0/3] CONFIG_DEBUG_SET_MODULE_RONX fixups Kees Cook
2015-03-24 12:04 ` Paolo Pisati
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=1424902497-32141-2-git-send-email-lauraa@codeaurora.org \
--to=lauraa@codeaurora.org \
--cc=catalin.marinas@arm.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rusty@rustcorp.com.au \
--cc=will.deacon@arm.com \
--subject='Re: [PATCH 1/3] arm64: Don'\''t use is_module_addr in setting page attributes' \
/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
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).