diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-21 14:15:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-21 14:15:37 +0000 |
| commit | 0e88f478508b566152c6681f4889ed9830a2c0a5 (patch) | |
| tree | 0e6684291da7821000a2bd3e78e56b55af322242 /hw/net/rtl8139.c | |
| parent | a00c1173385741007f71ce505d092f4cc174f449 (diff) | |
| parent | b0af844007841609cc11fab58f838bd105cbe144 (diff) | |
| download | focaccia-qemu-0e88f478508b566152c6681f4889ed9830a2c0a5.tar.gz focaccia-qemu-0e88f478508b566152c6681f4889ed9830a2c0a5.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Fri 21 Nov 2014 11:12:37 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/net-pull-request: rtl8139: fix Pointer to local outside scope pcnet: fix Negative array index read net/socket: fix Uninitialized scalar variable net/slirp: fix memory leak Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/rtl8139.c')
| -rw-r--r-- | hw/net/rtl8139.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 8b8a1b18af..5f0197c9df 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -1775,6 +1775,7 @@ static void rtl8139_transfer_frame(RTL8139State *s, uint8_t *buf, int size, int do_interrupt, const uint8_t *dot1q_buf) { struct iovec *iov = NULL; + struct iovec vlan_iov[3]; if (!size) { @@ -1789,6 +1790,9 @@ static void rtl8139_transfer_frame(RTL8139State *s, uint8_t *buf, int size, { .iov_base = buf + ETHER_ADDR_LEN * 2, .iov_len = size - ETHER_ADDR_LEN * 2 }, }; + + memcpy(vlan_iov, iov, sizeof(vlan_iov)); + iov = vlan_iov; } if (TxLoopBack == (s->TxConfig & TxLoopBack)) |