From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5mES-0004n3-0a for qemu-devel@nongnu.org; Thu, 18 Jun 2015 22:40:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5mEQ-0004OU-Ot for qemu-devel@nongnu.org; Thu, 18 Jun 2015 22:40:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5mEQ-0004OC-Kb for qemu-devel@nongnu.org; Thu, 18 Jun 2015 22:40:38 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 47D922F66B4 for ; Fri, 19 Jun 2015 02:40:38 +0000 (UTC) From: Laszlo Ersek Date: Fri, 19 Jun 2015 04:40:15 +0200 Message-Id: <1434681617-15539-9-git-send-email-lersek@redhat.com> In-Reply-To: <1434681617-15539-1-git-send-email-lersek@redhat.com> References: <1434681617-15539-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v7 08/10] hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, lersek@redhat.com Cc: Marcel Apfelbaum , Markus Armbruster , "Michael S. Tsirkin" 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: Markus Armbruster Cc: Marcel Apfelbaum Cc: Michael S. Tsirkin Signed-off-by: Laszlo Ersek Tested-by: Marcel Apfelbaum Reviewed-by: Marcel Apfelbaum Reviewed-by: Markus Armbruster --- Notes: v7: - no changes - already part of a pending pull request: http://thread.gmane.org/gmane.comp.emulators.qemu/344941/focus=344948 v6: - no changes v5: - separate "%s@" from TARGET_FMT_plx with a space [Markus] - copied Markus's note about "no arbitrary length limit" on the retval into the commit message v4: - unchanged v3: - new in v3 hw/core/sysbus.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index b53c351..92eced9 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -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, - s->mmio[0].addr); - } else if (s->num_pio) { - snprintf(path + off, sizeof(path) - off, "@i%04x", s->pio[0]); + return g_strdup_printf("%s@" TARGET_FMT_plx, qdev_fw_name(dev), + s->mmio[0].addr); } - - 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, -- 1.8.3.1