Commit 5ba03e2d authored Jun 17, 2015 by Laszlo Ersek Committed by Michael S. Tsirkin Jun 19, 2015

hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf()



This is done mainly for improving readability, and in preparation for the
next patch, but Markus pointed out another bonus for the string being
returned:

"No arbitrary length limit. Before the patch, it's 39 characters, and the
code breaks catastrophically when qdev_fw_name() is longer: the second
snprintf() is called with its first argument pointing beyond path[], and
its second argument underflowing to a huge size."

Cc: qemu-stable@nongnu.org
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent 17173886

hw/core/sysbus.c

+6 −10

Original line number	Diff line number	Diff line
		@@ -281,19 +281,15 @@ static void sysbus_dev_print(Monitor mon, DeviceState dev, int indent)
		static char sysbus_get_fw_dev_path(DeviceState dev)
		{
		SysBusDevice *s = SYS_BUS_DEVICE(dev);
		char path[40];
		int off;

		off = snprintf(path, sizeof(path), "%s", qdev_fw_name(dev));

		if (s->num_mmio) {
		snprintf(path + off, sizeof(path) - off, "@"TARGET_FMT_plx,
		return g_strdup_printf("%s@" TARGET_FMT_plx, qdev_fw_name(dev),
		s->mmio[0].addr);
		} else if (s->num_pio) {
		snprintf(path + off, sizeof(path) - off, "@i%04x", s->pio[0]);
		}

		return g_strdup(path);
		if (s->num_pio) {
		return g_strdup_printf("%s@i%04x", qdev_fw_name(dev), s->pio[0]);
		}
		return g_strdup(qdev_fw_name(dev));
		}

		void sysbus_add_io(SysBusDevice *dev, hwaddr addr,