Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lu7ks-0002fh-5t for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:14:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lu7kr-0002fD-2y for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:14:29 -0400 Received: from [199.232.76.173] (port=48916 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lu7kq-0002f6-TT for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:14:28 -0400 Received: from hall.aurel32.net ([88.191.82.174]:39116) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lu7kq-0003mv-8S for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:14:28 -0400 Date: Wed, 15 Apr 2009 18:14:26 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH 08/10] linux-user: removed unnecessary MAX_SOCK_ADDR checks for socket syscalls Message-ID: <20090415161426.GF26206@hall.aurel32.net> References: <81c2bbf8771b5c3f7b00d4faf61695a5294b825e.1238963515.git.riku.voipio@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <81c2bbf8771b5c3f7b00d4faf61695a5294b825e.1238963515.git.riku.voipio@iki.fi> Sender: Aurelien Jarno Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Riku Voipio Cc: qemu-devel@nongnu.org On Sun, Apr 05, 2009 at 11:59:24PM +0300, riku.voipio@iki.fi wrote: > From: Mika Westerberg > > - 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 > --- > linux-user/syscall.c | 17 +++++++---------- > 1 files changed, 7 insertions(+), 10 deletions(-) Thanks, applied. > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 8d1d12b..110cba0 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -1208,16 +1208,13 @@ static abi_long do_socket(int domain, int type, int protocol) > 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 @@ static abi_long do_connect(int sockfd, abi_ulong target_addr, > { > void *addr; > > - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) > + if (addrlen < 0) > return -TARGET_EINVAL; > > addr = alloca(addrlen); > @@ -1307,7 +1304,7 @@ static abi_long do_accept(int fd, abi_ulong target_addr, > 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 @@ static abi_long do_getpeername(int fd, abi_ulong target_addr, > 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 @@ static abi_long do_getsockname(int fd, abi_ulong target_addr, > 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 @@ static abi_long do_sendto(int fd, abi_ulong msg, size_t len, int flags, > 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 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, size_t len, int flags, > ret = -TARGET_EFAULT; > goto fail; > } > - if (addrlen < 0 || addrlen > MAX_SOCK_ADDR) { > + if (addrlen < 0) { > ret = -TARGET_EINVAL; > goto fail; > } > -- > 1.6.2.1 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net