From: Kees Cook <keescook@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>, Rabin Vincent <rabin@rab.in>,
Rob Herring <robh@kernel.org>,
Laura Abbott <lauraa@codeaurora.org>,
Leif Lindholm <leif.lindholm@linaro.org>,
Stephen Boyd <sboyd@codeaurora.org>,
Mark Salter <msalter@redhat.com>, Liu hua <sdu.liu@huawei.com>,
Nikolay Borisov <Nikolay.Borisov@arm.com>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Tomasz Figa <t.figa@samsung.com>,
Doug Anderson <dianders@google.com>,
Jason Wessel <jason.wessel@windriver.com>,
Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org
Subject: [PATCH v4 3/8] arm: fixmap: implement __set_fixmap()
Date: Wed, 13 Aug 2014 10:06:28 -0700 [thread overview]
Message-ID: <1407949593-16121-4-git-send-email-keescook@chromium.org> (raw)
In-Reply-To: <1407949593-16121-1-git-send-email-keescook@chromium.org>
This is used from set_fixmap() and clear_fixmap() via asm-generic/fixmap.h.
Also makes sure that the fixmap allocation fits into the expected range.
Based on patch by Rabin Vincent.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Rabin Vincent <rabin@rab.in>
---
arch/arm/include/asm/fixmap.h | 2 ++
arch/arm/mm/mmu.c | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h
index d984ca69ce19..714606f70425 100644
--- a/arch/arm/include/asm/fixmap.h
+++ b/arch/arm/include/asm/fixmap.h
@@ -14,6 +14,8 @@ enum fixed_addresses {
__end_of_fixed_addresses
};
+void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot);
+
#include <asm-generic/fixmap.h>
#endif
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 7fa0966cd15f..94eecb913f15 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -22,6 +22,7 @@
#include <asm/cputype.h>
#include <asm/sections.h>
#include <asm/cachetype.h>
+#include <asm/fixmap.h>
#include <asm/sections.h>
#include <asm/setup.h>
#include <asm/smp_plat.h>
@@ -392,6 +393,24 @@ SET_MEMORY_FN(rw, pte_set_rw)
SET_MEMORY_FN(x, pte_set_x)
SET_MEMORY_FN(nx, pte_set_nx)
+void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)
+{
+ unsigned long vaddr = __fix_to_virt(idx);
+ pte_t *pte = pte_offset_kernel(pmd_off_k(vaddr), vaddr);
+
+ /* Make sure fixmap region does not exceed available allocation. */
+ BUILD_BUG_ON(FIXADDR_START + (__end_of_fixed_addresses * PAGE_SIZE) >
+ FIXADDR_END);
+ BUG_ON(idx >= __end_of_fixed_addresses);
+
+ if (pgprot_val(prot))
+ set_pte_at(NULL, vaddr, pte,
+ pfn_pte(phys >> PAGE_SHIFT, prot));
+ else
+ pte_clear(NULL, vaddr, pte);
+ flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);
+}
+
/*
* Adjust the PMD section entries according to the CPU in use.
*/
--
1.9.1
next prev parent reply other threads:[~2014-08-13 17:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-13 17:06 [PATCH v4 0/8] arm: support CONFIG_RODATA Kees Cook
2014-08-13 17:06 ` [PATCH v4 1/8] arm: use generic fixmap.h Kees Cook
2014-08-13 17:06 ` [PATCH v4 2/8] ARM: expand fixmap region to 3MB Kees Cook
2014-08-19 12:26 ` Will Deacon
2014-08-20 12:16 ` Kees Cook
2014-08-26 14:37 ` Will Deacon
2014-08-13 17:06 ` Kees Cook [this message]
2014-08-13 17:06 ` [PATCH v4 4/8] arm: use fixmap for text patching when text is RO Kees Cook
2014-08-19 12:29 ` Will Deacon
2014-08-20 12:28 ` Kees Cook
2014-09-03 21:43 ` Kees Cook
2014-09-04 9:27 ` Will Deacon
2014-09-04 14:00 ` Kees Cook
2014-09-04 14:06 ` Will Deacon
2014-08-13 17:06 ` [PATCH v4 5/8] ARM: kexec: Make .text R/W in machine_kexec Kees Cook
2014-08-13 17:06 ` [PATCH v4 6/8] arm: kgdb: Handle read-only text / modules Kees Cook
2014-08-13 17:06 ` [PATCH v4 7/8] ARM: mm: allow non-text sections to be non-executable Kees Cook
2014-08-19 12:33 ` Will Deacon
2014-08-20 12:37 ` Kees Cook
2014-08-26 14:43 ` Will Deacon
2014-08-29 16:04 ` Kees Cook
2014-08-31 14:59 ` Rabin Vincent
2014-08-13 17:06 ` [PATCH v4 8/8] ARM: mm: allow text and rodata sections to be read-only Kees Cook
2014-08-19 12:36 ` Will Deacon
2014-08-20 12:52 ` Kees Cook
2014-08-13 17:38 ` [PATCH v4 0/8] arm: support CONFIG_RODATA Nicolas Pitre
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=1407949593-16121-4-git-send-email-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=Nikolay.Borisov@arm.com \
--cc=catalin.marinas@arm.com \
--cc=dianders@google.com \
--cc=jason.wessel@windriver.com \
--cc=lauraa@codeaurora.org \
--cc=leif.lindholm@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=msalter@redhat.com \
--cc=nicolas.pitre@linaro.org \
--cc=rabin@rab.in \
--cc=robh@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=sdu.liu@huawei.com \
--cc=t.figa@samsung.com \
--cc=will.deacon@arm.com \
/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
all inboxes | Powered by JetHome®