Skip to content

Commit dbbb08f

Browse files
keeswildea01
authored andcommitted
arm64, vdso: Define vdso_{start,end} as array
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]>
1 parent 8dd0ee6 commit dbbb08f

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
/*
@@ -125,14 +125,14 @@ static int __init vdso_init(void)
125125
struct page **vdso_pagelist;
126126
unsigned long pfn;
127127

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

133-
vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;
133+
vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
134134
pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",
135-
vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data);
135+
vdso_pages + 1, vdso_pages, vdso_start, 1L, vdso_data);
136136

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

146146

147147
/* Grab the vDSO code pages. */
148-
pfn = sym_to_pfn(&vdso_start);
148+
pfn = sym_to_pfn(vdso_start);
149149

150150
for (i = 0; i < vdso_pages; i++)
151151
vdso_pagelist[i + 1] = pfn_to_page(pfn + i);

0 commit comments

Comments
 (0)