mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Fix two and a half oversights in COMPAT_FREEBSD32 related to contexts and

Browse Source 
TLS:
o) The mc_tls field used to store the TLS base when doing context gets and
   restores was left a pointer and not converted to a 32-bit integer.  This
   had the bug of not correctly capturing the TLS value desired by the user,
   and the extra nastiness of making the structure the wrong size.
o) The mc_tls field was not being saved by sendsig.  As a result, the TLS base
   would always be set to NULL when restoring from a signal handler.

Thanks to gonzo for helping track down a bunch of other TLS bugs that came out
of tracking these down.
This commit is contained in:
Juli Mallett 2012-03-06 07:50:45 +00:00
parent 22c6822677
commit bdf4700515
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232584
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/mips/include/ucontext.h
View File

@ -73,7 +73,7 @@ typedef struct __mcontext32 {
int mc_fpused;
int32_t mc_fpregs[33];
int32_t mc_fpc_eir;
void *mc_tls;
int32_t mc_tls;
int __spare__[8];
} mcontext32_t;

5
sys/mips/mips/freebsd32_machdep.c
View File

@ -222,7 +222,7 @@ get_mcontext32(struct thread *td, mcontext32_t *mcp, int flags)
for (i = 0; i < 33; i++)
mcp->mc_fpregs[i] = mcp64.mc_fpregs[i];
mcp->mc_fpc_eir = mcp64.mc_fpc_eir;
mcp->mc_tls = mcp64.mc_tls;
mcp->mc_tls = (int32_t)(intptr_t)mcp64.mc_tls;
return (0);
}
@ -244,7 +244,7 @@ set_mcontext32(struct thread *td, const mcontext32_t *mcp)
for (i = 0; i < 33; i++)
mcp64.mc_fpregs[i] = mcp->mc_fpregs[i];
mcp64.mc_fpc_eir = mcp->mc_fpc_eir;
mcp64.mc_tls = mcp->mc_tls;
mcp64.mc_tls = (void *)(intptr_t)mcp->mc_tls;
return (set_mcontext(td, &mcp64));
}
@ -395,6 +395,7 @@ freebsd32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
sf.sf_uc.uc_mcontext.mc_pc = regs.r_regs[PC];
sf.sf_uc.uc_mcontext.mullo = regs.r_regs[MULLO];
sf.sf_uc.uc_mcontext.mulhi = regs.r_regs[MULHI];
sf.sf_uc.uc_mcontext.mc_tls = (int32_t)(intptr_t)td->td_md.md_tls;
sf.sf_uc.uc_mcontext.mc_regs[0] = UCONTEXT_MAGIC; /* magic number */
for (i = 1; i < 32; i++)
sf.sf_uc.uc_mcontext.mc_regs[i] = regs.r_regs[i];