diff options
| author | Dmitry Fleytman <dmitry@daynix.com> | 2017-02-16 14:29:34 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-03-16 12:10:41 -0500 |
| commit | 15ad066065f54e3e0d095d3ffa1d2216dd941048 (patch) | |
| tree | 0d7e6a90d27476daf62c89334ed8cfde7ff23422 | |
| parent | 7cfd9c114bdc39a9b94fb7a42058e421edd1d285 (diff) | |
| download | qemu-15ad066065f54e3e0d095d3ffa1d2216dd941048.tar.gz | |
NetRxPkt: Do not try to pull more data than present
In case of VLAN stripping, ETH header put into a
separate buffer, therefore amont of data copied
from original IOV should be smaller.
Cc: qemu-stable@nongnu.org
Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
(cherry picked from commit d5e772146d2bbc92e5126c145eddef3b2843d026)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/net/net_rx_pkt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index 7c0beace9e..d38babec88 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -96,7 +96,8 @@ net_rx_pkt_pull_data(struct NetRxPkt *pkt, pkt->tot_len = iov_size(iov, iovcnt) - ploff + pkt->ehdr_buf_len; pkt->vec_len = iov_copy(pkt->vec + 1, pkt->vec_len_total - 1, - iov, iovcnt, ploff, pkt->tot_len); + iov, iovcnt, ploff, + pkt->tot_len - pkt->ehdr_buf_len); } else { net_rx_pkt_iovec_realloc(pkt, iovcnt); |