From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48748)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Claudio.Fontana@huawei.com>) id 1ZeOFy-0008FI-29
	for qemu-devel@nongnu.org; Tue, 22 Sep 2015 10:09:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Claudio.Fontana@huawei.com>) id 1ZeOFv-0008Av-Cx
	for qemu-devel@nongnu.org; Tue, 22 Sep 2015 10:09:18 -0400
Received: from lhrrgout.huawei.com ([194.213.3.17]:23739)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Claudio.Fontana@huawei.com>) id 1ZeOFv-00089q-5f
	for qemu-devel@nongnu.org; Tue, 22 Sep 2015 10:09:15 -0400
References: <1442333283-13119-1-git-send-email-marcandre.lureau@redhat.com>
	<1442333283-13119-12-git-send-email-marcandre.lureau@redhat.com>
From: Claudio Fontana <claudio.fontana@huawei.com>
Message-ID: <56016108.3070601@huawei.com>
Date: Tue, 22 Sep 2015 16:09:12 +0200
MIME-Version: 1.0
In-Reply-To: <1442333283-13119-12-git-send-email-marcandre.lureau@redhat.com>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH v3 11/46] ivshmem: limit maximum number of
 peers to G_MAXUINT16
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: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com

On 15.09.2015 18:07, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Limit the maximum number of peers to MAXUINT16. This is more realistic
> and better matches the limit of the doorbell register.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  hw/misc/ivshmem.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
> index 7ba93c0..cd2c4bc 100644
> --- a/hw/misc/ivshmem.c
> +++ b/hw/misc/ivshmem.c
> @@ -34,6 +34,7 @@
>  #define PCI_VENDOR_ID_IVSHMEM   PCI_VENDOR_ID_REDHAT_QUMRANET
>  #define PCI_DEVICE_ID_IVSHMEM   0x1110
>  
> +#define IVSHMEM_MAX_PEERS G_MAXUINT16
>  #define IVSHMEM_IOEVENTFD   0
>  #define IVSHMEM_MSI     1
>  
> @@ -421,8 +422,8 @@ static int increase_dynamic_storage(IVShmemState *s, int new_min_size)
>  
>      int j, old_nb_alloc;
>  
> -    /* check for integer overflow */
> -    if (new_min_size >= INT_MAX / sizeof(Peer) - 1 || new_min_size <= 0) {
> +    /* limit number of max peers */
> +    if (new_min_size <= 0 || new_min_size > IVSHMEM_MAX_PEERS) {
>          return -1;
>      }
>  
> 
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>


-- 
Claudio Fontana
Server Virtualization Architect
Huawei Technologies Duesseldorf GmbH
Riesstraße 25 - 80992 München