glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc64: fix sigreturn decoding for sparc personality

Browse Source 
* linux/sparc/arch_sigreturn.c (arch_sigreturn): Parametrize
member types of struct signal_frame.
* linux/sparc64/arch_sigreturn.c (sparc64_arch_sigreturn,
sparc32_arch_sigreturn): New functions.
(arch_sigreturn): Use them.
This commit is contained in:
Дмитрий Левин
2016-08-21 22:02:09 +00:00
parent aa0c46ffed
commit ae5feb49c2
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
linux/sparc/arch_sigreturn.c
View File

@ -1,12 +1,22 @@
#ifndef SIZEOF_STRUCT_SPARC_STACKF
# define SIZEOF_STRUCT_SPARC_STACKF sizeof(struct sparc_stackf)
#endif
#ifndef SIZEOF_STRUCT_PT_REGS
# define SIZEOF_STRUCT_PT_REGS sizeof(struct pt_regs)
#endif
#ifndef PERSONALITY_WORDSIZE
# define PERSONALITY_WORDSIZE PERSONALITY0_WORDSIZE
#endif
static void
arch_sigreturn(struct tcb *tcp)
{
long fp = sparc_regs.u_regs[U_REG_FP] + sizeof(struct sparc_stackf);
long fp = sparc_regs.u_regs[U_REG_FP] +
SIZEOF_STRUCT_SPARC_STACKF + SIZEOF_STRUCT_PT_REGS;
struct {
struct pt_regs si_regs;
int si_mask;
void *fpu_save;
long insns[2] ATTRIBUTE_ALIGNED(8);
unsigned int mask;
char fpu_save[PERSONALITY_WORDSIZE];
char insns[PERSONALITY_WORDSIZE * 2] ATTRIBUTE_ALIGNED(8);
unsigned int extramask[NSIG / 8 / sizeof(int) - 1];
} frame;
@ -15,9 +25,13 @@ arch_sigreturn(struct tcb *tcp)
} else {
unsigned int mask[NSIG / 8 / sizeof(int)];
mask[0] = frame.si_mask;
mask[0] = frame.mask;
memcpy(mask + 1, frame.extramask, sizeof(frame.extramask));
tprintsigmask_addr("{mask=", mask);
tprints("}");
}
}
#undef PERSONALITY_WORDSIZE
#undef SIZEOF_STRUCT_PT_REGS
#undef SIZEOF_STRUCT_SPARC_STACKF

18
linux/sparc64/arch_sigreturn.c
View File

@ -1 +1,19 @@
#define arch_sigreturn sparc64_arch_sigreturn
#include "sparc/arch_sigreturn.c"
#undef arch_sigreturn
#define SIZEOF_STRUCT_SPARC_STACKF sizeof(struct sparc_stackf32)
#define SIZEOF_STRUCT_PT_REGS sizeof(struct pt_regs32)
#define PERSONALITY_WORDSIZE PERSONALITY1_WORDSIZE
#define arch_sigreturn sparc32_arch_sigreturn
#include "sparc/arch_sigreturn.c"
#undef arch_sigreturn
static void
arch_sigreturn(struct tcb *tcp)
{
if (current_personality == 1)
sparc32_arch_sigreturn(tcp);
else
sparc64_arch_sigreturn(tcp);
}