]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
parport_pc: release IO region properly if unsupported ITE887x card is found
authorJiri Kosina <jkosina@suse.cz>
Thu, 6 Oct 2011 21:29:48 +0000 (14:29 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 18 Oct 2011 21:17:40 +0000 (14:17 -0700)
sio_ite_8872_probe() bails out if it detects no-parallel (1S, 2S) or
unknown card.

It doesn't call release_region() on the previously allocated resource
though.  This causes

  (a) leak of the resource
  (b) kernel oops when parport module is removed and /proc/ioports is read. This
      is because the string that has been associated to the IO port region
      is a static char array inside the already removed module.

Let's call release_region() properly before baling out.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Acked-by: Niels de Vos <ndevos@redhat.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Joe Krahn <krahn@niehs.nih.gov>
Signed-off-by: Andrew Morton <akpm@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/parport/parport_pc.c

index d1cdb9449f842dc550506e3388733aad4852349b..d0b597b503983a68f655971970d7392876c3b224 100644 (file)
@@ -2595,14 +2595,17 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
                break;
        case 0x6:
                printk(KERN_INFO "parport_pc: ITE8873 found (1S)\n");
+               release_region(inta_addr[i], 32);
                return 0;
        case 0x8:
                printk(KERN_INFO "parport_pc: ITE8874 found (2S)\n");
+               release_region(inta_addr[i], 32);
                return 0;
        default:
                printk(KERN_INFO "parport_pc: unknown ITE887x\n");
                printk(KERN_INFO "parport_pc: please mail 'lspci -nvv' "
                        "output to Rich.Liu@ite.com.tw\n");
+               release_region(inta_addr[i], 32);
                return 0;
        }