From patchwork Tue Jul 6 12:08:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 58006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B1AD0B6F05 for ; Tue, 6 Jul 2010 22:31:58 +1000 (EST) Received: from localhost ([127.0.0.1]:56623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7Jb-0001qI-76 for incoming@patchwork.ozlabs.org; Tue, 06 Jul 2010 08:31:55 -0400 Received: from [140.186.70.92] (port=56487 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7BM-0003OA-Ir for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:23:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OW6xR-0003Jg-5B for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:09:05 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:38920) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OW6xQ-0003J1-Ux for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:09:01 -0400 Received: from blackfin.pond.sub.org (pD9E3954B.dip.t-dialin.net [217.227.149.75]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 4263D2F2910; Tue, 6 Jul 2010 14:08:58 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 052FB449; Tue, 6 Jul 2010 14:08:57 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 6 Jul 2010 14:08:56 +0200 Message-Id: <1278418136-24556-14-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1278418136-24556-1-git-send-email-armbru@redhat.com> References: <1278418136-24556-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH v2 13/13] ide: Reject invalid CHS geometry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org drive_init() doesn't permit invalid CHS for if=ide, but that's worthless: we get it via if=none and -device. Signed-off-by: Markus Armbruster --- hw/ide/core.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 3b84bea..af52c2c 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2604,6 +2604,18 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, s->bs = bs; bdrv_get_geometry(bs, &nb_sectors); bdrv_guess_geometry(bs, &cylinders, &heads, &secs); + if (cylinders < 1 || cylinders > 16383) { + error_report("cyls must be between 1 and 16383"); + return -1; + } + if (heads < 1 || heads > 16) { + error_report("heads must be between 1 and 16"); + return -1; + } + if (secs < 1 || secs > 63) { + error_report("secs must be between 1 and 63"); + return -1; + } s->cylinders = cylinders; s->heads = heads; s->sectors = secs;