ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: vmxnet3: avoid memory leakage in activate_device 

Vmxnet3 device emulator does not check if the device is active
before activating it, also it did not free the transmit & receive
buffers while deactivating the device, thus resulting in memory
leakage on the host. This patch fixes both these issues to avoid
host memory leakage.

Reported-by: Qinghao Tang <luodalongde@gmail.com>
Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Cc: qemu-stable@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
P J P 2015-12-15 12:27:54 +05:30 committed by Jason Wang
parent dd3c168471
commit aa4a3dce1c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/net/vmxnet3.c
View File

@ -1194,8 +1194,13 @@ static void vmxnet3_reset_mac(VMXNET3State *s)
static void vmxnet3_deactivate_device(VMXNET3State *s) static void vmxnet3_deactivate_device(VMXNET3State *s)
{ {
VMW_CBPRN("Deactivating vmxnet3..."); if (s->device_active) {
s->device_active = false; VMW_CBPRN("Deactivating vmxnet3...");
vmxnet_tx_pkt_reset(s->tx_pkt);
vmxnet_tx_pkt_uninit(s->tx_pkt);
vmxnet_rx_pkt_uninit(s->rx_pkt);
s->device_active = false;
}
} }
static void vmxnet3_reset(VMXNET3State *s) static void vmxnet3_reset(VMXNET3State *s)
@ -1204,7 +1209,6 @@ static void vmxnet3_reset(VMXNET3State *s)
vmxnet3_deactivate_device(s); vmxnet3_deactivate_device(s);
vmxnet3_reset_interrupt_states(s); vmxnet3_reset_interrupt_states(s);
vmxnet_tx_pkt_reset(s->tx_pkt);
s->drv_shmem = 0; s->drv_shmem = 0;
s->tx_sop = true; s->tx_sop = true;
s->skip_current_tx_pkt = false; s->skip_current_tx_pkt = false;
@ -1431,6 +1435,12 @@ static void vmxnet3_activate_device(VMXNET3State *s)
return; return;
} }
/* Verify if device is active */
if (s->device_active) {
VMW_CFPRN("Vmxnet3 device is active");
return;
}
vmxnet3_adjust_by_guest_type(s); vmxnet3_adjust_by_guest_type(s);
vmxnet3_update_features(s); vmxnet3_update_features(s);
vmxnet3_update_pm_state(s); vmxnet3_update_pm_state(s);
@ -1627,7 +1637,7 @@ static void vmxnet3_handle_command(VMXNET3State *s, uint64_t cmd)
break; break;
case VMXNET3_CMD_QUIESCE_DEV: case VMXNET3_CMD_QUIESCE_DEV:
VMW_CBPRN("Set: VMXNET3_CMD_QUIESCE_DEV - pause the device"); VMW_CBPRN("Set: VMXNET3_CMD_QUIESCE_DEV - deactivate the device");
vmxnet3_deactivate_device(s); vmxnet3_deactivate_device(s);
break; break;
@ -1741,7 +1751,7 @@ vmxnet3_io_bar1_write(void *opaque,
* shared address only after we get the high part * shared address only after we get the high part
*/ */
if (val == 0) { if (val == 0) {
s->device_active = false; vmxnet3_deactivate_device(s);
} }
s->temp_shared_guest_driver_memory = val; s->temp_shared_guest_driver_memory = val;
s->drv_shmem = 0; s->drv_shmem = 0;
@ -2021,9 +2031,7 @@ static bool vmxnet3_peer_has_vnet_hdr(VMXNET3State *s)
static void vmxnet3_net_uninit(VMXNET3State *s) static void vmxnet3_net_uninit(VMXNET3State *s)
{ {
g_free(s->mcast_list); g_free(s->mcast_list);
vmxnet_tx_pkt_reset(s->tx_pkt); vmxnet3_deactivate_device(s);
vmxnet_tx_pkt_uninit(s->tx_pkt);
vmxnet_rx_pkt_uninit(s->rx_pkt);
qemu_del_nic(s->nic); qemu_del_nic(s->nic);
} }