[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/11] ide: Reject invalid CHS geometry
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 11/11] ide: Reject invalid CHS geometry |
Date: |
Wed, 30 Jun 2010 13:55:42 +0200 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/11] Still more block related fixes and cleanups, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 02/11] block migration: Fix test for read-only drive, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 01/11] blockdev: Clean up how readonly persists across virtual media change, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 10/11] ide: Reject readonly drives unless CD-ROM, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 07/11] ide: Improve error messages, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 03/11] raw-posix: Don't "try harder" for BDRV_TYPE_CDROM, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 08/11] ide: Replace IDEState members is_cdrom, is_cf by drive_kind, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 09/11] ide: Make ide_init_drive() return success, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 05/11] fdc: Reject unimplemented error actions, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 11/11] ide: Reject invalid CHS geometry,
Markus Armbruster <=
- [Qemu-devel] [PATCH 06/11] qdev: Don't hw_error() in qdev_init_nofail(), Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 04/11] scsi: Reject unimplemented error actions, Markus Armbruster, 2010/06/30