The following changes since commit c012e1b7ad066f462ba1c3322fcb43cd8295eaff:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151027-1' into staging (2015-10-27 16:17:55 +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 52b4bb7383b32e4e7512f98c57738c8fc9cb35ba: lan9118: log and ignore access to invalid registers, rather than aborting (2015-12-07 21:43:48 +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 Changes from V1: - Unbreak 32bit build by dropping the vmxnet3 debug printf fixes 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) 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/vmxnet3.c | 1 - 4 files changed, 29 insertions(+), 11 deletions(-) -- 2.5.0
