Commit b1edae0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-5.13-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fixes from Vineet Gupta:

 - ARCv2 userspace ABI not populating a few registers

 - Unbork CONFIG_HARDENED_USERCOPY for ARC

* tag 'arc-5.13-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: fix CONFIG_HARDENED_USERCOPY
  ARCv2: save ABI registers across signal handling
parents 89fec742 110febc0

arch/arc/include/uapi/asm/sigcontext.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */

struct sigcontext {

	struct user_regs_struct regs;

	struct user_regs_arcv2 v2abi;

};



#endif /* _ASM_ARC_SIGCONTEXT_H */

arch/arc/kernel/signal.c

+43 −0
Original line number Diff line number Diff line
@@ -61,6 +61,41 @@ struct rt_sigframe { 
	unsigned int sigret_magic;

};



static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)

{

	int err = 0;

#ifndef CONFIG_ISA_ARCOMPACT

	struct user_regs_arcv2 v2abi;



	v2abi.r30 = regs->r30;

#ifdef CONFIG_ARC_HAS_ACCL_REGS

	v2abi.r58 = regs->r58;

	v2abi.r59 = regs->r59;

#else

	v2abi.r58 = v2abi.r59 = 0;

#endif

	err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));

#endif

	return err;

}



static int restore_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)

{

	int err = 0;

#ifndef CONFIG_ISA_ARCOMPACT

	struct user_regs_arcv2 v2abi;



	err = __copy_from_user(&v2abi, &mctx->v2abi, sizeof(v2abi));



	regs->r30 = v2abi.r30;

#ifdef CONFIG_ARC_HAS_ACCL_REGS

	regs->r58 = v2abi.r58;

	regs->r59 = v2abi.r59;

#endif

#endif

	return err;

}



static int

stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs,

	       sigset_t *set)
@@ -94,6 +129,10 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs, 


	err = __copy_to_user(&(sf->uc.uc_mcontext.regs.scratch), &uregs.scratch,

			     sizeof(sf->uc.uc_mcontext.regs.scratch));



	if (is_isa_arcv2())

		err |= save_arcv2_regs(&(sf->uc.uc_mcontext), regs);



	err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));



	return err ? -EFAULT : 0;
@@ -109,6 +148,10 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) 
	err |= __copy_from_user(&uregs.scratch,

				&(sf->uc.uc_mcontext.regs.scratch),

				sizeof(sf->uc.uc_mcontext.regs.scratch));



	if (is_isa_arcv2())

		err |= restore_arcv2_regs(&(sf->uc.uc_mcontext), regs);



	if (err)

		return -EFAULT;

arch/arc/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ SECTIONS 
	.init.ramfs : { INIT_RAM_FS }



	. = ALIGN(PAGE_SIZE);

	_stext = .;



	HEAD_TEXT_SECTION

	INIT_TEXT_SECTION(L1_CACHE_BYTES)
@@ -83,6 +82,7 @@ SECTIONS 


	.text : {

		_text = .;

		_stext = .;

		TEXT_TEXT

		SCHED_TEXT

		CPUIDLE_TEXT