* [PATCH 4/9] staging: panel: fix error path
@ 2010-07-30 11:08 Kulikov Vasiliy
2010-07-30 21:11 ` Willy Tarreau
0 siblings, 1 reply; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-07-30 11:08 UTC (permalink / raw)
To: kernel-janitors
Cc: Greg Kroah-Hartman, Willy Tarreau, Peter Huewe, Andy Shevchenko,
Julia Lawall, devel, linux-kernel
panel_attach() poorly handles errors. On error unregister everything we
have registered.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4/9] staging: panel: fix error path
2010-07-30 11:08 [PATCH 4/9] staging: panel: fix error path Kulikov Vasiliy
@ 2010-07-30 21:11 ` Willy Tarreau
0 siblings, 0 replies; 2+ messages in thread
From: Willy Tarreau @ 2010-07-30 21:11 UTC (permalink / raw)
To: Kulikov Vasiliy
Cc: kernel-janitors, Greg Kroah-Hartman, Peter Huewe, Andy Shevchenko,
Julia Lawall, devel, linux-kernel
Looks fine,
Acked-by: Willy Tarreau <w@1wt.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@gmail.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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-30 21:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-30 11:08 [PATCH 4/9] staging: panel: fix error path Kulikov Vasiliy
2010-07-30 21:11 ` Willy Tarreau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).