30de14b188
s390 defines current_stack_pointer as function while all other
architectures use 'register unsigned long asm("<stackptr reg>").
This make codes like the following from check_stack_object() fail:
if (IS_ENABLED(CONFIG_STACK_GROWSUP)) {
if ((void *)current_stack_pointer < obj + len)
return BAD_STACK;
} else {
if (obj < (void *)current_stack_pointer)
return BAD_STACK;
}
because this would compare the address of current_stack_pointer() and
not the stackpointer value.
Reported-by: Karsten Graul <kgraul@linux.ibm.com>
Fixes: 2792d84e6d ("usercopy: Check valid lifetime via stack depth")
Cc: Kees Cook <keescook@chromium.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
65 lines
1.5 KiB
C
65 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef ARCH_S390_ENTRY_COMMON_H
|
|
#define ARCH_S390_ENTRY_COMMON_H
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/audit.h>
|
|
#include <linux/randomize_kstack.h>
|
|
#include <linux/processor.h>
|
|
#include <linux/uaccess.h>
|
|
#include <asm/timex.h>
|
|
#include <asm/fpu/api.h>
|
|
|
|
#define ARCH_EXIT_TO_USER_MODE_WORK (_TIF_GUARDED_STORAGE | _TIF_PER_TRAP)
|
|
|
|
void do_per_trap(struct pt_regs *regs);
|
|
|
|
#ifdef CONFIG_DEBUG_ENTRY
|
|
static __always_inline void arch_check_user_regs(struct pt_regs *regs)
|
|
{
|
|
debug_user_asce(0);
|
|
}
|
|
|
|
#define arch_check_user_regs arch_check_user_regs
|
|
#endif /* CONFIG_DEBUG_ENTRY */
|
|
|
|
static __always_inline void arch_exit_to_user_mode_work(struct pt_regs *regs,
|
|
unsigned long ti_work)
|
|
{
|
|
if (ti_work & _TIF_PER_TRAP) {
|
|
clear_thread_flag(TIF_PER_TRAP);
|
|
do_per_trap(regs);
|
|
}
|
|
|
|
if (ti_work & _TIF_GUARDED_STORAGE)
|
|
gs_load_bc_cb(regs);
|
|
}
|
|
|
|
#define arch_exit_to_user_mode_work arch_exit_to_user_mode_work
|
|
|
|
static __always_inline void arch_exit_to_user_mode(void)
|
|
{
|
|
if (test_cpu_flag(CIF_FPU))
|
|
__load_fpu_regs();
|
|
|
|
if (IS_ENABLED(CONFIG_DEBUG_ENTRY))
|
|
debug_user_asce(1);
|
|
}
|
|
|
|
#define arch_exit_to_user_mode arch_exit_to_user_mode
|
|
|
|
static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs,
|
|
unsigned long ti_work)
|
|
{
|
|
choose_random_kstack_offset(get_tod_clock_fast() & 0xff);
|
|
}
|
|
|
|
#define arch_exit_to_user_mode_prepare arch_exit_to_user_mode_prepare
|
|
|
|
static inline bool on_thread_stack(void)
|
|
{
|
|
return !(((unsigned long)(current->stack) ^ current_stack_pointer) & ~(THREAD_SIZE - 1));
|
|
}
|
|
|
|
#endif
|