[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/19] linux-user: Avoid possible misalignment in
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 19/19] linux-user: Avoid possible misalignment in target_to_host_siginfo() |
Date: |
Fri, 27 May 2016 15:52:01 +0100 |
Reimplement target_to_host_siginfo() to use __get_user(), which
handles possibly misaligned source guest structures correctly.
Signed-off-by: Peter Maydell <address@hidden>
---
linux-user/signal.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 7e2a80f..8417da7 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -409,13 +409,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) */
void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo)
{
- info->si_signo = tswap32(tinfo->si_signo);
- info->si_errno = tswap32(tinfo->si_errno);
- info->si_code = tswap32(tinfo->si_code);
- info->si_pid = tswap32(tinfo->_sifields._rt._pid);
- info->si_uid = tswap32(tinfo->_sifields._rt._uid);
- info->si_value.sival_ptr =
- (void *)(long)tswapal(tinfo->_sifields._rt._sigval.sival_ptr);
+ /* This conversion is used only for the rt_sigqueueinfo syscall,
+ * and so we know that the _rt fields are the valid ones.
+ */
+ abi_ulong sival_ptr;
+
+ __get_user(info->si_signo, &tinfo->si_signo);
+ __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)
--
1.9.1
- [Qemu-devel] [PATCH v2 08/19] linux-user: Remove redundant default action check in queue_signal(), (continued)
- [Qemu-devel] [PATCH v2 08/19] linux-user: Remove redundant default action check in queue_signal(), Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 10/19] linux-user: Remove real-time signal queuing, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 06/19] linux-user: Use safe_syscall for sigsuspend syscalls, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 05/19] linux-user: Define macro for size of host kernel sigset_t, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 07/19] linux-user: Fix race between multiple signals, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 02/19] linux-user: Move handle_pending_signal() to avoid need for declaration, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 01/19] linux-user: Factor out handle_signal code from process_pending_signals(), Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 04/19] linux-user: Factor out uses of do_sigprocmask() from sigreturn code, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 15/19] linux-user: Use safe_syscall for kill, tkill and tgkill syscalls, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 17/19] linux-user: Use both si_code and si_signo when converting siginfo_t, Peter Maydell, 2016/05/27
- [Qemu-devel] [PATCH v2 19/19] linux-user: Avoid possible misalignment in target_to_host_siginfo(),
Peter Maydell <=