tpm: fix error handling
Subsystems (2)
PATCH 1/1 tpm: fix error handling
- handle sysfs error
- handle driver model errors
- de-obfuscate platform_device_register_simple() call, which included an assignment in between two function calls, in the same C statement.
Signed-off-by Jeff Garzik <[email protected]>
---
drivers/char/tpm/tpm.c | 9 ++++++++- drivers/char/tpm/tpm_atmel.c | 10 +++++----- drivers/char/tpm/tpm_nsc.c | 6 ++++-- 3 files changed, 17 insertions(+), 8 deletions(-)
drivers/char/tpm/tpm.c +8 -1
@@ -1153,7 +1153,14 @@ #define DEVNAME_SIZE 7spin_unlock (&driver_lock); -sysfs_create_group (&dev->kobj, chip->vendor.attr_group); +if (sysfs_create_group (&dev->kobj, chip->vendor.attr_group)) { +list_del (&chip->list); +put_device (dev); +clear_bit (chip->dev_num, dev_mask); +kfree (chip); +kfree (devname); +return NULL ; + } chip->bios_dir =tpm_bios_log_setup (devname);
drivers/char/tpm/tpm_atmel.c +5 -5
@@ -184,7 +184,9 @@ static int __init init_atmel(void)unsigned long base;struct tpm_chip *chip; -driver_register (&atml_drv); + rc =driver_register (&atml_drv); +if (rc) +return rc;if ((iobase =atmel_get_base_addr (&base, ®ion_size)) ==NULL ) { rc = -ENODEV ;
@@ -195,10 +197,8 @@ static int __init init_atmel(void) (atmel_request_region (tpm_atmel.base, region_size,"tpm_atmel0" ) ==NULL ) ?0 :1 ; - -if (IS_ERR - (pdev = -platform_device_register_simple ("tpm_atmel" ,-1 ,NULL ,0 ))) { + pdev =platform_device_register_simple ("tpm_atmel" ,-1 ,NULL ,0 ); +if (IS_ERR (pdev)) { rc =PTR_ERR (pdev); goto err_rel_reg; }
drivers/char/tpm/tpm_nsc.c +4 -2
@@ -284,7 +284,7 @@ static struct device_driver nsc_drv = {static int __init init_nsc (void ) {int rc =0 ; -int lo, hi; +int lo, hi, err;int nscAddrBase =TPM_ADDR ;struct tpm_chip *chip;unsigned long base;
@@ -297,7 +297,9 @@ static int __init init_nsc(void)return -ENODEV ; } -driver_register (&nsc_drv); + err =driver_register (&nsc_drv); +if (err) +return err; hi =tpm_read_index (nscAddrBase,TPM_NSC_BASE0_HI ); lo =tpm_read_index (nscAddrBase,TPM_NSC_BASE0_LO );
Ack'ed-by: Kylene Hall <[email protected]>
Quoted 86 lines · Jeff Garzik
- handle sysfs error
- handle driver model errors
- de-obfuscateplatform_device_register_simple()call, which included an assignment in between two function calls, in the same C statement.Signed-off-by Jeff Garzik <[email protected]>---
drivers/char/tpm/tpm.c | 9 ++++++++- drivers/char/tpm/tpm_atmel.c | 10 +++++----- drivers/char/tpm/tpm_nsc.c | 6 ++++-- 3 files changed, 17 insertions(+), 8 deletions(-)drivers/char/tpm/tpm.c +8
-1@@ -1153,7 +1153,14 @@ #define DEVNAME_SIZE 7spin_unlock (&driver_lock); -sysfs_create_group (&dev->kobj, chip->vendor.attr_group); +if (sysfs_create_group (&dev->kobj, chip->vendor.attr_group)) { +list_del (&chip->list); +put_device (dev); +clear_bit (chip->dev_num, dev_mask); +kfree (chip); +kfree (devname); +return NULL ; + } chip->bios_dir =tpm_bios_log_setup (devname);drivers/char/tpm/tpm_atmel.c +5
-5@@ -184,7 +184,9 @@ static int __init init_atmel(void)unsigned long base;struct tpm_chip *chip; -driver_register (&atml_drv); + rc =driver_register (&atml_drv); +if (rc) +return rc;if ((iobase =atmel_get_base_addr (&base, ®ion_size)) ==NULL ) { rc = -ENODEV ;@@ -195,10 +197,8 @@ static int __init init_atmel(void) (atmel_request_region (tpm_atmel.base, region_size,"tpm_atmel0" ) ==NULL ) ?0 :1 ; - -if (IS_ERR - (pdev = -platform_device_register_simple ("tpm_atmel" ,-1 ,NULL ,0 ))) { + pdev =platform_device_register_simple ("tpm_atmel" ,-1 ,NULL ,0 ); +if (IS_ERR (pdev)) { rc =PTR_ERR (pdev); goto err_rel_reg; }drivers/char/tpm/tpm_nsc.c +4
-2@@ -284,7 +284,7 @@ static struct device_driver nsc_drv = {static int __init init_nsc (void ) {int rc =0 ; -int lo, hi; +int lo, hi, err;int nscAddrBase =TPM_ADDR ;struct tpm_chip *chip;unsigned long base;@@ -297,7 +297,9 @@ static int __init init_nsc(void)return -ENODEV ; } -driver_register (&nsc_drv); + err =driver_register (&nsc_drv); +if (err) +return err; hi =tpm_read_index (nscAddrBase,TPM_NSC_BASE0_HI ); lo =tpm_read_index (nscAddrBase,TPM_NSC_BASE0_LO );