From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46557)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <agraf@suse.de>) id 1b5XxR-00019r-U3
	for qemu-devel@nongnu.org; Wed, 25 May 2016 08:30:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <agraf@suse.de>) id 1b5XxN-00018A-7Q
	for qemu-devel@nongnu.org; Wed, 25 May 2016 08:30:40 -0400
Received: from mx2.suse.de ([195.135.220.15]:48726)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <agraf@suse.de>) id 1b5XxM-000186-RZ
	for qemu-devel@nongnu.org; Wed, 25 May 2016 08:30:37 -0400
References: <1464179110-18593-1-git-send-email-ppandit@redhat.com>
From: Alexander Graf <agraf@suse.de>
Message-ID: <57459AEB.1080208@suse.de>
Date: Wed, 25 May 2016 14:30:35 +0200
MIME-Version: 1.0
In-Reply-To: <1464179110-18593-1-git-send-email-ppandit@redhat.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2] scsi: megasas: check 'read_queue_head'
 index value
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>, Qemu Developers <qemu-devel@nongnu.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Li Qiang <liqiang6-s@360.cn>, Hannes Reinecke <hare@suse.de>, Prasad J Pandit <pjp@fedoraproject.org>

On 05/25/2016 02:25 PM, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> While doing MegaRAID SAS controller command frame lookup, routine
> 'megasas_lookup_frame' uses 'read_queue_head' value as an index
> into 'frames[MEGASAS_MAX_FRAMES=2048]' array. Limit its value
> within array bounds to avoid any OOB access.
>
> Reported-by: Li Qiang <liqiang6-s@360.cn>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>

Reviewed-by: Alexander Graf <agraf@suse.de>


Alex

> ---
>   hw/scsi/megasas.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> Update as per
>    -> https://lists.gnu.org/archive/html/qemu-devel/2016-05/msg04403.html
>
> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
> index bf642d4..cc66d36 100644
> --- a/hw/scsi/megasas.c
> +++ b/hw/scsi/megasas.c
> @@ -650,7 +650,9 @@ static int megasas_init_firmware(MegasasState *s, MegasasCmd *cmd)
>       pa_hi = le32_to_cpu(initq->pi_addr_hi);
>       s->producer_pa = ((uint64_t) pa_hi << 32) | pa_lo;
>       s->reply_queue_head = ldl_le_pci_dma(pcid, s->producer_pa);
> +    s->reply_queue_head %= MEGASAS_MAX_FRAMES;
>       s->reply_queue_tail = ldl_le_pci_dma(pcid, s->consumer_pa);
> +    s->reply_queue_tail %= MEGASAS_MAX_FRAMES;
>       flags = le32_to_cpu(initq->flags);
>       if (flags & MFI_QUEUE_FLAG_CONTEXT64) {
>           s->flags |= MEGASAS_MASK_USE_QUEUE64;