mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
acfa60dbe0
When CONFIG_RODATA_FULL_DEFAULT_ENABLED=y, passing "rodata=on" on the
kernel command-line (rather than "rodata=full") should turn off the
"full" behaviour, leaving writable linear aliases of read-only kernel
memory. Unfortunately, the option has no effect in this situation and
the only way to disable the "rodata=full" behaviour is to disable rodata
protection entirely by passing "rodata=off".
Fix this by parsing the "on" and "off" options in the arch code,
additionally enforcing that 'rodata_full' cannot be set without also
setting 'rodata_enabled', allowing us to simplify a couple of checks
in the process.
Fixes: 2e8cff0a0e ("arm64: fix rodata=full")
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Reviewed-by: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20231117131422.29663-1-will@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
47 lines
854 B
C
47 lines
854 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#ifndef __ARM64_ASM_SETUP_H
|
|
#define __ARM64_ASM_SETUP_H
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <uapi/asm/setup.h>
|
|
|
|
void *get_early_fdt_ptr(void);
|
|
void early_fdt_map(u64 dt_phys);
|
|
|
|
/*
|
|
* These two variables are used in the head.S file.
|
|
*/
|
|
extern phys_addr_t __fdt_pointer __initdata;
|
|
extern u64 __cacheline_aligned boot_args[4];
|
|
|
|
static inline bool arch_parse_debug_rodata(char *arg)
|
|
{
|
|
extern bool rodata_enabled;
|
|
extern bool rodata_full;
|
|
|
|
if (!arg)
|
|
return false;
|
|
|
|
if (!strcmp(arg, "full")) {
|
|
rodata_enabled = rodata_full = true;
|
|
return true;
|
|
}
|
|
|
|
if (!strcmp(arg, "off")) {
|
|
rodata_enabled = rodata_full = false;
|
|
return true;
|
|
}
|
|
|
|
if (!strcmp(arg, "on")) {
|
|
rodata_enabled = true;
|
|
rodata_full = false;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
#define arch_parse_debug_rodata arch_parse_debug_rodata
|
|
|
|
#endif
|