From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=46854 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PfvOY-0004f2-Rr
	for qemu-devel@nongnu.org; Thu, 20 Jan 2011 09:21:51 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1PfvOX-0001J6-Ff
	for qemu-devel@nongnu.org; Thu, 20 Jan 2011 09:21:50 -0500
Received: from mx1.redhat.com ([209.132.183.28]:46600)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1PfvOX-0001Ih-8r
	for qemu-devel@nongnu.org; Thu, 20 Jan 2011 09:21:49 -0500
Date: Thu, 20 Jan 2011 16:21:32 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20110120142132.GA16337@redhat.com>
References: <AANLkTimi1MXn0S_oW0A6Tvm2oQ=2fgcG4EN7ztqATsxf@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <AANLkTimi1MXn0S_oW0A6Tvm2oQ=2fgcG4EN7ztqATsxf@mail.gmail.com>
Subject: [Qemu-devel] Re: [PATCH] pci: fix pcibus_get_dev_path()
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: TeLeMan <geleman@gmail.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

On Thu, Jan 20, 2011 at 06:31:59PM +0800, TeLeMan wrote:
> The commit 6a7005d14b3c32d4864a718fb1cb19c789f58a5 used snprintf() incorrectly.
> 
> Signed-off-by: TeLeMan <geleman@gmail.com>

This won't work for nested bridges as \n by the first
sprintf overwrites the rest of the string.
I sent a fix titled
[PATCH] pci: fix device paths
look it up.

> ---
>  hw/pci.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index 8d0e3df..9f8800d 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -2050,14 +2050,14 @@ static char *pcibus_get_dev_path(DeviceState *dev)
>      path[path_len] = '\0';
> 
>      /* First field is the domain. */
> -    snprintf(path, domain_len, "%04x:00", pci_find_domain(d->bus));
> +    snprintf(path, domain_len + 1, "%04x:00", pci_find_domain(d->bus));
> 
>      /* Fill in slot numbers. We walk up from device to root, so need to print
>       * them in the reverse order, last to first. */
>      p = path + path_len;
>      for (t = d; t; t = t->bus->parent_dev) {
>          p -= slot_len;
> -        snprintf(p, slot_len, ":%02x.%x", PCI_SLOT(t->devfn),
> PCI_FUNC(d->devfn));
> +        snprintf(p, slot_len + 1, ":%02x.%x", PCI_SLOT(t->devfn),
> PCI_FUNC(d->devfn));
>      }
> 
>      return path;
> -- 
> 1.7.3.1.msysgit.0