From patchwork Tue Jul 28 00:32:16 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: 500955 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 C1FF0140D19 for ; Tue, 28 Jul 2015 10:37:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ogBo8Bo5; dkim-atps=neutral Received: from localhost ([::1]:56372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJsty-0006KV-OC for incoming@patchwork.ozlabs.org; Mon, 27 Jul 2015 20:37:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJspf-0006d3-Oq for qemu-devel@nongnu.org; Mon, 27 Jul 2015 20:33:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJspc-0004rc-Hr for qemu-devel@nongnu.org; Mon, 27 Jul 2015 20:33:23 -0400 Received: from mail-qg0-x22f.google.com ([2607:f8b0:400d:c04::22f]:34632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJspc-0004rU-6e for qemu-devel@nongnu.org; Mon, 27 Jul 2015 20:33:20 -0400 Received: by qgeu79 with SMTP id u79so64791709qge.1 for ; Mon, 27 Jul 2015 17:33:19 -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=ZUXtW6itVDOJyielxhyNDfYgyKGJqaq8RcJyARYHhSw=; b=ogBo8Bo5fl14hO2PoZBhbejPusNmTvB1OU0QKiUoSF7htLD5XJbN3LZAXaHd3kguPp f+5mdOYh11xBKhxczYrRjnMTFH0WSH1ZffclQEV7ZTA3ZVZXsxOsmKrNVkxOFGU7CEWI zX0Nv6uPnbag1NAJiEdDGBVtwesILEHhacFBX1Q2V+/mtHdiGmktgOHYT+HzJo1/ohkj w0mJS6jr+Go6+282kQwV31anyribzjPkKv2BGWtGlnZ4NrpBzm7ar7gnVs0S1ceZyE3G zRHUnMz4KKscnRV9fGXCo1uHKa0mlX9Mi7FuKRZcRKtiXV4o55L19bfwKFOvVvIII/h1 lvvQ== X-Received: by 10.141.28.147 with SMTP id f141mr46897898qhe.91.1438043599901; Mon, 27 Jul 2015 17:33:19 -0700 (PDT) Received: from localhost (APoitiers-257-1-37-212.w90-38.abo.wanadoo.fr. [90.38.212.212]) by smtp.gmail.com with ESMTPSA id 143sm10191808qhw.21.2015.07.27.17.33.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jul 2015 17:33:18 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 28 Jul 2015 02:32:16 +0200 Message-Id: <1438043577-28636-5-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438043577-28636-1-git-send-email-marcandre.lureau@redhat.com> References: <1438043577-28636-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::22f Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , drjones@redhat.com, cam@cs.ualberta.ca, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 04/45] ivshmem: fix number of bytes to push to fifo 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 If the fifo has 0 bytes, and the read is of size 1, the call to fifo8_push_all() will copy out of bounds data. Signed-off-by: Marc-André Lureau --- hw/misc/ivshmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index fb53b3f..2162d02 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -455,7 +455,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) uint32_t num; IVSHMEM_DPRINTF("short read of %d bytes\n", size); - num = MAX(size, sizeof(long) - fifo8_num_used(&s->incoming_fifo)); + num = MIN(size, sizeof(long) - fifo8_num_used(&s->incoming_fifo)); fifo8_push_all(&s->incoming_fifo, buf, num); if (fifo8_num_used(&s->incoming_fifo) < sizeof(incoming_posn)) { return;