From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56929 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTvtQ-0000nL-Jz for qemu-devel@nongnu.org; Wed, 30 Jun 2010 07:55:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTvtM-0000aG-8y for qemu-devel@nongnu.org; Wed, 30 Jun 2010 07:55:52 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:57052) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTvtM-0000Ze-4j for qemu-devel@nongnu.org; Wed, 30 Jun 2010 07:55:48 -0400 From: Markus Armbruster Date: Wed, 30 Jun 2010 13:55:42 +0200 Message-Id: <1277898942-6501-12-git-send-email-armbru@redhat.com> In-Reply-To: <1277898942-6501-1-git-send-email-armbru@redhat.com> References: <1277898942-6501-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 11/11] ide: Reject invalid CHS geometry List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de 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 73eae20..11edca5 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; -- 1.6.6.1