From 9fdbdd062bfc187e2aa32f7880fa7e8ae717efdf Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Thu, 6 Oct 2011 14:29:48 -0700 Subject: parport_pc: release IO region properly if unsupported ITE887x card is found 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 Acked-by: Niels de Vos Cc: Bjorn Helgaas Cc: Alan Cox Cc: Joe Krahn Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/parport/parport_pc.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/parport') diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index d1cdb9449f8..d0b597b5039 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c @@ -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; } -- cgit v1.2.3-70-g09d2