From patchwork Wed Oct 5 07:12:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 117747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE91DB6F97 for ; Wed, 5 Oct 2011 18:12:35 +1100 (EST) Received: from localhost ([::1]:43195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLeb-0005by-68 for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2011 03:12:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLeI-0005OP-NE for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:12:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBLeH-0005Kc-RS for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:12:14 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:40277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLeH-0005Je-N2 for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:12:13 -0400 Received: by wyh22 with SMTP id 22so1502868wyh.4 for ; Wed, 05 Oct 2011 00:12:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=EySA0nfu7y4xTifupthwLYR5RnEbD41DIE3Lfsc/I4w=; b=XJAPxZOqNhC6WToaH+hZaYIr0D+mD2kvuDjUTnpuCi1Z9WOM5cX0HFfUFuQOMprzUp 8Zn8IkyfNe0tJ2cZwijFdzaZD0H6IvQSix/qBzs2wG+mLd/LBwKNgV4f/Q8fP8qSsQNo lqnnFZWzVxyxvi3a5MYmSJ/BfoQFicrU54jEY= Received: by 10.227.133.144 with SMTP id f16mr2575877wbt.97.1317798732786; Wed, 05 Oct 2011 00:12:12 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id s30sm1186914wbm.12.2011.10.05.00.12.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Oct 2011 00:12:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2011 09:12:03 +0200 Message-Id: <1317798728-28938-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317798728-28938-1-git-send-email-pbonzini@redhat.com> References: <1317798728-28938-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [PATCH 1/6] vvfat: fix out of bounds array_get usage 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 When reading the address of the first free entry, you cannot use array_get without first marking all entries as occupied. This is visible if you change the sectors per cluster on a floppy from 2 to 1. Signed-off-by: Paolo Bonzini --- block/vvfat.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index f567c9a..cee3971 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -799,6 +799,7 @@ static int read_directory(BDRVVVFATState* s, int mapping_index) /* root directory */ int cur = s->directory.next; array_ensure_allocated(&(s->directory), ROOT_ENTRIES - 1); + s->directory.next = ROOT_ENTRIES; memset(array_get(&(s->directory), cur), 0, (ROOT_ENTRIES - cur) * sizeof(direntry_t)); }