From d16828fb1034ceb05e3e690065aa1ddc2088d53c Mon Sep 17 00:00:00 2001
From: Dmitry Fleytman <dfleytma@redhat.com>
Date: Tue, 19 Nov 2013 13:18:27 +0100
Subject: [PATCH 03/14] virtio-net: broken RX filtering logic fixed

RH-Author: Dmitry Fleytman <dfleytma@redhat.com>
Message-id: <1384867107-25295-1-git-send-email-dfleytma@redhat.com>
Patchwork-id: 55756
O-Subject: [RHEL-7 qemu-kvm PATCH] virtio-net: broken RX filtering logic fixed
Bugzilla: 1029370
RH-Acked-by: Yan Vugenfirer <yvugenfi@redhat.com>
RH-Acked-by: Vlad Yasevich <vyasevic@redhat.com>
RH-Acked-by: Amos Kong <akong@redhat.com>

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1029370
Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=6606668
Upstream-status: cc386e96727442f5b67052d4e0a602f6f652ffe6

Upon processing of VIRTIO_NET_CTRL_MAC_TABLE_SET command
multicast list overwrites unicast list in mac_table.
This leads to broken logic for both unicast and multicast RX filtering.

Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
---
 hw/net/virtio-net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
 hw/net/virtio-net.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index f889841..3bc1eed 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -595,7 +595,8 @@ static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd,
     }
 
     if (n->mac_table.in_use + mac_data.entries <= MAC_TABLE_ENTRIES) {
-        s = iov_to_buf(iov, iov_cnt, 0, n->mac_table.macs,
+        s = iov_to_buf(iov, iov_cnt, 0,
+                       &n->mac_table.macs[n->mac_table.in_use * ETH_ALEN],
                        mac_data.entries * ETH_ALEN);
         if (s != mac_data.entries * ETH_ALEN) {
             goto error;
-- 
1.7.1