linux-kernel - Re: [PATCH 4/9] staging: panel: fix error path

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 30 Jul 2010 23:11:27 +0200
From:	Willy Tarreau <w@....eu>
To:	Kulikov Vasiliy <segooon@...il.com>
Cc:	kernel-janitors@...r.kernel.org,
	Greg Kroah-Hartman <gregkh@...e.de>,
	Peter Huewe <peterhuewe@....de>,
	Andy Shevchenko <andy.shevchenko@...il.com>,
	Julia Lawall <julia@...u.dk>, devel@...verdev.osuosl.org,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 4/9] staging: panel: fix error path

Looks fine,

Acked-by: Willy Tarreau <w@....eu>

On Fri, Jul 30, 2010 at 03:08:20PM +0400, Kulikov Vasiliy wrote:
> panel_attach() poorly handles errors. On error unregister everything we
> have registered.
> 
> Signed-off-by: Kulikov Vasiliy <segooon@...il.com>
> ---
>  drivers/staging/panel/panel.c |   22 +++++++++++++++++++---
>  1 files changed, 19 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
> index 8bd7182..f58da32 100644
> --- a/drivers/staging/panel/panel.c
> +++ b/drivers/staging/panel/panel.c
> @@ -2127,12 +2127,18 @@ static void panel_attach(struct parport *port)
>  				       NULL,
>  				       /*PARPORT_DEV_EXCL */
>  				       0, (void *)&pprt);
> +	if (pprt == NULL) {
> +		pr_err("panel_attach(): port->number=%d parport=%d, "
> +		       "parport_register_device() failed\n",
> +		       port->number, parport);
> +		return;
> +	}
>  
>  	if (parport_claim(pprt)) {
>  		printk(KERN_ERR
>  		       "Panel: could not claim access to parport%d. "
>  		       "Aborting.\n", parport);
> -		return;
> +		goto err_unreg_device;
>  	}
>  
>  	/* must init LCD first, just in case an IRQ from the keypad is
> @@ -2140,13 +2146,23 @@ static void panel_attach(struct parport *port)
>  	 */
>  	if (lcd_enabled) {
>  		lcd_init();
> -		misc_register(&lcd_dev);
> +		if (misc_register(&lcd_dev))
> +			goto err_unreg_device;
>  	}
>  
>  	if (keypad_enabled) {
>  		keypad_init();
> -		misc_register(&keypad_dev);
> +		if (misc_register(&keypad_dev))
> +			goto err_lcd_unreg;
>  	}
> +	return;
> +
> +err_lcd_unreg:
> +	if (lcd_enabled)
> +		misc_deregister(&lcd_dev);
> +err_unreg_device:
> +	parport_unregister_device(pprt);
> +	pprt = NULL;
>  }
>  
>  static void panel_detach(struct parport *port)
> -- 
> 1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/