Re: [PATCH 1 of 5 ] /drivers/char ioremap balancing/ returncode check

[Jiri Slaby]

Scott Thompson napsal(a):
> patchset against 2.6.23-rc2 and this set is an audit of 
> /drivers/char/a* 
> through drivers/char .   
> 
> this corrects missing ioremap return checks and balancing on 
> iounmap calls..
> 
> Signed-off-by: Scott Thompson <postfail <at> hushmail.com>


NAK.

> ----------------------------------------------------------
> diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
> index ed76f0a..094323d 100644
> --- a/drivers/char/moxa.c
> +++ b/drivers/char/moxa.c
> @@ -447,6 +447,13 @@ static int __init moxa_init(void)
>  	for (i = 0; i < numBoards; i++) {
>  		moxa_boards[i].basemem = ioremap(moxa_boards[i].baseAddr,
>  				0x4000);
> +		if (!moxa_boards[i].basemem) { 
> +			for (;i > 0;i--)
> +				if (moxa_boards[i].basemem)
> +					iounmap(moxa_boards[i].basemem);
> +
> +			return -ENOMEM; 
> +		}

This leaks. This is loop only for ISA cards. If you have CONFIG_PCI and have the
card, resources of the PCI one are not freed and are unusable from now.

>  	}
>  
>  	return retval;
> diff --git a/drivers/char/sx.c b/drivers/char/sx.c
> index 85a2328..30829ed 100644
> --- a/drivers/char/sx.c
> +++ b/drivers/char/sx.c
> @@ -2627,6 +2627,12 @@ static void __devinit fix_sx_pci(struct 
> pci_dev *pdev, struct sx_board *board)
>  	pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase);
>  	hwbase &= PCI_BASE_ADDRESS_MEM_MASK;
>  	rebase = ioremap(hwbase, 0x80);
> +	if (!rebase) {
> +		printk(KERN_DEBUG 
> +			"sx:ioremap fail, unable to perform cntrl reg fix\n");
> +		return;
> +	}
> +		

1) this should be pci_iomap(pdev, 0, 0x80)
2) KERN_DEBUG is inappropriate and wrap the string in the middle and not in the
beginning
3) you should change void to int and return some error and check it in the caller

>  	t = readl(rebase + CNTRL_REG_OFFSET);
>  	if (t != CNTRL_REG_GOODVALUE) {
>  		printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> "
> diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
> index e5ed091..2381162 100644
> --- a/drivers/char/vr41xx_giu.c
> +++ b/drivers/char/vr41xx_giu.c
> @@ -639,8 +639,10 @@ static int __devinit giu_probe(struct 
> platform_device *dev)
>  	}
>  
>  	irq = platform_get_irq(dev, 0);
> -	if (irq < 0 || irq >= NR_IRQS)
> +	if (irq < 0 || irq >= NR_IRQS) {
> +		iounmap(giu_base);

+ unregister_chrdev()?

>  		return -EBUSY;
> +	}
>  
>  	return cascade_irq(irq, giu_get_irq);
>  }


-- 
Jiri Slaby (jirislaby@xxxxxxxxx)
Faculty of Informatics, Masaryk University
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/