From patchwork Tue Oct 6 19:19:28 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: 527031 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 33DF1140D8B for ; Wed, 7 Oct 2015 09:15:22 +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=PoGij4NQ; dkim-atps=neutral Received: from localhost ([::1]:54337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjaW0-0007iF-0N for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 18:15:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjaVl-0007MZ-9u for qemu-devel@nongnu.org; Tue, 06 Oct 2015 18:15:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjaVg-0007aQ-Qu for qemu-devel@nongnu.org; Tue, 06 Oct 2015 18:15:05 -0400 Received: from mail-qk0-x22c.google.com ([2607:f8b0:400d:c09::22c]:34514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXnu-00064U-0A for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:38 -0400 Received: by qkbi190 with SMTP id i190so70135709qkb.1 for ; Tue, 06 Oct 2015 12:21:37 -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=Mgwyk99R39aheDkiQvp6BCG3ouNztnRp7ovRp9xXDgc=; b=PoGij4NQuycBx52U/wpzT1VDxglqUD0epBWXpjjCWkKD6MqqYShb+jhquSVxP0x2bQ JY5ZN6B28NFDPZ6Yb9lHqgEDX2x+crmdRIljUV8euRz6NbudPHiev1YzNgz8yH0VlnPX YowGvcntcMfsJfijmwIjYolukkEeSIvxxWEZCntkaVhbkoTFPxrvOtc7KVT9xldkwEMg MPigoeQ6i3hqN/Kw3aIYrH3fdJmdR2eBZw9L2QzogC3KIyDO9w7XCgcGnbuYFHohBFKY mE6KxfBnB1Wlk46kcsbc8AgfdPAt2Gu6vwIGnaxLBy089PTb79J9QLXJ0C2MZklmVn+g Bs4w== X-Received: by 10.55.51.84 with SMTP id z81mr49390837qkz.21.1444159297602; Tue, 06 Oct 2015 12:21:37 -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 c7sm14535152qgc.2.2015.10.06.12.21.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 12:21:36 -0700 (PDT) From: marcandre.lureau@redhat.com To: peter.maydell@linaro.org Date: Tue, 6 Oct 2015 21:19:28 +0200 Message-Id: <1444159184-18153-33-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:c09::22c Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 32/48] ivshmem-client: check the number of vectors 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 Check the number of vectors received from the server, to avoid out of bound array access. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- contrib/ivshmem-client/ivshmem-client.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/ivshmem-client/ivshmem-client.c b/contrib/ivshmem-client/ivshmem-client.c index 11c805c..a1198df 100644 --- a/contrib/ivshmem-client/ivshmem-client.c +++ b/contrib/ivshmem-client/ivshmem-client.c @@ -128,6 +128,11 @@ ivshmem_client_handle_server_msg(IvshmemClient *client) /* new vector */ IVSHMEM_CLIENT_DEBUG(client, " new vector %d (fd=%d) for peer id %ld\n", peer->vectors_count, fd, peer->id); + if (peer->vectors_count >= G_N_ELEMENTS(peer->vectors)) { + IVSHMEM_CLIENT_DEBUG(client, "Too many vectors received, failing"); + return -1; + } + peer->vectors[peer->vectors_count] = fd; peer->vectors_count++;