class_simple clean up in lp
PATCH 1/1 class_simple clean up in lp
Error condition isn't caught on class_simple_create, and parport_register_driver failure doesn't do proper cleanup.
===== drivers/char/lp.c 1.32 vs edited =====
drivers/char/lp.c +14 -2
@@ -869,7 +869,7 @@int __init lp_init (void ) { -int i; +int i, err =0 ;if (parport_nr[0 ] ==LP_PARPORT_OFF )return 0 ;
@@ -900,10 +900,15 @@devfs_mk_dir ("printers" ); lp_class =class_simple_create (THIS_MODULE ,"printer" ); +if (IS_ERR (lp_class)) { + err =PTR_ERR (lp_class); + goto out_devfs; + }if (parport_register_driver (&lp_driver)) {printk (KERN_ERR "lp: unable to register with parport\n" ); -return -EIO ; + err = -EIO ; + goto out_class; }if (!lp_count) {
@@ -915,6 +920,13 @@ }return 0 ; + +out_class: +class_simple_destroy (lp_class); +out_devfs: +devfs_remove ("printers" ); +unregister_chrdev (LP_MAJOR ,"lp" ); +return err; }static int __init lp_init_module (void )
Greg KH
AppliedQuoted 2 lines · Chris Wright
Error condition isn't caught on
class_simple_create, andparport_register_driverfailure doesn't do proper cleanup.
Applied, thanks.
greg k-h