From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MBFW6-00062o-K3 for qemu-devel@nongnu.org; Mon, 01 Jun 2009 17:58:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MBFW2-000622-Ba for qemu-devel@nongnu.org; Mon, 01 Jun 2009 17:58:02 -0400 Received: from [199.232.76.173] (port=43577 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MBFW2-00061z-7E for qemu-devel@nongnu.org; Mon, 01 Jun 2009 17:57:58 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:38877) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MBFW1-0006JV-Dq for qemu-devel@nongnu.org; Mon, 01 Jun 2009 17:57:58 -0400 From: Laurent Vivier Date: Mon, 1 Jun 2009 23:57:48 +0200 Message-Id: <1243893468-17849-1-git-send-email-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH] linux-user: remove duplicate tswap32() from do_getsockopt() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier This issue has been detected with tests/linux-tests.c: linux-test.c:330: getsockopt 327 len = sizeof(val); 328 chk_error(getsockopt(server_fd, SOL_SOCKET, SO_TYPE, &val, &len)); 329 if (val != SOCK_STREAM) 330 error("getsockopt"); In linux-user/syscall.c:do_getsockopt(), we have: ... val = tswap32(val); ... if (put_user_u32(val, optval_addr)) ... whereas "put_user_u32" calls in the end "__put_user" which uses "tswap32". So the "val = tswap32(val);" is useless and wrong. This patch removes it. Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a0915a4..b1bba48 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1273,7 +1273,6 @@ static abi_long do_getsockopt(int sockfd, int level, int optname, ret = get_errno(getsockopt(sockfd, level, optname, &val, &lv)); if (ret < 0) return ret; - val = tswap32(val); if (len > lv) len = lv; if (len == 4) { -- 1.5.6.5