From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51087)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1bgtXi-0004gS-MM
	for qemu-devel@nongnu.org; Mon, 05 Sep 2016 09:02:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1bgtXf-0007rW-Hu
	for qemu-devel@nongnu.org; Mon, 05 Sep 2016 09:02:30 -0400
Received: from mx1.redhat.com ([209.132.183.28]:60096)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1bgtXf-0007rM-CU
	for qemu-devel@nongnu.org; Mon, 05 Sep 2016 09:02:27 -0400
References: <1472884428-9975-1-git-send-email-ppandit@redhat.com>
	<fe88297e-34a1-a51c-b964-062f31c20b14@redhat.com>
	<alpine.LFD.2.20.1609051450510.15083@wniryva>
	<ea703469-dc33-d1f5-3221-8d0f67bde362@redhat.com>
	<alpine.LFD.2.20.1609051600210.15714@wniryva>
	<c1eca7af-a918-8938-6d7e-dacf74e35c80@redhat.com>
	<alpine.LFD.2.20.1609051824140.16376@wniryva>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <d115ae37-d7fe-4351-f802-5dec1c23422b@redhat.com>
Date: Mon, 5 Sep 2016 15:02:21 +0200
MIME-Version: 1.0
In-Reply-To: <alpine.LFD.2.20.1609051824140.16376@wniryva>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] scsi: pvscsi: request descriptor
 data_length to 32 bit
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: P J P <ppandit@redhat.com>
Cc: Qemu Developers <qemu-devel@nongnu.org>, Dmitry Fleytman <dmitry@daynix.com>, Li Qiang <liqiang6-s@360.cn>



On 05/09/2016 14:58, P J P wrote:
> +-- On Mon, 5 Sep 2016, Paolo Bonzini wrote --+
> | Without a public spec it's hard, but I guess 2048 is more than enough.
> 
> ===
> diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
> index 4245c15..4823b9d 100644
> --- a/hw/scsi/vmw_pvscsi.c
> +++ b/hw/scsi/vmw_pvscsi.c
> @@ -628,17 +628,16 @@ pvscsi_queue_pending_descriptor(PVSCSIState *s, SCSIDevice **d,
>  static void
>  pvscsi_convert_sglist(PVSCSIRequest *r)
>  {
> -    int chunk_size;
> +    int chunk_size, n = 0;

chunk_size should be uint32_t.

>      uint64_t data_length = r->req.dataLen;
>      PVSCSISGState sg = r->sg;
> -    while (data_length) {
> -        while (!sg.resid) {
> +    while (data_length && n < 2048) {
> +        while (!sg.resid && n++ < 2048) {
>              pvscsi_get_next_sg_elem(&sg);
>              trace_pvscsi_convert_sglist(r->req.context, r->sg.dataAddr,
>                                          r->sg.resid);
>          }
> -        assert(data_length > 0);
> -        chunk_size = MIN((unsigned) data_length, sg.resid);
> +        chunk_size = MIN(data_length, sg.resid);
>          if (chunk_size) {
>              qemu_sglist_add(&r->sgl, sg.dataAddr, chunk_size);
>          }
> ===
> 
> Does this look okay?

Yes, just change 2048 to a #define PVSCSI_MAX_SG_ELEM.

Paolo

> --
> Prasad J Pandit / Red Hat Product Security Team
> 47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F
>