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

Commit 48a9dd2d authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Mark Salyzyn
Browse files

UPSTREAM: ARM: 8597/1: VDSO: put RO and RO after init objects into proper sections 



(cherry pick from commit 92bb8d5d55f7fe1a7a1201c42120c1611840807c)

vdso_data_mapping is never modified, so mark it as const.

vdso_total_pages, vdso_data_page, vdso_text_mapping and cntvct_ok are
initialized by vdso_init(), thereafter are read only.

The fact that they are read only after init makes them candidates for
__ro_after_init declarations.

Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarNathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Bug: 20045882
Bug: 19198045
Change-Id: I0b2f9807d3cd66c5ef7457ac6fc180a41cbe05c6
parent f752a45e

arch/arm/kernel/vdso.c

+6 −5
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/cache.h>

#include <linux/elf.h>

#include <linux/err.h>

#include <linux/kernel.h>
@@ -39,7 +40,7 @@ 
static struct page **vdso_text_pagelist;



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

unsigned int vdso_total_pages __read_mostly;

unsigned int vdso_total_pages __ro_after_init;



/*

 * The VDSO data page.
@@ -47,13 +48,13 @@ unsigned int vdso_total_pages __read_mostly; 
static union vdso_data_store vdso_data_store __page_aligned_data;

static struct vdso_data *vdso_data = &vdso_data_store.data;



static struct page *vdso_data_page;

static struct vm_special_mapping vdso_data_mapping = {

static struct page *vdso_data_page __ro_after_init;

static const struct vm_special_mapping vdso_data_mapping = {

	.name = "[vvar]",

	.pages = &vdso_data_page,

};



static struct vm_special_mapping vdso_text_mapping = {

static struct vm_special_mapping vdso_text_mapping __ro_after_init = {

	.name = "[vdso]",

};
@@ -67,7 +68,7 @@ struct elfinfo { 
/* Cached result of boot-time check for whether the arch timer exists,

 * and if so, whether the virtual counter is useable.

 */

static bool cntvct_ok __read_mostly;

static bool cntvct_ok __ro_after_init;



static bool __init cntvct_functional(void)

{