From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlnE6-0004Fn-0E for qemu-devel@nongnu.org; Thu, 20 Dec 2012 16:00:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlnE2-0005v4-Ih for qemu-devel@nongnu.org; Thu, 20 Dec 2012 16:00:21 -0500 Received: from smtp6-g21.free.fr ([2a01:e0c:1:1599::15]:59529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlnE1-0005tT-VY for qemu-devel@nongnu.org; Thu, 20 Dec 2012 16:00:18 -0500 From: Laurent Vivier Date: Thu, 20 Dec 2012 22:00:11 +0100 Message-Id: <1356037211-19530-1-git-send-email-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH] linux-user: correct msgrcv() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , Laurent Vivier All parameters must be swapped before the call of do_msgrcv(). Allow faked (debian fakeroot daemon) to work properly. WITHOUT this patch: $ faked-sysv --foreground --debug using 1723744788 as msg key msg_key=1723744788 1723744788:431 FAKEROOT: msg=131072, key=1723744788 FAKEROOT: r=-1, received message type=-150996052, message=-160219330 FAKEROOT, get_msg: Bad address r=14, EINTR=4 fakeroot: clearing up message queues and semaphores, signal=-1 fakeroot: database save FAILED WITH this patch: $ faked-sysv --foreground --debug using 1569385744 as msg key msg_key=1569385744 1569385744:424 FAKEROOT: msg=0, key=1569385744 ^C fakeroot: clearing up message queues and semaphores, signal=2 fakeroot: database save FAILED Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7bab006..78cb764 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2901,7 +2901,7 @@ static inline abi_long do_msgrcv(int msqid, abi_long msgp, return -TARGET_EFAULT; host_mb = g_malloc(msgsz+sizeof(long)); - ret = get_errno(msgrcv(msqid, host_mb, msgsz, tswapal(msgtyp), msgflg)); + ret = get_errno(msgrcv(msqid, host_mb, msgsz, msgtyp, msgflg)); if (ret > 0) { abi_ulong target_mtext_addr = msgp + sizeof(abi_ulong); @@ -3199,7 +3199,7 @@ static abi_long do_ipc(unsigned int call, int first, break; } - ret = do_msgrcv(first, tmp->msgp, second, tmp->msgtyp, third); + ret = do_msgrcv(first, tswapal(tmp->msgp), second, tswapal(tmp->msgtyp), third); unlock_user_struct(tmp, ptr, 0); break; -- 1.7.10.4