From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lu7ia-0001Hz-PW for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:12:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lu7ia-0001Ha-6D for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:12:08 -0400 Received: from [199.232.76.173] (port=48818 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lu7ia-0001HX-3i for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:12:08 -0400 Received: from savannah.gnu.org ([199.232.41.3]:50089 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lu7iZ-0003Ph-Jv for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:12:07 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Lu7iZ-0007ET-6Y for qemu-devel@nongnu.org; Wed, 15 Apr 2009 16:12:07 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1Lu7iY-0007EO-TZ for qemu-devel@nongnu.org; Wed, 15 Apr 2009 16:12:07 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Wed, 15 Apr 2009 16:12:06 +0000 Subject: [Qemu-devel] [7117] linux-user: removed unnecessary MAX_SOCK_ADDR checks for socket syscalls Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 7117 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7117 Author: aurel32 Date: 2009-04-15 16:12:06 +0000 (Wed, 15 Apr 2009) Log Message: ----------- linux-user: removed unnecessary MAX_SOCK_ADDR checks for socket syscalls - This check is not needed because kernel will check whether given buffer is too small and there is no upper limit for size of the buffer. From: Mika Westerberg Signed-off-by: Riku Voipio Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/linux-user/syscall.c Modified: trunk/linux-user/syscall.c =================================================================== --- trunk/linux-user/syscall.c 2009-04-15 16:11:59 UTC (rev 7116) +++ trunk/linux-user/syscall.c 2009-04-15 16:12:06 UTC (rev 7117) @@ -1208,16 +1208,13 @@ return get_errno(socket(domain, type, protocol)); } -/* MAX_SOCK_ADDR from linux/net/socket.c */ -#define MAX_SOCK_ADDR 128 - /* do_bind() Must return target values and target errnos. */ static abi_long do_bind(int sockfd, abi_ulong target_addr, socklen_t addrlen) { void *addr; - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) + if (addrlen < 0) return -TARGET_EINVAL; addr = alloca(addrlen+1); @@ -1232,7 +1229,7 @@ { void *addr; - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) + if (addrlen < 0) return -TARGET_EINVAL; addr = alloca(addrlen); @@ -1307,7 +1304,7 @@ if (get_user_u32(addrlen, target_addrlen_addr)) return -TARGET_EFAULT; - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) + if (addrlen < 0) return -TARGET_EINVAL; addr = alloca(addrlen); @@ -1332,7 +1329,7 @@ if (get_user_u32(addrlen, target_addrlen_addr)) return -TARGET_EFAULT; - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) + if (addrlen < 0) return -TARGET_EINVAL; addr = alloca(addrlen); @@ -1360,7 +1357,7 @@ if (get_user_u32(addrlen, target_addrlen_addr)) return -TARGET_EFAULT; - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) + if (addrlen < 0) return -TARGET_EINVAL; addr = alloca(addrlen); @@ -1398,7 +1395,7 @@ void *host_msg; abi_long ret; - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) + if (addrlen < 0) return -TARGET_EINVAL; host_msg = lock_user(VERIFY_READ, msg, len, 1); @@ -1433,7 +1430,7 @@ ret = -TARGET_EFAULT; goto fail; } - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) { + if (addrlen < 0) { ret = -TARGET_EINVAL; goto fail; }