The following changes since commit 61e3aa25b129b48d8a8cb851aae2a787af7ca5e1:
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-12-04' into staging (2015-12-04 10:55:03 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 7687195a0ddb82fb39113784b51543aad9792a3f: net/vmxnet3: remove redundant VMW_SHPRN(...) definition (2015-12-07 10:54:01 +0800) ---------------------------------------------------------------- Last minutes fixes for 2.5: - Fix e1000 hang issue during win2k12 guest driver shutdown - Fix two pcnet buffer overflow CVEs - Fix lan9118 mac address loaded bit and warn instead of aborting when accessing unimplemented registers - Fix vmxnet3 compile issue when debug is enabled, and always complie and check for debug marcos. Signed-off-by: Jason Wang <jasow...@redhat.com> ---------------------------------------------------------------- Andrew Baumann (2): lan9118: fix emulation of MAC address loaded bit in E2P_CMD register lan9118: log and ignore access to invalid registers, rather than aborting Denis V. Lunev (1): e1000: fix hang of win2k12 shutdown with flood ping Jason Wang (1): pcnet: fix rx buffer overflow(CVE-2015-7512) Miao Yan (3): net/vmxnet3.c: fix a build error when enabling debug output net/vmxnet3: fix debug macro pattern for vmxnet3 net/vmxnet3: remove redundant VMW_SHPRN(...) definition Michael S. Tsirkin (1): vmxnet3: silence warning Prasad J Pandit (1): net: pcnet: add check to validate receive data size(CVE-2015-7504) hw/net/e1000.c | 5 ++ hw/net/lan9118.c | 20 +++++--- hw/net/pcnet.c | 14 +++-- hw/net/vmware_utils.h | 5 +- hw/net/vmxnet3.c | 3 +- hw/net/vmxnet_debug.h | 139 +++++++++++++++++++++++++++++++------------------- 6 files changed, 117 insertions(+), 69 deletions(-) -- 2.5.0
