From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=55284 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q24rS-0008I1-G3
	for qemu-devel@nongnu.org; Tue, 22 Mar 2011 12:55:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <amit.shah@redhat.com>) id 1Q24rR-0000xW-8J
	for qemu-devel@nongnu.org; Tue, 22 Mar 2011 12:55:14 -0400
Received: from mx1.redhat.com ([209.132.183.28]:59115)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <amit.shah@redhat.com>) id 1Q24rQ-0000xP-K5
	for qemu-devel@nongnu.org; Tue, 22 Mar 2011 12:55:13 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2MGtA7W002720
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Tue, 22 Mar 2011 12:55:10 -0400
Date: Tue, 22 Mar 2011 22:25:06 +0530
From: Amit Shah <amit.shah@redhat.com>
Message-ID: <20110322165506.GB12508@amit-x200.redhat.com>
References: <20110322163250.GA6426@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20110322163250.GA6426@redhat.com>
Subject: [Qemu-devel] Re: [PATCH] virtio-serial: don't crash on invalid input
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: "Michael S. Tsirkin" <mst@redhat.com>
Cc: qemu-devel@nongnu.org

On (Tue) 22 Mar 2011 [18:32:50], Michael S. Tsirkin wrote:
> Fix crash on invalid input in virtio-serial.
> Discovered by code review, untested.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/virtio-serial-bus.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
> index e0bf6c5..8807a2f 100644
> --- a/hw/virtio-serial-bus.c
> +++ b/hw/virtio-serial-bus.c
> @@ -654,6 +654,9 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id)
>  
>          id = qemu_get_be32(f);
>          port = find_port_by_id(s, id);
> +        if (!port) {
> +            return -EINVAL;
> +        }

Just before this, we matched the ports_map which would bail out if the
corresponding port isn't avl. in the destination, so this check is
made redundant.

		Amit