From patchwork Tue Oct 27 13:20:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 536625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FD5B141368 for ; Wed, 28 Oct 2015 00:25:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ravellosystems_com.20150623.gappssmtp.com header.i=@ravellosystems_com.20150623.gappssmtp.com header.b=VUgKPQT8; dkim-atps=neutral Received: from localhost ([::1]:59613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr4Fq-0006bf-W3 for incoming@patchwork.ozlabs.org; Tue, 27 Oct 2015 09:25:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr4CN-000233-BF for qemu-devel@nongnu.org; Tue, 27 Oct 2015 09:22:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zr4CM-00024W-Eg for qemu-devel@nongnu.org; Tue, 27 Oct 2015 09:21:59 -0400 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:34113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr4CM-00024R-8w for qemu-devel@nongnu.org; Tue, 27 Oct 2015 09:21:58 -0400 Received: by wikq8 with SMTP id q8so211449255wik.1 for ; Tue, 27 Oct 2015 06:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravellosystems_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B3N1okS4dtuwKpjBFlqgtytbyPyyrTFRdDXIio178os=; b=VUgKPQT8p2BaDEkXxSG48K6lrQ5BZuidrsFkMxgRQXPBo7b6r4eyLUVhmyTWiirxLH eDgm/E/lVDmR5XkcnrYy7FM+kaUXV+GwQg4pamh3OGzy4yXYv8vTEUmAm83+fIJ919fv pXVz6lPBvumuZfBKkw27HqMofbbN96pfhFihkJLWbQjU76L2m9abiRhE2i1+xu25OSG2 +m2YJTm7VH07MvwjRlcy3s1kcTeB6XVZ0SZ4+qt6c6S+nHCTQE4cHmDjt6NAQZup8F4q gToajFlWIyhp4ALv+udfOEBwIq5QH/dO3o0cQAoNFDL8QFrInk5JyFrHMQYKUJElQq1z Xgqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B3N1okS4dtuwKpjBFlqgtytbyPyyrTFRdDXIio178os=; b=PGE9LnVMP0T85O+Sv+OAPVs0TNdmp3qEPqONvwf2kWw3p269Xvjq0w2I8KNgdIRRea QJqVoGZYFjONnRP10TYH0GPDS5eMAMHq91YqgdHI51jwZoZRdGhsWhBbcmIJ2C66jX4k jdfHnX3r/kKCwqyAeHlQ//anFF+aTuOfAVHdjJ9DL5cuOwyN3KU1Hiqi6RiXNQNwScyT Z2V/+CUsettX3SMwMep+/BffXDUcom6h/uaxh2rUZ4XOe4i86zfIHnVz+bkudAAozUi4 EFN6upovDH2q+Sfhe0I7Ej5ybXqdm5AzkIUI525ygOoJt2MrCUXAtUOwOJQIapCqe3GO mrnw== X-Gm-Message-State: ALoCoQlMNzHgPbwMVoZHUYZAuLF4Ba/Y+2DIkVBt0u6dazr0rL7+9wZpK3Rsgxd+icETWoWHx1Ew X-Received: by 10.194.58.142 with SMTP id r14mr32732536wjq.37.1445952117306; Tue, 27 Oct 2015 06:21:57 -0700 (PDT) Received: from bark.daynix ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id mb12sm1263643wic.15.2015.10.27.06.21.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2015 06:21:56 -0700 (PDT) From: Leonid Bloch To: qemu-devel@nongnu.org Date: Tue, 27 Oct 2015 15:20:26 +0200 Message-Id: <1445952027-28541-6-git-send-email-leonid.bloch@ravellosystems.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1445952027-28541-1-git-send-email-leonid.bloch@ravellosystems.com> References: <1445952027-28541-1-git-send-email-leonid.bloch@ravellosystems.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 Cc: Dmitry Fleytman , Jason Wang , Leonid Bloch , Shmulik Ladkani Subject: [Qemu-devel] [PATCH v2 5/6] e1000: Fixing the packet address filtering procedure 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 Previously, if promiscuous unicast was enabled, a packet was received straight away, even if it was a multicast or a broadcast packet. This patch fixes that behavior, while making the filtering procedure a bit more human-readable. Signed-off-by: Leonid Bloch Signed-off-by: Dmitry Fleytman --- hw/net/e1000.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 660bd4d..a649ab8 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -866,6 +866,7 @@ receive_filter(E1000State *s, const uint8_t *buf, int size) static const uint8_t bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; static const int mta_shift[] = {4, 3, 2, 0}; uint32_t f, rctl = s->mac_reg[RCTL], ra[2], *rp; + int isbcast = !memcmp(buf, bcast, sizeof bcast), ismcast = (buf[0] & 1); if (is_vlan_packet(s, buf) && vlan_rx_filter_enabled(s)) { uint16_t vid = be16_to_cpup((uint16_t *)(buf + 14)); @@ -875,14 +876,17 @@ receive_filter(E1000State *s, const uint8_t *buf, int size) return 0; } - if (rctl & E1000_RCTL_UPE) // promiscuous + if (!isbcast && !ismcast && (rctl & E1000_RCTL_UPE)) { /* promiscuous ucast */ return 1; + } - if ((buf[0] & 1) && (rctl & E1000_RCTL_MPE)) // promiscuous mcast + if (ismcast && (rctl & E1000_RCTL_MPE)) { /* promiscuous mcast */ return 1; + } - if ((rctl & E1000_RCTL_BAM) && !memcmp(buf, bcast, sizeof bcast)) + if (isbcast && (rctl & E1000_RCTL_BAM)) { /* broadcast enabled */ return 1; + } for (rp = s->mac_reg + RA; rp < s->mac_reg + RA + 32; rp += 2) { if (!(rp[1] & E1000_RAH_AV))