epca: privent from panic on tty_register_driver() failure
PATCH 1/1 epca: privent from panic on tty_register_driver() failure
This patch makes epca fail on initialization failure instead of panic.
drivers/char/epca.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/char/epca.c +23 -9
@@ -1160,6 +1160,7 @@ static int __init pc_init(void)int crd;struct board_info *bd;unsigned char board_id =0 ; +int err = -ENOMEM ;int pci_boards_found, pci_count;
@@ -1167,13 +1168,11 @@ static int __init pc_init(void) pc_driver =alloc_tty_driver (MAX_ALLOC );if (!pc_driver) -return -ENOMEM ; + goto out1; pc_info =alloc_tty_driver (MAX_ALLOC ); -if (!pc_info) { -put_tty_driver (pc_driver); -return -ENOMEM ; - } +if (!pc_info) + goto out2;/* ----------------------------------------------------------------------- If epca_setup has not been ran by LILO set num_cards to defaults; copy
@@ -1373,11 +1372,17 @@ static int __init pc_init(void) }/* End for each card */ -if (tty_register_driver (pc_driver)) -panic ("Couldn't register Digi PC/ driver" ); + err =tty_register_driver (pc_driver); +if (err) { +printk (KERN_ERR "Couldn't register Digi PC/ driver" ); + goto out3; + } -if (tty_register_driver (pc_info)) -panic ("Couldn't register Digi PC/ info " ); + err =tty_register_driver (pc_info); +if (err) { +printk (KERN_ERR "Couldn't register Digi PC/ info " ); + goto out4; + }/* ------------------------------------------------------------------- Start up the poller to check for events on all enabled boards
@@ -1388,6 +1393,15 @@ static int __init pc_init(void)mod_timer (&epca_timer, jiffies +HZ /25 );return 0 ; +out4: +tty_unregister_driver (pc_driver); +out3: +put_tty_driver (pc_driver); +out2: +put_tty_driver (pc_info); +out1: +return err; + }/* End pc_init */ /* ------------------ Begin post_fep_init ---------------------- */
Quoted 24 lines · On Mon, 9 Oct 2006 18:06:03 +0900 Akinobu Mita wrote:
This patch makes epca fail on initialization failure instead of panic.
Cc "Digi International, Inc" <[email protected]>Signed-off-by Akinobu Mita <[email protected]>drivers/char/epca.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)Index:
work-fault-inject/drivers/char/epca.c
===================================================================drivers/char/epca.c +1
-0@@ -1160,6 +1160,7 @@ static int __init pc_init(void)int crd;struct board_info *bd;unsigned char board_id =0 ; +int err = -ENOMEM ;int pci_boards_found, pci_count;@@ -1167,13 +1168,11 @@ static int __init pc_init(void) pc_driver =alloc_tty_driver (MAX_ALLOC );if (!pc_driver)
drivers/char/epca.c static int __init pc_init(void) · line 1175
Quoted 10 lines
drivers/char/epca.c +3
-5-return -ENOMEM ; + goto out1; pc_info =alloc_tty_driver (MAX_ALLOC ); -if (!pc_info) { -put_tty_driver (pc_driver); -return -ENOMEM ; - } +if (!pc_info) + goto out2;
and then out2: uses pc_info, if it's NULL. Is that OK?
Quoted 32 lines
drivers/char/epca.c +13
-4/* ----------------------------------------------------------------------- If epca_setup has not been ran by LILO set num_cards to defaults; copy @@ -1373,11 +1372,17 @@ static int __init pc_init(void) }/* End for each card */ -if (tty_register_driver (pc_driver)) -panic ("Couldn't register Digi PC/ driver" ); + err =tty_register_driver (pc_driver); +if (err) { +printk (KERN_ERR "Couldn't register Digi PC/ driver" ); + goto out3; + } -if (tty_register_driver (pc_info)) -panic ("Couldn't register Digi PC/ info " ); + err =tty_register_driver (pc_info); +if (err) { +printk (KERN_ERR "Couldn't register Digi PC/ info " ); + goto out4; + }/* ------------------------------------------------------------------- Start up the poller to check for events on all enabled boards @@ -1388,6 +1393,15 @@ static int __init pc_init(void)mod_timer (&epca_timer, jiffies +HZ /25 );return 0 ; +out4: +tty_unregister_driver (pc_driver); +out3:
drivers/char/epca.c static int __init pc_init(void)
Quoted 10 lines
drivers/char/epca.c +6
-1+put_tty_driver (pc_driver); +out2: +put_tty_driver (pc_info); +out1: +return err; + }/* End pc_init */ /* ------------------ Begin post_fep_init ---------------------- */ -
---
~Randy
Quoted 6 lines · Randy Dunlap
Quoted 6 lines
(quoted diff) +1
-1pc_driver = alloc_tty_driver(MAX_ALLOC); if (!pc_driver) - return -ENOMEM; + goto out1;
Quoted 9 lines
Review
Quoted 7 lines
(quoted diff) +2
-4pc_info = alloc_tty_driver(MAX_ALLOC); - if (!pc_info) { - put_tty_driver(pc_driver); - return -ENOMEM; - } + if (!pc_info) + goto out2;and then out2: uses
pc_info, if it's NULL. Is that OK?
I made mistake. I swapped the order of these two put_tty_driver() in error handling wrongly.
This is fixed version.
Subject: epca: privent from panic on tty_register_driver() failure
This patch make epca fail on initialization failure instead of panic.
drivers/char/epca.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/char/epca.c +23 -9
@@ -1157,6 +1157,7 @@ static int __init pc_init(void)int crd;struct board_info *bd;unsigned char board_id =0 ; +int err = -ENOMEM ;int pci_boards_found, pci_count;
@@ -1164,13 +1165,11 @@ static int __init pc_init(void) pc_driver =alloc_tty_driver (MAX_ALLOC );if (!pc_driver) -return -ENOMEM ; + goto out1; pc_info =alloc_tty_driver (MAX_ALLOC ); -if (!pc_info) { -put_tty_driver (pc_driver); -return -ENOMEM ; - } +if (!pc_info) + goto out2;/* ----------------------------------------------------------------------- If epca_setup has not been ran by LILO set num_cards to defaults; copy
@@ -1370,11 +1369,17 @@ static int __init pc_init(void) }/* End for each card */ -if (tty_register_driver (pc_driver)) -panic ("Couldn't register Digi PC/ driver" ); + err =tty_register_driver (pc_driver); +if (err) { +printk (KERN_ERR "Couldn't register Digi PC/ driver" ); + goto out3; + } -if (tty_register_driver (pc_info)) -panic ("Couldn't register Digi PC/ info " ); + err =tty_register_driver (pc_info); +if (err) { +printk (KERN_ERR "Couldn't register Digi PC/ info " ); + goto out4; + }/* ------------------------------------------------------------------- Start up the poller to check for events on all enabled boards
@@ -1385,6 +1390,15 @@ static int __init pc_init(void)mod_timer (&epca_timer, jiffies +HZ /25 );return 0 ; +out4: +tty_unregister_driver (pc_driver); +out3: +put_tty_driver (pc_info); +out2: +put_tty_driver (pc_driver); +out1: +return err; + }/* End pc_init */ /* ------------------ Begin post_fep_init ---------------------- */
Ar Llu, 2006-10-09 am 18:06 +0900, ysgrifennodd Akinobu Mita:
Quoted 4 lines
This patch makes epca fail on initialization failure instead of panic.
Cc "Digi International, Inc" <[email protected]>Signed-off-by Akinobu Mita <[email protected]>