[SeaBIOS] [PATCH] ahci: add missing check for allocation failure
Gerd Hoffmann
kraxel at redhat.com
Mon Sep 9 16:34:35 CEST 2013
Triggerable by creating a virtual machine with
*lots* of ahci controllers and disks.
Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
src/ahci.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/ahci.c b/src/ahci.c
index 0e99d14..e2729a9 100644
--- a/src/ahci.c
+++ b/src/ahci.c
@@ -379,12 +379,26 @@ ahci_port_alloc(struct ahci_ctrl_s *ctrl, u32 pnr)
return port;
}
+static void ahci_port_release(struct ahci_port_s *port)
+{
+ ahci_port_reset(port->ctrl, port->pnr);
+ free(port->list);
+ free(port->fis);
+ free(port->cmd);
+ free(port);
+}
+
static struct ahci_port_s* ahci_port_realloc(struct ahci_port_s *port)
{
struct ahci_port_s *tmp;
u32 cmd;
tmp = malloc_fseg(sizeof(*port));
+ if (!tmp) {
+ warn_noalloc();
+ ahci_port_release(port);
+ return NULL;
+ }
*tmp = *port;
free(port);
port = tmp;
@@ -408,15 +422,6 @@ static struct ahci_port_s* ahci_port_realloc(struct ahci_port_s *port)
return port;
}
-static void ahci_port_release(struct ahci_port_s *port)
-{
- ahci_port_reset(port->ctrl, port->pnr);
- free(port->list);
- free(port->fis);
- free(port->cmd);
- free(port);
-}
-
#define MAXMODEL 40
/* See ahci spec chapter 10.1 "Software Initialization of HBA" */
@@ -551,6 +556,8 @@ ahci_port_detect(void *data)
ahci_port_release(port);
else {
port = ahci_port_realloc(port);
+ if (port == NULL)
+ return;
dprintf(1, "AHCI/%d: registering: \"%s\"\n", port->pnr, port->desc);
if (!port->atapi) {
// Register with bcv system.
--
1.8.3.1
More information about the SeaBIOS
mailing list