From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LSzLD-0006iH-Hr
	for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:47:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LSzLB-0006gX-Iv
	for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:47:50 -0500
Received: from [199.232.76.173] (port=48774 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LSzLB-0006gL-Ar
	for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:47:49 -0500
Received: from savannah.gnu.org ([199.232.41.3]:58089 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 <INVALID.NOREPLY@gnu.org>)
	id 1LSzLB-0003rW-2Z
	for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:47:49 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LSzLA-0003Qr-Hn
	for qemu-devel@nongnu.org; Fri, 30 Jan 2009 19:47:48 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LSzLA-0003Qn-7e
	for qemu-devel@nongnu.org; Fri, 30 Jan 2009 19:47:48 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LSzLA-0003Qn-7e@cvs.savannah.gnu.org>
Date: Fri, 30 Jan 2009 19:47:48 +0000
Subject: [Qemu-devel] [6478] linux-user: fix accept(2) with NULL peer
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6478
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6478
Author:   aurel32
Date:     2009-01-30 19:47:47 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
linux-user: fix accept(2) with NULL peer

Based on scratchbox2 patch by Mika Westerberg

Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/linux-user/syscall.c

Modified: trunk/linux-user/syscall.c
===================================================================
--- trunk/linux-user/syscall.c	2009-01-29 23:29:52 UTC (rev 6477)
+++ trunk/linux-user/syscall.c	2009-01-30 19:47:47 UTC (rev 6478)
@@ -1267,6 +1267,9 @@
     void *addr;
     abi_long ret;
 
+    if (target_addr == 0)
+       return get_errno(accept(fd, NULL, NULL));
+
     if (get_user_u32(addrlen, target_addrlen_addr))
         return -TARGET_EFAULT;