From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4VIi-0000gR-4N for qemu-devel@nongnu.org; Mon, 15 Jun 2015 10:23:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4VId-0004LJ-Uf for qemu-devel@nongnu.org; Mon, 15 Jun 2015 10:23:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4VId-0004LC-PF for qemu-devel@nongnu.org; Mon, 15 Jun 2015 10:23:43 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 77414C942C for ; Mon, 15 Jun 2015 14:23:43 +0000 (UTC) From: Markus Armbruster References: <557C32AC.7030903@redhat.com> <1434203538-8075-1-git-send-email-lersek@redhat.com> <1434203538-8075-3-git-send-email-lersek@redhat.com> Date: Mon, 15 Jun 2015 16:23:41 +0200 In-Reply-To: <1434203538-8075-3-git-send-email-lersek@redhat.com> (Laszlo Ersek's message of "Sat, 13 Jun 2015 15:52:16 +0200") Message-ID: <87pp4xm4nm.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v4 2/4] 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: Laszlo Ersek Cc: Marcel Apfelbaum , qemu-devel@nongnu.org, "Michael S. Tsirkin" Laszlo Ersek writes: > Cc: Markus Armbruster > Cc: Marcel Apfelbaum > Cc: Michael S. Tsirkin > Signed-off-by: Laszlo Ersek > --- > > Notes: > 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..0ebb4e2 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), I'd put a space between "%s@" and TARGET_FMT_plx. > + 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, Would be nice if we didn't have to triplicate qdev_fw_name(), but I don't have better ideas. Bonus: no arbitrary length limit. Before your 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. Textbook example of how not to use snprintf(). Worth mentioning in the commit message? Reviewed-by: Markus Armbruster