From patchwork Tue Jun 7 16:45:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 99298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 54A8FB6FC3 for ; Wed, 8 Jun 2011 02:55:06 +1000 (EST) Received: from localhost ([::1]:40196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTzYU-0004v1-Du for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2011 12:55:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTzPb-0003QL-Ms for qemu-devel@nongnu.org; Tue, 07 Jun 2011 12:45:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTzPZ-0003JC-Ci for qemu-devel@nongnu.org; Tue, 07 Jun 2011 12:45:51 -0400 Received: from david.siemens.de ([192.35.17.14]:17275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTzPX-0003I1-Se for qemu-devel@nongnu.org; Tue, 07 Jun 2011 12:45:48 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p57GjiV3013777; Tue, 7 Jun 2011 18:45:44 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p57Gjh3c022736; Tue, 7 Jun 2011 18:45:44 +0200 From: Jan Kiszka To: qemu-devel@nongnu.org Date: Tue, 7 Jun 2011 18:45:35 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Gleb Natapov Subject: [Qemu-devel] [PATCH 1/9] slirp: Fix restricted mode 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 This aligns the code to what the documentation claims: Allow everything but requests that would have to be routed outside of the virtual LAN. So we need to drop the unneeded IP-level filter, allow TFTP requests, and add the missing protocol-level filter to ICMP. CC: Gleb Natapov Signed-off-by: Jan Kiszka --- slirp/ip_icmp.c | 2 ++ slirp/ip_input.c | 21 --------------------- slirp/udp.c | 8 ++++---- 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c index 751a8e2..0cd129c 100644 --- a/slirp/ip_icmp.c +++ b/slirp/ip_icmp.c @@ -101,6 +101,8 @@ icmp_input(struct mbuf *m, int hlen) ip->ip_len += hlen; /* since ip_input subtracts this */ if (ip->ip_dst.s_addr == slirp->vhost_addr.s_addr) { icmp_reflect(m); + } else if (slirp->restricted) { + goto freeit; } else { struct socket *so; struct sockaddr_in addr; diff --git a/slirp/ip_input.c b/slirp/ip_input.c index 768ab0c..2ff6adb 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -118,27 +118,6 @@ ip_input(struct mbuf *m) goto bad; } - if (slirp->restricted) { - if ((ip->ip_dst.s_addr & slirp->vnetwork_mask.s_addr) == - slirp->vnetwork_addr.s_addr) { - if (ip->ip_dst.s_addr == 0xffffffff && ip->ip_p != IPPROTO_UDP) - goto bad; - } else { - uint32_t inv_mask = ~slirp->vnetwork_mask.s_addr; - struct ex_list *ex_ptr; - - if ((ip->ip_dst.s_addr & inv_mask) == inv_mask) { - goto bad; - } - for (ex_ptr = slirp->exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next) - if (ex_ptr->ex_addr.s_addr == ip->ip_dst.s_addr) - break; - - if (!ex_ptr) - goto bad; - } - } - /* Should drop packet if mbuf too long? hmmm... */ if (m->m_len > ip->ip_len) m_adj(m, ip->ip_len - m->m_len); diff --git a/slirp/udp.c b/slirp/udp.c index 02b3793..f1a9a10 100644 --- a/slirp/udp.c +++ b/slirp/udp.c @@ -125,10 +125,6 @@ udp_input(register struct mbuf *m, int iphlen) goto bad; } - if (slirp->restricted) { - goto bad; - } - /* * handle TFTP */ @@ -137,6 +133,10 @@ udp_input(register struct mbuf *m, int iphlen) goto bad; } + if (slirp->restricted) { + goto bad; + } + /* * Locate pcb for datagram. */