* [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start, end} as array
@ 2019-07-05 18:47 Arnd Bergmann
2019-07-05 20:59 ` [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start,end} " Sasha Levin
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2019-07-05 18:47 UTC (permalink / raw)
To: stable
Cc: Mark Rutland, Jisheng Zhang, Kees Cook, Arnd Bergmann,
Sasha Levin, Greg Kroah-Hartman, Will Deacon, linux-kernel,
Sasha Levin, Catalin Marinas, Vincenzo Frascino, linux-arm-kernel
From: Kees Cook <keescook@chromium.org>
Commit dbbb08f500d6146398b794fdc68a8e811366b451 upstream.
Adjust vdso_{start|end} to be char arrays to avoid compile-time analysis
that flags "too large" memcmp() calls with CONFIG_FORTIFY_SOURCE.
Cc: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Suggested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Backported to 4.9, which is lacking the rework from
2077be6783b5 ("arm64: Use __pa_symbol for kernel symbols")
---
arch/arm64/kernel/vdso.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index c9b9a5a322eb..c0f315ecfa7c 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -37,7 +37,7 @@
#include <asm/vdso.h>
#include <asm/vdso_datapage.h>
-extern char vdso_start, vdso_end;
+extern char vdso_start[], vdso_end[];
static unsigned long vdso_pages __ro_after_init;
/*
@@ -124,14 +124,14 @@ static int __init vdso_init(void)
int i;
struct page **vdso_pagelist;
- if (memcmp(&vdso_start, "\177ELF", 4)) {
+ if (memcmp(vdso_start, "\177ELF", 4)) {
pr_err("vDSO is not a valid ELF object!\n");
return -EINVAL;
}
- vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;
+ vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",
- vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data);
+ vdso_pages + 1, vdso_pages, vdso_start, 1L, vdso_data);
/* Allocate the vDSO pagelist, plus a page for the data. */
vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
@@ -144,7 +144,7 @@ static int __init vdso_init(void)
/* Grab the vDSO code pages. */
for (i = 0; i < vdso_pages; i++)
- vdso_pagelist[i + 1] = pfn_to_page(PHYS_PFN(__pa(&vdso_start)) + i);
+ vdso_pagelist[i + 1] = pfn_to_page(PHYS_PFN(__pa(vdso_start)) + i);
vdso_spec[0].pages = &vdso_pagelist[0];
vdso_spec[1].pages = &vdso_pagelist[1];
--
2.20.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start, end} as array
@ 2019-07-05 18:55 Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2019-07-05 18:55 UTC (permalink / raw)
To: stable
Cc: Mark Rutland, Jisheng Zhang, Kees Cook, Arnd Bergmann,
Greg Kroah-Hartman, Will Deacon, linux-kernel, Sasha Levin,
Catalin Marinas, linux-arm-kernel
From: Kees Cook <keescook@chromium.org>
Commit dbbb08f500d6146398b794fdc68a8e811366b451 upstream.
Adjust vdso_{start|end} to be char arrays to avoid compile-time analysis
that flags "too large" memcmp() calls with CONFIG_FORTIFY_SOURCE.
Cc: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Suggested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Backported to 4.4, which predates the rework from
2077be6783b5 ("arm64: Use __pa_symbol for kernel symbols") and
5a9e3e156ec1 ("arm64: apply __ro_after_init to some objects")
---
arch/arm64/kernel/vdso.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 97bc68f4c689..908bc5ab94c1 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -36,7 +36,7 @@
#include <asm/vdso.h>
#include <asm/vdso_datapage.h>
-extern char vdso_start, vdso_end;
+extern char vdso_start[], vdso_end[];
static unsigned long vdso_pages;
static struct page **vdso_pagelist;
@@ -115,14 +115,14 @@ static int __init vdso_init(void)
{
int i;
- if (memcmp(&vdso_start, "\177ELF", 4)) {
+ if (memcmp(vdso_start, "\177ELF", 4)) {
pr_err("vDSO is not a valid ELF object!\n");
return -EINVAL;
}
- vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;
+ vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",
- vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data);
+ vdso_pages + 1, vdso_pages, vdso_start, 1L, vdso_data);
/* Allocate the vDSO pagelist, plus a page for the data. */
vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
@@ -135,7 +135,7 @@ static int __init vdso_init(void)
/* Grab the vDSO code pages. */
for (i = 0; i < vdso_pages; i++)
- vdso_pagelist[i + 1] = virt_to_page(&vdso_start + i * PAGE_SIZE);
+ vdso_pagelist[i + 1] = virt_to_page(vdso_start + i * PAGE_SIZE);
/* Populate the special mapping structures */
vdso_spec[0] = (struct vm_special_mapping) {
--
2.20.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start,end} as array
2019-07-05 18:47 [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start, end} as array Arnd Bergmann
@ 2019-07-05 20:59 ` Sasha Levin
0 siblings, 0 replies; 3+ messages in thread
From: Sasha Levin @ 2019-07-05 20:59 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Jisheng Zhang, Mark Rutland, Kees Cook, Greg Kroah-Hartman,
Will Deacon, linux-kernel, Sasha Levin, Catalin Marinas,
Vincenzo Frascino, stable, linux-arm-kernel
On Fri, Jul 05, 2019 at 08:47:20PM +0200, Arnd Bergmann wrote:
>From: Kees Cook <keescook@chromium.org>
>
>Commit dbbb08f500d6146398b794fdc68a8e811366b451 upstream.
>
>Adjust vdso_{start|end} to be char arrays to avoid compile-time analysis
>that flags "too large" memcmp() calls with CONFIG_FORTIFY_SOURCE.
>
>Cc: Jisheng Zhang <jszhang@marvell.com>
>Acked-by: Catalin Marinas <catalin.marinas@arm.com>
>Suggested-by: Mark Rutland <mark.rutland@arm.com>
>Signed-off-by: Kees Cook <keescook@chromium.org>
>Signed-off-by: Will Deacon <will.deacon@arm.com>
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>---
>Backported to 4.9, which is lacking the rework from
>2077be6783b5 ("arm64: Use __pa_symbol for kernel symbols")
I've queued both this and the 4.4 backport, thanks!
--
Thanks,
Sasha
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-05 20:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-05 18:47 [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start, end} as array Arnd Bergmann
2019-07-05 20:59 ` [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start,end} " Sasha Levin
-- strict thread matches above, loose matches on Subject: below --
2019-07-05 18:55 [PATCH] [STABLE backport 4.9] arm64, vdso: Define vdso_{start, end} " Arnd Bergmann
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).