From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAdZS-0004Kj-Gs for qemu-devel@nongnu.org; Wed, 08 Jun 2016 09:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAdZQ-0005nJ-Jp for qemu-devel@nongnu.org; Wed, 08 Jun 2016 09:30:57 -0400 Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]:33921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAdZP-0005mx-Qw for qemu-devel@nongnu.org; Wed, 08 Jun 2016 09:30:56 -0400 Received: by mail-lf0-x22d.google.com with SMTP id s186so5873848lfs.1 for ; Wed, 08 Jun 2016 06:30:55 -0700 (PDT) From: riku.voipio@linaro.org Date: Wed, 8 Jun 2016 16:30:04 +0300 Message-Id: <90c0f080fe6fdd8b18691e6e38c853c8a996ad92.1465392531.git.riku.voipio@linaro.org> In-Reply-To: References: Subject: [Qemu-devel] [PULL 23/44] linux-user: Avoid possible misalignment in target_to_host_siginfo() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell From: Peter Maydell Reimplement target_to_host_siginfo() to use __get_user(), which handles possibly misaligned source guest structures correctly. Reviewed-by: Laurent Vivier Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- 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 8ea0cbf..61c1145 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -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) */ 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) -- 2.1.4