From: Laura Abbott <labbott@redhat.com>
To: Mark Rutland <mark.rutland@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <labbott@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Andrew Morton <akpm@linux-foundation.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCHv6 10/11] mm/usercopy: Switch to using lm_alias
Date: Tue, 3 Jan 2017 09:21:52 -0800 [thread overview]
Message-ID: <1483464113-1587-11-git-send-email-labbott@redhat.com> (raw)
In-Reply-To: <1483464113-1587-1-git-send-email-labbott@redhat.com>
The usercopy checking code currently calls __va(__pa(...)) to check for
aliases on symbols. Switch to using lm_alias instead.
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
mm/usercopy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/usercopy.c b/mm/usercopy.c
index 3c8da0a..8345299 100644
--- a/mm/usercopy.c
+++ b/mm/usercopy.c
@@ -108,13 +108,13 @@ static inline const char *check_kernel_text_object(const void *ptr,
* __pa() is not just the reverse of __va(). This can be detected
* and checked:
*/
- textlow_linear = (unsigned long)__va(__pa(textlow));
+ textlow_linear = (unsigned long)lm_alias(textlow);
/* No different mapping: we're done. */
if (textlow_linear == textlow)
return NULL;
/* Check the secondary mapping... */
- texthigh_linear = (unsigned long)__va(__pa(texthigh));
+ texthigh_linear = (unsigned long)lm_alias(texthigh);
if (overlaps(ptr, n, textlow_linear, texthigh_linear))
return "<linear kernel text>";
--
2.7.4
next prev parent reply other threads:[~2017-01-03 17:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-03 17:21 [PATCHv6 00/11] CONFIG_DEBUG_VIRTUAL for arm64 Laura Abbott
2017-01-03 17:21 ` [PATCHv6 01/11] lib/Kconfig.debug: Add ARCH_HAS_DEBUG_VIRTUAL Laura Abbott
2017-01-03 17:21 ` [PATCHv6 02/11] mm/cma: Cleanup highmem check Laura Abbott
2017-01-03 17:21 ` [PATCHv6 03/11] arm64: Move some macros under #ifndef __ASSEMBLY__ Laura Abbott
2017-01-03 17:21 ` [PATCHv6 04/11] arm64: Add cast for virt_to_pfn Laura Abbott
2017-01-03 17:21 ` [PATCHv6 05/11] mm: Introduce lm_alias Laura Abbott
2017-01-03 17:21 ` [PATCHv6 06/11] arm64: Use __pa_symbol for kernel symbols Laura Abbott
2017-01-03 17:21 ` [PATCHv6 07/11] drivers: firmware: psci: Use __pa_symbol for kernel symbol Laura Abbott
2017-01-03 17:21 ` [PATCHv6 08/11] kexec: Switch to __pa_symbol Laura Abbott
2017-01-03 17:21 ` [PATCHv6 09/11] mm/kasan: Switch to using __pa_symbol and lm_alias Laura Abbott
2017-01-03 17:21 ` Laura Abbott [this message]
2017-01-03 17:21 ` [PATCHv6 11/11] arm64: Add support for CONFIG_DEBUG_VIRTUAL Laura Abbott
2017-01-03 22:56 ` [PATCHv6 00/11] CONFIG_DEBUG_VIRTUAL for arm64 Florian Fainelli
2017-01-03 23:25 ` Laura Abbott
2017-01-04 11:44 ` Will Deacon
2017-01-04 22:30 ` Florian Fainelli
2017-01-10 12:41 ` Will Deacon
2017-01-04 1:14 ` [PATCH v5 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2017-01-04 1:14 ` [PATCH v5 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2017-01-04 1:14 ` [PATCH v5 2/4] ARM: Define KERNEL_START and KERNEL_END Florian Fainelli
2017-01-04 15:58 ` Hartley Sweeten
2017-01-04 17:36 ` Florian Fainelli
2017-01-04 1:14 ` [PATCH v5 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2017-01-04 17:20 ` Laura Abbott
2017-01-04 1:14 ` [PATCH v5 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2017-01-04 17:31 ` Laura Abbott
2017-01-04 22:39 ` [PATCH v6 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2017-01-04 22:39 ` [PATCH v6 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2017-01-04 22:39 ` [PATCH v6 2/4] ARM: Define KERNEL_START and KERNEL_END Florian Fainelli
2017-01-04 22:39 ` [PATCH v6 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2017-01-04 22:39 ` [PATCH v6 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2017-01-15 3:01 ` [PATCH v6 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
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=1483464113-1587-11-git-send-email-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=hpa@zytor.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=x86@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).