Commit 73b9160d authored by Jinbum Park's avatar Jinbum Park Committed by Russell King
Browse files

ARM: 8748/1: mm: Define vdso_start, vdso_end as array 



Define vdso_start, vdso_end as array to avoid compile-time analysis error
for the case of built with CONFIG_FORTIFY_SOURCE.

and, since vdso_start, vdso_end are used in vdso.c only,
move extern-declaration from vdso.h to vdso.c.

If kernel is built with CONFIG_FORTIFY_SOURCE,
compile-time error happens at this code.
- if (memcmp(&vdso_start, "177ELF", 4))

The size of "&vdso_start" is recognized as 1 byte, but n is 4,
So that compile-time error is reported.

Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJinbum Park <jinb.park7@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent ad43fc9a

arch/arm/include/asm/vdso.h

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ struct mm_struct; 


void arm_install_vdso(struct mm_struct *mm, unsigned long addr);



extern char vdso_start, vdso_end;



extern unsigned int vdso_total_pages;



#else /* CONFIG_VDSO */

arch/arm/kernel/vdso.c

+7 −5
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 


static struct page **vdso_text_pagelist;



extern char vdso_start[], vdso_end[];



/* Total number of pages needed for the data and text portions of the VDSO. */

unsigned int vdso_total_pages __ro_after_init;
@@ -197,13 +199,13 @@ static int __init vdso_init(void) 
	unsigned int text_pages;

	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 -ENOEXEC;

	}



	text_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;

	pr_debug("vdso: %i text pages at base %p\n", text_pages, &vdso_start);

	text_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;

	pr_debug("vdso: %i text pages at base %p\n", text_pages, vdso_start);



	/* Allocate the VDSO text pagelist */

	vdso_text_pagelist = kcalloc(text_pages, sizeof(struct page *),
@@ -218,7 +220,7 @@ static int __init vdso_init(void) 
	for (i = 0; i < text_pages; i++) {

		struct page *page;



		page = virt_to_page(&vdso_start + i * PAGE_SIZE);

		page = virt_to_page(vdso_start + i * PAGE_SIZE);

		vdso_text_pagelist[i] = page;

	}
@@ -229,7 +231,7 @@ static int __init vdso_init(void) 


	cntvct_ok = cntvct_functional();



	patch_vdso(&vdso_start);

	patch_vdso(vdso_start);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE