[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 13/13] ide: Reject invalid CHS geometry
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 13/13] ide: Reject invalid CHS geometry |
Date: |
Tue, 6 Jul 2010 14:08:56 +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 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;
--
1.6.6.1
- [Qemu-devel] [PATCH v2 00/13] Still more block related fixes and cleanups, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 08/13] scsi: Error locations for -drive if=scsi device initialization, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 12/13] ide: Reject readonly drives unless CD-ROM, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 13/13] ide: Reject invalid CHS geometry,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 10/13] ide: Replace IDEState members is_cdrom, is_cf by drive_kind, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 11/13] ide: Make ide_init_drive() return success, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 07/13] error: New qemu_opts_loc_restore(), Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 09/13] ide: Improve error messages, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 04/13] fdc: Reject unimplemented error actions, Markus Armbruster, 2010/07/06