Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 830d3a71 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

arm64, vdso: Define vdso_{start,end} as array 



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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Suggested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a391af9b

arch/arm64/kernel/vdso.c

+5 −5
Original line number Diff line number Diff line
@@ -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];