| Message ID | 1449458773-7141-1-git-send-email-jasowang@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 7 December 2015 at 03:26, Jason Wang <jasowang@redhat.com> wrote: > 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 <jasowang@redhat.com> I'm afraid this doesn't build on 32-bit due to format string errors: /home/petmay01/qemu/hw/net/vmxnet3.c: In function 'vmxnet3_complete_packet': /home/petmay01/qemu/hw/net/vmxnet3.c:500:5: error: format '%lu' expects argument of type 'long unsigned int', but argument 7 has type 'size_t' [-Werror=format=] VMXNET3_RING_DUMP(VMW_RIPRN, "TXC", qidx, &s->txq_descr[qidx].comp_ring); ^ /home/petmay01/qemu/hw/net/vmxnet3.c:500:5: error: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c:500:5: error: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c: In function 'vmxnet3_pop_next_tx_descr': /home/petmay01/qemu/hw/net/vmxnet3.c:668:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 7 has type 'size_t' [-Werror=format=] VMXNET3_RING_DUMP(VMW_RIPRN, "TX", qidx, ring); ^ /home/petmay01/qemu/hw/net/vmxnet3.c:668:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c:668:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c: In function 'vmxnet3_rx_need_csum_calculate': /home/petmay01/qemu/hw/net/vmxnet3.c:928:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Werror=format=] VMW_PKPRN("packet len:%lu < csum_start(%d) + csum_offset(%d) + 2, " ^ /home/petmay01/qemu/hw/net/vmxnet3.c: In function 'vmxnet3_activate_device': /home/petmay01/qemu/hw/net/vmxnet3.c:1496:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 7 has type 'size_t' [-Werror=format=] VMXNET3_RING_DUMP(VMW_CFPRN, "TX", i, &s->txq_descr[i].tx_ring); ^ /home/petmay01/qemu/hw/net/vmxnet3.c:1496:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c:1496:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c:1505:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 7 has type 'size_t' [-Werror=format=] VMXNET3_RING_DUMP(VMW_CFPRN, "TXC", i, &s->txq_descr[i].comp_ring); ^ /home/petmay01/qemu/hw/net/vmxnet3.c:1505:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c:1505:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Werror=format=] /home/petmay01/qemu/hw/net/vmxnet3.c: In function 'vmxnet3_receive': /home/petmay01/qemu/hw/net/vmxnet3.c:1977:13: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Werror=format=] VMW_PKPRN("RX: %lu of %lu bytes indicated", bytes_indicated, size); ^ /home/petmay01/qemu/hw/net/vmxnet3.c:1977:13: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t' [-Werror=format=] cc1: all warnings being treated as errors make: *** [hw/net/vmxnet3.o] Error 1 thanks -- PMM
On 7 December 2015 at 11:10, Peter Maydell <peter.maydell@linaro.org> wrote: > On 7 December 2015 at 03:26, Jason Wang <jasowang@redhat.com> wrote: >> 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 <jasowang@redhat.com> > > I'm afraid this doesn't build on 32-bit due to format string errors: My suggested fix is that you just drop the offending patches: we do not need to be fixing debug printf messages for rc3. thanks -- PMM
----- Original Message ----- > On 7 December 2015 at 11:10, Peter Maydell <peter.maydell@linaro.org> wrote: > > On 7 December 2015 at 03:26, Jason Wang <jasowang@redhat.com> wrote: > >> 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 <jasowang@redhat.com> > > > > I'm afraid this doesn't build on 32-bit due to format string errors: > > My suggested fix is that you just drop the offending patches: > we do not need to be fixing debug printf messages for rc3. > > thanks > -- PMM Sorry, will drop the series of vmxnet3 debug fixes and send a V2 pull soon. > >
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 <jasowang@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(-)