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

Commit d71a68dc authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: ia32_signal: introduce COPY_SEG_CPL3 



Impact: cleanup

Introduce COPY_SEG_CPL3 for ia32_restore_sigcontext().

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b78a5b52

arch/x86/ia32/ia32_signal.c

+8 −4
Original line number Diff line number Diff line
@@ -201,6 +201,12 @@ struct rt_sigframe 
	err |= __get_user(regs->x, &sc->x);	\

}



#define COPY_SEG_CPL3(seg)	{			\

		unsigned short tmp;			\

		err |= __get_user(tmp, &sc->seg);	\

		regs->seg = tmp | 3;			\

}



#define RELOAD_SEG(seg,mask)						\

	{ unsigned int cur;						\

	  unsigned short pre;						\
@@ -246,10 +252,8 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, 
	COPY(dx); COPY(cx); COPY(ip);

	/* Don't touch extended registers */



	err |= __get_user(regs->cs, &sc->cs);

	regs->cs |= 3;

	err |= __get_user(regs->ss, &sc->ss);

	regs->ss |= 3;

	COPY_SEG_CPL3(cs);

	COPY_SEG_CPL3(ss);



	err |= __get_user(tmpflags, &sc->flags);

	regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);