qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Andrew Melnychenko <andrew@daynix.com>, Jason Wang <jasowang@redhat.com>
Subject: [PULL V2 03/14] Fixed integer overflow in e1000e
Date: Tue, 31 Mar 2020 21:21:28 +0800	[thread overview]
Message-ID: <1585660899-11228-4-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1585660899-11228-1-git-send-email-jasowang@redhat.com>

From: Andrew Melnychenko <andrew@daynix.com>

Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1737400
Fixed setting max_queue_num if there are no peers in
NICConf. qemu_new_nic() creates NICState with 1 NetClientState(index
0) without peers, set max_queue_num to 0 - It prevents undefined
behavior and possible crashes, especially during pcie hotplug.

Fixes: 6f3fbe4ed06 ("net: Introduce e1000e device emulation")
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Dmitry Fleytman <dmitry.fleytman@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000e.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index a91dbdc..f2cc155 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -328,7 +328,7 @@ e1000e_init_net_peer(E1000EState *s, PCIDevice *pci_dev, uint8_t *macaddr)
     s->nic = qemu_new_nic(&net_e1000e_info, &s->conf,
         object_get_typename(OBJECT(s)), dev->id, s);
 
-    s->core.max_queue_num = s->conf.peers.queues - 1;
+    s->core.max_queue_num = s->conf.peers.queues ? s->conf.peers.queues - 1 : 0;
 
     trace_e1000e_mac_set_permanent(MAC_ARG(macaddr));
     memcpy(s->core.permanent_mac, macaddr, sizeof(s->core.permanent_mac));
-- 
2.5.0



  parent reply	other threads:[~2020-03-31 13:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31 13:21 [PULL V2 00/14] Net patches Jason Wang
2020-03-31 13:21 ` [PULL V2 01/14] hw/net/i82596: Correct command bitmask (CID 1419392) Jason Wang
2020-03-31 13:21 ` [PULL V2 02/14] hw/net/i82596.c: Avoid reading off end of buffer in i82596_receive() Jason Wang
2020-03-31 13:21 ` Jason Wang [this message]
2020-03-31 13:21 ` [PULL V2 04/14] hw/net/e1000e_core: Let e1000e_can_receive() return a boolean Jason Wang
2020-03-31 13:21 ` [PULL V2 05/14] hw/net/smc91c111: Let smc91c111_can_receive() " Jason Wang
2020-03-31 13:21 ` [PULL V2 06/14] hw/net/rtl8139: Simplify if/else statement Jason Wang
2020-03-31 13:21 ` [PULL V2 07/14] hw/net/rtl8139: Update coding style to make checkpatch.pl happy Jason Wang
2020-03-31 13:21 ` [PULL V2 08/14] hw/net: Make NetCanReceive() return a boolean Jason Wang
2020-03-31 13:21 ` [PULL V2 09/14] hw/net/can: Make CanBusClientInfo::can_receive() " Jason Wang
2020-03-31 13:21 ` [PULL V2 10/14] net/colo-compare.c: Expose "compare_timeout" to users Jason Wang
2020-03-31 13:21 ` [PULL V2 11/14] net/colo-compare.c: Expose "expired_scan_cycle" " Jason Wang
2020-03-31 13:21 ` [PULL V2 12/14] net: tulip: check frame size and r/w data length Jason Wang
2020-03-31 13:21 ` [PULL V2 13/14] hw/net/allwinner-sun8i-emac.c: Fix REG_ADDR_HIGH/LOW reads Jason Wang
2020-03-31 13:21 ` [PULL V2 14/14] qtest: add tulip test case Jason Wang
2020-03-31 14:36 ` [PULL V2 00/14] Net patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1585660899-11228-4-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=andrew@daynix.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).