Pci nic: pci_register_device can fail

The pci_register_device() call in PCI nic initialization routines can
fail.  Handle this failure and propagate a meaningful error message to
the user instead of generating a SEGV.

Cc: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/e1000.c b/hw/e1000.c
index 1729db28e1ea690e54eb6d9f7678ce30b3ca5e0f..b0fe917342bd3c2023650202d537f86e9ff0bb84 100644 (file)
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1063,6 +1063,9 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
     d = (E1000State *)pci_register_device(bus, "e1000",
                 sizeof(E1000State), devfn, NULL, NULL);
 
+    if (!d)
+       return NULL;
+
     pci_conf = d->dev.config;
     memset(pci_conf, 0, 256);
 

diff --git a/hw/eepro100.c b/hw/eepro100.c
index caf687a8353d66e9f0217e91fed2bafbc67b8116..8eb94fd46941017832b388120a1fa445c511e62e 100644 (file)
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1764,6 +1764,9 @@ static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd, uint32_t device)
     d = (PCIEEPRO100State *) pci_register_device(bus, nd->model,
                                                  sizeof(PCIEEPRO100State), -1,
                                                  NULL, NULL);
+    if (!d)
+        return NULL;
+
     d->dev.unregister = pci_nic_uninit;
 
     s = &d->eepro100;

diff --git a/hw/ne2000.c b/hw/ne2000.c
index 3f308d4fcd997c6e0257f940dbec578637b3d0f5..975951755dd5c7515b7c9ed348fb98e6794c6b24 100644 (file)
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -810,6 +810,9 @@ PCIDevice *pci_ne2000_init(PCIBus *bus, NICInfo *nd, int devfn)
                                               "NE2000", sizeof(PCINE2000State),
                                               devfn,
                                               NULL, NULL);
+    if (!d)
+       return NULL;
+
     pci_conf = d->dev.config;
     pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK);
     pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_RTL8029);

diff --git a/hw/pcnet.c b/hw/pcnet.c
index 6afa309f97c264e1c120ee68dcc049cb7c1135ac..f3cbd58fb95da7b466cb63564988d5f27f0501c6 100644 (file)
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -2023,7 +2023,11 @@ PCIDevice *pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn)
 
     d = (PCNetState *)pci_register_device(bus, "PCNet", sizeof(PCNetState),
                                           devfn, NULL, NULL);
+    if (!d)
+       return NULL;
+
     d->dev.unregister = pci_pcnet_uninit;
+
     pci_conf = d->dev.config;
 
     pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_AMD);

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 0093ff4a930d3344f6ac264a1a8c969a72c81c2e..19c7623c58ac14bf758369ea8a962c9129d4231c 100644 (file)
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -3451,7 +3451,11 @@ PCIDevice *pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn)
                                               "RTL8139", sizeof(PCIRTL8139State),
                                               devfn,
                                               NULL, NULL);
+    if (!d)
+       return NULL;
+
     d->dev.unregister = pci_rtl8139_uninit;
+
     pci_conf = d->dev.config;
     pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK);
     pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_8139);