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

Commit c0e01d5d authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas
Browse files

arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link 



struct compat_ucontext * is a 64-bit pointer, so we need to use a
compat_uptr_t instead to avoid declaring a structure incompatible with
what AArch32 userspace expects.

Cc: <stable@vger.kernel.org>
Reported-by: default avatarEdmund Grimley-Evans <Edmund.Grimley-Evans@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b6f35981

arch/arm64/kernel/signal32.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct compat_sigcontext { 


struct compat_ucontext {

	compat_ulong_t			uc_flags;

	struct compat_ucontext		*uc_link;

	compat_uptr_t			uc_link;

	compat_stack_t			uc_stack;

	struct compat_sigcontext	uc_mcontext;

	compat_sigset_t			uc_sigmask;
@@ -703,7 +703,7 @@ int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, 
	err |= copy_siginfo_to_user32(&frame->info, info);



	__put_user_error(0, &frame->sig.uc.uc_flags, err);

	__put_user_error(NULL, &frame->sig.uc.uc_link, err);

	__put_user_error(0, &frame->sig.uc.uc_link, err);



	memset(&stack, 0, sizeof(stack));

	stack.ss_sp = (compat_uptr_t)current->sas_ss_sp;