From 3f9ac9b39bd82b51f6aa46103836ae12bcbcb22e Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Mon, 1 Jun 2009 23:57:48 +0200 Subject: [PATCH] linux-user: remove duplicate tswap32() from do_getsockopt() 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 Signed-off-by: Riku Voipio --- linux-user/syscall.c | 1 - 1 file changed, 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 3ff1e04235..53a11ab877 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1348,7 +1348,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) {