From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LiA7H-00029t-W0
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 12:20:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LiA7D-00023F-47
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 12:20:11 -0400
Received: from [199.232.76.173] (port=40235 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LiA7C-00022g-PG
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 12:20:06 -0400
Received: from e33.co.us.ibm.com ([32.97.110.151]:33431)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <aliguori@us.ibm.com>) id 1LiA7C-0002Iq-BG
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 12:20:06 -0400
Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com
	[9.17.195.106])
	by e33.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n2DGIgfY000666
	for <qemu-devel@nongnu.org>; Fri, 13 Mar 2009 10:18:42 -0600
Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167])
	by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id
	n2DGK4RO154450
	for <qemu-devel@nongnu.org>; Fri, 13 Mar 2009 10:20:04 -0600
Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1])
	by d03av01.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id
	n2DGK49v011488
	for <qemu-devel@nongnu.org>; Fri, 13 Mar 2009 10:20:04 -0600
Message-ID: <49BA87B3.4030006@us.ibm.com>
Date: Fri, 13 Mar 2009 11:20:03 -0500
From: Anthony Liguori <aliguori@us.ibm.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] qemu:virtio-net: Check return size on the
	correct sg list
References: <20090311222657.11804.44816.stgit@kvm.aw>
In-Reply-To: <20090311222657.11804.44816.stgit@kvm.aw>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
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.gnu.org/pipermail/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: qemu-devel@nongnu.org
Cc: alex.williamson@hp.com

Alex Williamson wrote:
> When checking that the size of the control virtqueue return field
> is sufficient, use the correct sg list.
>
> Signed-off-by: Alex Williamson <alex.williamson@hp.com>
>   

Applied to stable and trunk.  Thanks.

Regards,

Anthony Liguori

> ---
>
>  hw/virtio-net.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/virtio-net.c b/hw/virtio-net.c
> index e83d101..ad55bb7 100644
> --- a/hw/virtio-net.c
> +++ b/hw/virtio-net.c
> @@ -228,7 +228,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
>          }
>  
>          if (elem.out_sg[0].iov_len < sizeof(ctrl) ||
> -            elem.out_sg[elem.in_num - 1].iov_len < sizeof(status)) {
> +            elem.in_sg[elem.in_num - 1].iov_len < sizeof(status)) {
>              fprintf(stderr, "virtio-net ctrl header not in correct element\n");
>              exit(1);
>          }
>
>
>
>
>