[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] check for available room when formatting OpenFirmwa
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path |
Date: |
Mon, 23 Jul 2012 13:33:33 +0200 |
Signed-off-by: Laszlo Ersek <address@hidden>
---
hw/qdev.c | 14 +++++++++++++-
vl.c | 7 ++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index af54467..f1e83a4 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -502,6 +502,10 @@ static int qdev_get_fw_dev_path_helper(DeviceState *dev,
char *p, int size)
if (dev && dev->parent_bus) {
char *d;
l = qdev_get_fw_dev_path_helper(dev->parent_bus->parent, p, size);
+ if (l >= size) {
+ return l;
+ }
+
d = bus_get_fw_dev_path(dev->parent_bus, dev);
if (d) {
l += snprintf(p + l, size - l, "%s", d);
@@ -509,6 +513,10 @@ static int qdev_get_fw_dev_path_helper(DeviceState *dev,
char *p, int size)
} else {
l += snprintf(p + l, size - l, "%s",
object_get_typename(OBJECT(dev)));
}
+
+ if (l >= size) {
+ return l;
+ }
}
l += snprintf(p + l , size - l, "/");
@@ -520,8 +528,12 @@ char* qdev_get_fw_dev_path(DeviceState *dev)
char path[128];
int l;
- l = qdev_get_fw_dev_path_helper(dev, path, 128);
+ l = qdev_get_fw_dev_path_helper(dev, path, sizeof(path));
+ assert(l > 0);
+ if (l >= sizeof(path)) {
+ return NULL;
+ }
path[l-1] = '\0';
return strdup(path);
diff --git a/vl.c b/vl.c
index 8904db1..78dcc93 100644
--- a/vl.c
+++ b/vl.c
@@ -913,7 +913,12 @@ char *get_boot_devices_list(uint32_t *size)
if (i->dev) {
devpath = qdev_get_fw_dev_path(i->dev);
- assert(devpath);
+ if (devpath == NULL) {
+ fprintf(stderr,
+ "OpenFirmware Device Path too long (boot index %d)\n",
+ i->bootindex);
+ exit(1);
+ }
}
if (i->suffix && devpath) {
--
1.7.1
- [Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path,
Laszlo Ersek <=
- Re: [Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path, Peter Maydell, 2012/07/23
- Re: [Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path, Markus Armbruster, 2012/07/23
- Re: [Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path, Laszlo Ersek, 2012/07/23
- Re: [Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path, Markus Armbruster, 2012/07/23
- Re: [Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path, Laszlo Ersek, 2012/07/23
- Re: [Qemu-devel] [PATCH] check for available room when formatting OpenFirmware device path, Markus Armbruster, 2012/07/23
- [Qemu-devel] [PATCH v2 0/2] assorted device path formatting cleanups, Laszlo Ersek, 2012/07/24
- [Qemu-devel] [PATCH v2 1/2] accomodate OpenFirmware device paths in sufficient storage, Laszlo Ersek, 2012/07/24
- Re: [Qemu-devel] [PATCH v2 1/2] accomodate OpenFirmware device paths in sufficient storage, Peter Maydell, 2012/07/25