[Qemu-commits] [qemu/qemu] 47882f: net: vmxnet: use g_new for pkt initialisation

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 47882fa4975bf0b58dd74474329fdd7154e8f04c
      
https://github.com/qemu/qemu/commit/47882fa4975bf0b58dd74474329fdd7154e8f04c
  Author: Li Qiang <address@hidden>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

  Changed paths:
    M hw/net/net_tx_pkt.c

  Log Message:
  -----------
  net: vmxnet: use g_new for pkt initialisation

When network transport abstraction layer initialises pkt, the maximum
fragmentation count is not checked. This could lead to an integer
overflow causing a NULL pointer dereference. Replace g_malloc() with
g_new() to catch the multiplication overflow.

Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Acked-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: e9e0a5854b6dc888f44e7e280a007326714199a6
      
https://github.com/qemu/qemu/commit/e9e0a5854b6dc888f44e7e280a007326714199a6
  Author: Zhang Chen <address@hidden>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net/net: properly handle multiple packets in net_fill_rstate()

When network is busy, we will receive multiple packets at one time. In
that situation, we should keep trying to do the receiving instead of
finalizing only the first packet.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 5844365fe8e5e4598222d276d2af54fd45c7e3d3
      
https://github.com/qemu/qemu/commit/5844365fe8e5e4598222d276d2af54fd45c7e3d3
  Author: Peter Maydell <address@hidden>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

  Changed paths:
    M hw/net/net_tx_pkt.c
    M net/net.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Thu 18 Aug 2016 06:36:16 BST
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  net/net: properly handle multiple packets in net_fill_rstate()
  net: vmxnet: use g_new for pkt initialisation

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4b887ae65880...5844365fe8e5