Skip to content

Commit 830d3a7

Browse files
keesgregkh
authored andcommitted
arm64, vdso: Define vdso_{start,end} as array
Commit dbbb08f 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 <[email protected]> Acked-by: Catalin Marinas <[email protected]> Suggested-by: Mark Rutland <[email protected]> Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent a391af9 commit 830d3a7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/arm64/kernel/vdso.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <asm/vdso.h>
3838
#include <asm/vdso_datapage.h>
3939

40-
extern char vdso_start, vdso_end;
40+
extern char vdso_start[], vdso_end[];
4141
static unsigned long vdso_pages __ro_after_init;
4242

4343
/*
@@ -124,14 +124,14 @@ static int __init vdso_init(void)
124124
int i;
125125
struct page **vdso_pagelist;
126126

127-
if (memcmp(&vdso_start, "\177ELF", 4)) {
127+
if (memcmp(vdso_start, "\177ELF", 4)) {
128128
pr_err("vDSO is not a valid ELF object!\n");
129129
return -EINVAL;
130130
}
131131

132-
vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;
132+
vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
133133
pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",
134-
vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data);
134+
vdso_pages + 1, vdso_pages, vdso_start, 1L, vdso_data);
135135

136136
/* Allocate the vDSO pagelist, plus a page for the data. */
137137
vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
@@ -144,7 +144,7 @@ static int __init vdso_init(void)
144144

145145
/* Grab the vDSO code pages. */
146146
for (i = 0; i < vdso_pages; i++)
147-
vdso_pagelist[i + 1] = pfn_to_page(PHYS_PFN(__pa(&vdso_start)) + i);
147+
vdso_pagelist[i + 1] = pfn_to_page(PHYS_PFN(__pa(vdso_start)) + i);
148148

149149
vdso_spec[0].pages = &vdso_pagelist[0];
150150
vdso_spec[1].pages = &vdso_pagelist[1];

0 commit comments

Comments
 (0)