From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LVYON-0002oL-SG
	for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:37:43 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LVYOM-0002nL-AE
	for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:37:43 -0500
Received: from [199.232.76.173] (port=33687 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LVYOM-0002n9-4R
	for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:37:42 -0500
Received: from savannah.gnu.org ([199.232.41.3]:39973 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 1LVYOL-0001rd-RP
	for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:37:41 -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 1LVYOL-00006D-6B
	for qemu-devel@nongnu.org; Fri, 06 Feb 2009 21:37:41 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LVYOK-000069-Vw
	for qemu-devel@nongnu.org; Fri, 06 Feb 2009 21:37:41 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LVYOK-000069-Vw@cvs.savannah.gnu.org>
Date: Fri, 06 Feb 2009 21:37:40 +0000
Subject: [Qemu-devel] [6545] Fix SIGSEGV crash in slirp networking code
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: 6545
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6545
Author:   blueswir1
Date:     2009-02-06 21:37:40 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
Fix SIGSEGV crash in slirp networking code

Fix SIGSEGV crash in networking code (bug was introduced in r6288).
Thanks to Gleb Natapov for finding this fix.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Modified Paths:
--------------
    trunk/slirp/ip_input.c

Modified: trunk/slirp/ip_input.c
===================================================================
--- trunk/slirp/ip_input.c	2009-02-06 21:30:02 UTC (rev 6544)
+++ trunk/slirp/ip_input.c	2009-02-06 21:37:40 UTC (rev 6545)
@@ -392,8 +392,7 @@
 	 * into the new buffer.
 	 */
 	if (m->m_flags & M_EXT) {
-	  int delta;
-	  delta = (char *)ip - m->m_dat;
+	  int delta = (char *)q - m->m_dat;
 	  q = (struct ipasfrag *)(m->m_ext + delta);
 	}