From patchwork Tue Oct 6 19:19:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 526986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 19048140D88 for ; Wed, 7 Oct 2015 07:56:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=iZYF3ZkD; dkim-atps=neutral Received: from localhost ([::1]:53974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjZHf-0005dL-Ir for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 16:56:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjZGP-0003tB-VS for qemu-devel@nongnu.org; Tue, 06 Oct 2015 16:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjZGO-0004b8-28 for qemu-devel@nongnu.org; Tue, 06 Oct 2015 16:55:08 -0400 Received: from mail-qg0-x234.google.com ([2607:f8b0:400d:c04::234]:34683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXnk-0005mm-4Z for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:28 -0400 Received: by qgez77 with SMTP id z77so184248130qge.1 for ; Tue, 06 Oct 2015 12:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=irE7bknAWWXXtiBHf1BNRFuODSjZs7EHCa8VgfwV8BE=; b=iZYF3ZkDKWwaeDiN3DyhLhyBxBsw9iYIptNaVyoBHmcnEavzW/khv0UJFO+wO9yPMk DOYkfhH75QDoxUOD72iLQR+pkPfxAnte8yJhmMKAkY0FPAkmTU6OcnozSqtFtEYm+/0p FgXQ3eWy+Q61W7VgmtCwERL9ks+Askcb9WFz+2uudeWKzsvJv/TroMfjeY8jtYGwCQoy oKFZkEwt2/OHIIYWjvX8iHLEGncxC4O9X1BR0QUjEoj66D+5hJC517d9ClQO948+1AOL eZPlbZGh2cqNfxeD2HInroLiA/EelWQNgFcfDe+8c4IkHfiBMMIUJ/nwzg+9BhQJFmPk 8Iuw== X-Received: by 10.140.152.134 with SMTP id 128mr51202121qhy.65.1444159287762; Tue, 06 Oct 2015 12:21:27 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id t48sm14529523qgd.15.2015.10.06.12.21.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 12:21:26 -0700 (PDT) From: marcandre.lureau@redhat.com To: peter.maydell@linaro.org Date: Tue, 6 Oct 2015 21:19:25 +0200 Message-Id: <1444159184-18153-30-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> References: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::234 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 29/48] ivshmem: error on too many eventfd received X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau The number of eventfd that can be handled per peer is limited by the number of vectors. Return an error when receiving too many of them. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- hw/misc/ivshmem.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 0e31d1d..50af4c7 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -571,6 +571,14 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) /* each peer has an associated array of eventfds, and we keep * track of how many eventfds received so far */ /* get a new eventfd: */ + /* get a new eventfd */ + if (peer->nb_eventfds >= s->vectors) { + error_report("Too many eventfd received, device has %d vectors", + s->vectors); + close(incoming_fd); + return; + } + new_eventfd = peer->nb_eventfds++; /* this is an eventfd for a particular peer VM */