From patchwork Wed Apr 13 00:55:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daisuke Nojiri X-Patchwork-Id: 90902 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 02622B6F4F for ; Wed, 13 Apr 2011 11:36:11 +1000 (EST) Received: from localhost ([::1]:53338 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9p04-0004S2-3T for incoming@patchwork.ozlabs.org; Tue, 12 Apr 2011 21:36:08 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9ozC-0002Fy-Bi for qemu-devel@nongnu.org; Tue, 12 Apr 2011 21:35:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9oOp-0008Lu-3r for qemu-devel@nongnu.org; Tue, 12 Apr 2011 20:57:40 -0400 Received: from smtp-out.google.com ([216.239.44.51]:24080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9oOo-0008LD-UV for qemu-devel@nongnu.org; Tue, 12 Apr 2011 20:57:39 -0400 Received: from wpaz33.hot.corp.google.com (wpaz33.hot.corp.google.com [172.24.198.97]) by smtp-out.google.com with ESMTP id p3D0vcka002084 for ; Tue, 12 Apr 2011 17:57:38 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1302656258; bh=w2tbHus9N/nHUOiHwOGDuMKCKWQ=; h=MIME-Version:Date:Message-ID:Subject:From:To:Content-Type; b=UQemi+Q/6ykmpd64H5oPWgk+46xddVfWIYpQv12jchPR16xRCTxhA5LMZcVUOth1w VgalTlllRDMtBXVtSbDow== Received: from pxi7 (pxi7.prod.google.com [10.243.27.7]) by wpaz33.hot.corp.google.com with ESMTP id p3D0vImW009207 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Tue, 12 Apr 2011 17:57:37 -0700 Received: by pxi7 with SMTP id 7so62593pxi.2 for ; Tue, 12 Apr 2011 17:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=beta; h=domainkey-signature:mime-version:date:message-id:subject:from:to :content-type; bh=xMvTtu6LPcjn8tAAxuPReubLjwwHCgmmLBsQN372eyk=; b=AwDWq/xcMW9pU7NAfJ04z6ZRz8kTYF+PVh3iQYjcwl06xpLW4A+rEQFQCaQEwbWOsc EHxrTPe2S0ABllA2va8A== DomainKey-Signature: a=rsa-sha1; c=nofws; d=google.com; s=beta; h=mime-version:date:message-id:subject:from:to:content-type; b=kGzF5valZHwIGnj3yWILzI5tCkg5h9rIbwtnXIgc0MqIJWOqqxtFKQSExTeeD9ZjwX uHUwERsVNlVS5BTBXPRQ== MIME-Version: 1.0 Received: by 10.142.208.16 with SMTP id f16mr780408wfg.58.1302656138868; Tue, 12 Apr 2011 17:55:38 -0700 (PDT) Received: by 10.142.188.11 with HTTP; Tue, 12 Apr 2011 17:55:38 -0700 (PDT) Date: Tue, 12 Apr 2011 17:55:38 -0700 Message-ID: From: Daisuke Nojiri To: qemu-devel@nongnu.org X-System-Of-Record: true X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 216.239.44.51 Subject: [Qemu-devel] [PATCH 2/3] Slirp Reverse UDP Firewal 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 patch series adds a reverse UDP firewall functionality to Slirp. The series consists of three patches. Each adds one -net user option: 1. dropudp=y|n - enables the firewall 2. droplog=FILE - sets the drop log filename 3. allow=udp:ADDR:PORT - adds an allow rule e.g.) $ qemu -net user,dropudp=y,droplog=qemu.drop,allow=udp:10.0.2.3:53 All UDP packets except ones allowed by allow rules will be dropped. The source and the destination of the dropped packets are logged in the file specified by FILE. PORT can be a single number (e.g. 53) or a range (e.g. [80-81]). If ADDR is ommitted, all addresses match the rule. TCP support will follow (in another patch series). Signed-off-by: Daisuke Nojiri /* PASS */ diff --git a/net.c b/net.c index 95256ce..38ca29a 100644 --- a/net.c +++ b/net.c @@ -929,6 +929,10 @@ static const struct { .name = "dropudp", .type = QEMU_OPT_STRING, .help = "Enable UDP reverse firewall", + }, { + .name = "droplog", + .type = QEMU_OPT_STRING, + .help = "Set log filename for the reverse firewall", }, { /* end of list */ } }, diff --git a/net/slirp.c b/net/slirp.c index c3a296a..38995ec 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -690,6 +690,7 @@ int net_init_slirp(QemuOpts *opts, const char *bootfile; const char *smb_export; const char *vsmbsrv; + const char *droplog; char *vnet = NULL; int restricted = 0; int ret; @@ -731,6 +732,16 @@ int net_init_slirp(QemuOpts *opts, slirp_enable_drop_udp(); } + droplog = qemu_opt_get(opts, "droplog"); + if (droplog) { + FILE *drop_log_fd = fopen(droplog, "w"); + if (!drop_log_fd) { + error_report("Unable to open reverse firewall log"); + return -1; + } + slirp_set_drop_log_fd(drop_log_fd); + } + qemu_opt_foreach(opts, net_init_slirp_configs, NULL, 0); ret = net_slirp_init(vlan, "user", name, restricted, vnet, vhost, diff --git a/qemu-options.hx b/qemu-options.hx index d0a14a7..e59bf93 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1067,7 +1067,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, #ifdef CONFIG_SLIRP "-net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n]\n" " [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f]\n" - " [,hostfwd=rule][,guestfwd=rule][,dropudp=y|n]" + " [,hostfwd=rule][,guestfwd=rule][,dropudp=y|n][,droplog=file]" #ifndef _WIN32 "[,smb=dir[,smbserver=addr]]\n" #endif diff --git a/slirp/libslirp.h b/slirp/libslirp.h index 3e88f37..a389cc5 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -46,6 +46,8 @@ size_t slirp_socket_can_recv(Slirp *slirp, struct in_addr guest_addr, /* Usermode firewall functions */ void slirp_enable_drop_udp(void); +void slirp_set_drop_log_fd(FILE *fd); +int slirp_drop_log(const char *format, ...); int slirp_should_drop(unsigned long dst_addr, unsigned short dst_port, u_int8_t proto); diff --git a/slirp/slirp.c b/slirp/slirp.c index c570ef5..29dd0ca 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -1112,17 +1112,22 @@ static int slirp_state_load(QEMUFile *f, void *opaque, int version_id) return 0; } - /* * Global variables for the usermode firewall */ static int drop_udp = 0; +static FILE *drop_log_fd = NULL; void slirp_enable_drop_udp(void) { drop_udp = 1; } +void slirp_set_drop_log_fd(FILE *fd) +{ + drop_log_fd = fd; +} + int slirp_should_drop(unsigned long dst_addr, unsigned short dst_port, u_int8_t proto) { @@ -1139,3 +1144,23 @@ int slirp_should_drop(unsigned long dst_addr, return 1; } + +/* + * Write to drop-log + */ +int slirp_drop_log(const char *format, ...) +{ + va_list args; + + if (!drop_log_fd) { + return 0; + } + + va_start(args, format); + vfprintf(drop_log_fd, format, args); + va_end(args); + + fflush(drop_log_fd); + + return 1; +} diff --git a/slirp/udp.c b/slirp/udp.c index 7e583b4..f92731c 100644 --- a/slirp/udp.c +++ b/slirp/udp.c @@ -67,6 +67,8 @@ udp_input(register struct mbuf *m, int iphlen) DEBUG_ARG("m = %lx", (long)m); DEBUG_ARG("iphlen = %d", iphlen); + time_t timestamp = time(NULL); + /* * Strip IP options, if any; should skip this, * make available to user, and use on returned packets, @@ -103,6 +105,13 @@ udp_input(register struct mbuf *m, int iphlen) */ if (slirp_should_drop(ip->ip_dst.s_addr, uh->uh_dport, IPPROTO_UDP)) { /* DROP */ + slirp_drop_log( + "Dropped UDP: src:0x%08x:0x%04hx dst:0x%08x:0x%04hx %ld\n", + ntohl(ip->ip_src.s_addr), + ntohs(uh->uh_sport), + ntohl(ip->ip_dst.s_addr), + ntohs(uh->uh_dport), + timestamp); goto bad; } else {