From patchwork Mon Feb 4 10:41:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 217860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9CDA82C029D for ; Mon, 4 Feb 2013 21:53:27 +1100 (EST) Received: from localhost ([::1]:53228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2Jfx-0000An-OB for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2013 05:53:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JfJ-0007BY-Mw for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:52:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2JfG-0004Hc-PM for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:52:45 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:46685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JfG-0004HJ-Hb; Mon, 04 Feb 2013 05:52:42 -0500 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id B4A49A03F0; Mon, 4 Feb 2013 14:52:41 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 5EEEE546; Mon, 4 Feb 2013 14:41:29 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2013 14:41:00 +0400 Message-Id: <1359974470-17044-51-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Jan Kiszka , Nickolai Zeldovich , Michael Tokarev , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 50/60] slirp: Don't crash on packets from 0.0.0.0/8. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Nickolai Zeldovich LWIP can generate packets with a source of 0.0.0.0, which triggers an assertion failure in arp_table_add(). Instead of crashing, simply return to avoid adding an invalid ARP table entry. Signed-off-by: Nickolai Zeldovich Signed-off-by: Jan Kiszka (cherry picked from commit 1a89b60885ccc2abf7cc50275fcee70d0347425e) Signed-off-by: Michael Tokarev --- slirp/arp_table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/slirp/arp_table.c b/slirp/arp_table.c index 5d7b8ac..bf698c1 100644 --- a/slirp/arp_table.c +++ b/slirp/arp_table.c @@ -38,7 +38,9 @@ void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]) ethaddr[3], ethaddr[4], ethaddr[5])); /* Check 0.0.0.0/8 invalid source-only addresses */ - assert((ip_addr & htonl(~(0xf << 28))) != 0); + if ((ip_addr & htonl(~(0xf << 28))) == 0) { + return; + } if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) { /* Do not register broadcast addresses */