Bläddra i källkod

isa-superio: validate floppy.count value

Ensure that the value is valid; it can only be zero or one.
And never create a floppy disk controller if it is zero.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini 1 år sedan
förälder
incheckning
41514c0a77
1 ändrade filer med 3 tillägg och 1 borttagningar
  1. 3 1
      hw/isa/isa-superio.c

+ 3 - 1
hw/isa/isa-superio.c

@@ -116,7 +116,9 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
     }
     }
 
 
     /* Floppy disc */
     /* Floppy disc */
-    if (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0)) {
+    assert(k->floppy.count <= 1);
+    if (k->floppy.count &&
+        (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0))) {
         isa = isa_new(TYPE_ISA_FDC);
         isa = isa_new(TYPE_ISA_FDC);
         d = DEVICE(isa);
         d = DEVICE(isa);
         if (k->floppy.get_iobase) {
         if (k->floppy.get_iobase) {