mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: Avoid possible misalignment in target_to_host_siginfo()

Browse Source 
Reimplement target_to_host_siginfo() to use __get_user(), which
handles possibly misaligned source guest structures correctly.

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-05-27 15:52:01 +01:00 committed by Riku Voipio
parent a70dadc7f1
commit 90c0f080fe
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linux-user/signal.c
View File

@ -408,13 +408,18 @@ void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info)
/* XXX: find a solution for 64 bit (additional malloced data is needed) */ /* XXX: find a solution for 64 bit (additional malloced data is needed) */
void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo) void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo)
{ {
info->si_signo = tswap32(tinfo->si_signo); /* This conversion is used only for the rt_sigqueueinfo syscall,
info->si_errno = tswap32(tinfo->si_errno); * and so we know that the _rt fields are the valid ones.
info->si_code = tswap32(tinfo->si_code); */
info->si_pid = tswap32(tinfo->_sifields._rt._pid); abi_ulong sival_ptr;
info->si_uid = tswap32(tinfo->_sifields._rt._uid);
info->si_value.sival_ptr = __get_user(info->si_signo, &tinfo->si_signo);
(void *)(long)tswapal(tinfo->_sifields._rt._sigval.sival_ptr); __get_user(info->si_errno, &tinfo->si_errno);
__get_user(info->si_code, &tinfo->si_code);
__get_user(info->si_pid, &tinfo->_sifields._rt._pid);
__get_user(info->si_uid, &tinfo->_sifields._rt._uid);
__get_user(sival_ptr, &tinfo->_sifields._rt._sigval.sival_ptr);
info->si_value.sival_ptr = (void *)(long)sival_ptr;
} }
static int fatal_signal (int sig) static int fatal_signal (int sig)