Commit d5e77214 authored by Dmitry Fleytman's avatar Dmitry Fleytman Committed by Jason Wang
Browse files

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: default avatarDmitry Fleytman <dmitry@daynix.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent df8bf7a7

hw/net/net_rx_pkt.c

+2 −1
Original line number Diff line number Diff line
@@ -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);