Skip to content

Commit c2cdb13

Browse files
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas: - Fix the arm64 __get_mem_asm() to use the _ASM_EXTABLE_##type##ACCESS() macro instead of the *_ERR() one in order to avoid writing -EFAULT to the value register in case of a fault - Initialise all elements of the acpi_early_node_map[] to NUMA_NO_NODE. Prior to this fix, only the first element was initialised - Move the KASAN random tag seed initialisation after the per-CPU areas have been initialised (prng_state is __percpu) * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Fix KASAN random tag seed initialization arm64: ACPI: NUMA: initialize all values of acpi_early_node_map to NUMA_NO_NODE arm64: uaccess: correct thinko in __get_mem_asm()
2 parents 216595b + f75c235 commit c2cdb13

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

arch/arm64/include/asm/uaccess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static inline void __user *__uaccess_mask_ptr(const void __user *ptr)
188188
#define __get_mem_asm(load, reg, x, addr, label, type) \
189189
asm_goto_output( \
190190
"1: " load " " reg "0, [%1]\n" \
191-
_ASM_EXTABLE_##type##ACCESS_ERR(1b, %l2, %w0) \
191+
_ASM_EXTABLE_##type##ACCESS(1b, %l2) \
192192
: "=r" (x) \
193193
: "r" (addr) : : label)
194194
#else

arch/arm64/kernel/acpi_numa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include <asm/numa.h>
2929

30-
static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE };
30+
static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };
3131

3232
int __init acpi_numa_get_nid(unsigned int cpu)
3333
{

arch/arm64/kernel/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,6 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
355355
smp_init_cpus();
356356
smp_build_mpidr_hash();
357357

358-
/* Init percpu seeds for random tags after cpus are set up. */
359-
kasan_init_sw_tags();
360-
361358
#ifdef CONFIG_ARM64_SW_TTBR0_PAN
362359
/*
363360
* Make sure init_thread_info.ttbr0 always generates translation

arch/arm64/kernel/smp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,8 @@ void __init smp_prepare_boot_cpu(void)
467467
init_gic_priority_masking();
468468

469469
kasan_init_hw_tags();
470+
/* Init percpu seeds for random tags after cpus are set up. */
471+
kasan_init_sw_tags();
470472
}
471473

472474
/*

0 commit comments

Comments
 (0)