tpm: Use the right clean up after cdev_add completes
PATCH 1/1 tpm: Use the right clean up after cdev_add completes
Once cdev_add is done the device node is visible to user space and could have been opened. Thus we have to go through the locking process in tpm_del_char_device if device_add fails.
--- drivers/char/tpm/tpm-chip.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-)
static function moved to avoid a prototype
This was noticed while reviewing the cdev patchset from Logan
drivers/char/tpm/tpm-chip.c +22 -21
@@ -226,6 +226,26 @@ struct tpm_chip *tpmm_chip_alloc(struct device *pdev, }EXPORT_SYMBOL_GPL (tpmm_chip_alloc); +static void tpm_del_char_device (struct tpm_chip *chip,bool with_device) +{ +cdev_del (&chip->cdev); +if (with_device) { +device_del (&chip->dev); + +/* Make the chip unavailable. */ +mutex_lock (&idr_lock); +idr_replace (&dev_nums_idr,NULL , chip->dev_num); +mutex_unlock (&idr_lock); + } + +/* Make the driver uncallable. */ +down_write (&chip->ops_sem); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_shutdown (chip,TPM2_SU_CLEAR ); + chip->ops =NULL ; +up_write (&chip->ops_sem); +} +static int tpm_add_char_device (struct tpm_chip *chip) {int rc;
@@ -246,8 +266,7 @@ static int tpm_add_char_device(struct tpm_chip *chip)"unable to device_register() %s, major %d, minor %d, err=%d\n" ,dev_name (&chip->dev),MAJOR (chip->dev.devt), MINOR(chip->dev.devt), rc); - -cdev_del (&chip->cdev); +tpm_del_char_device (chip, false);return rc; }
@@ -259,24 +278,6 @@ static int tpm_add_char_device(struct tpm_chip *chip)return rc; } -static void tpm_del_char_device (struct tpm_chip *chip) -{ -cdev_del (&chip->cdev); -device_del (&chip->dev); - -/* Make the chip unavailable. */ -mutex_lock (&idr_lock); -idr_replace (&dev_nums_idr,NULL , chip->dev_num); -mutex_unlock (&idr_lock); - -/* Make the driver uncallable. */ -down_write (&chip->ops_sem); -if (chip->flags &TPM_CHIP_FLAG_TPM2 ) -tpm2_shutdown (chip,TPM2_SU_CLEAR ); - chip->ops =NULL ; -up_write (&chip->ops_sem); -} -static void tpm_del_legacy_sysfs (struct tpm_chip *chip) {struct attribute **i;
@@ -384,6 +385,6 @@ void tpm_chip_unregister(struct tpm_chip *chip) {tpm_del_legacy_sysfs (chip);tpm_bios_log_teardown (chip); -tpm_del_char_device (chip); +tpm_del_char_device (chip, true); }EXPORT_SYMBOL_GPL (tpm_chip_unregister);
Signature · 5 lines
2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
Quoted 6 lines · Jason Gunthorpe
Once
cdev_addis done the device node is visible to user space and could have been opened. Thus we have to go through the locking process intpm_del_char_deviceifdevice_addfails.Fixes 2c91ce8523a ("tpm: fix the rollback in tpm_chip_register()")Signed-off-by Jason Gunthorpe <[email protected]>
/Jarkko
Quoted 84 lines
--- drivers/char/tpm/tpm-chip.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-)static function moved to avoid a prototype
This was noticed while reviewing the cdev patchset from Logan
drivers/char/tpm/tpm-chip.c +22
-21@@ -226,6 +226,26 @@ struct tpm_chip *tpmm_chip_alloc(struct device *pdev, }EXPORT_SYMBOL_GPL (tpmm_chip_alloc); +static void tpm_del_char_device (struct tpm_chip *chip,bool with_device) +{ +cdev_del (&chip->cdev); +if (with_device) { +device_del (&chip->dev); + +/* Make the chip unavailable. */ +mutex_lock (&idr_lock); +idr_replace (&dev_nums_idr,NULL , chip->dev_num); +mutex_unlock (&idr_lock); + } + +/* Make the driver uncallable. */ +down_write (&chip->ops_sem); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_shutdown (chip,TPM2_SU_CLEAR ); + chip->ops =NULL ; +up_write (&chip->ops_sem); +} +static int tpm_add_char_device (struct tpm_chip *chip) {int rc;@@ -246,8 +266,7 @@ static int tpm_add_char_device(struct tpm_chip *chip)"unable to device_register() %s, major %d, minor %d, err=%d\n" ,dev_name (&chip->dev),MAJOR (chip->dev.devt), MINOR(chip->dev.devt), rc); - -cdev_del (&chip->cdev); +tpm_del_char_device (chip, false);return rc; }@@ -259,24 +278,6 @@ static int tpm_add_char_device(struct tpm_chip *chip)return rc; } -static void tpm_del_char_device (struct tpm_chip *chip) -{ -cdev_del (&chip->cdev); -device_del (&chip->dev); - -/* Make the chip unavailable. */ -mutex_lock (&idr_lock); -idr_replace (&dev_nums_idr,NULL , chip->dev_num); -mutex_unlock (&idr_lock); - -/* Make the driver uncallable. */ -down_write (&chip->ops_sem); -if (chip->flags &TPM_CHIP_FLAG_TPM2 ) -tpm2_shutdown (chip,TPM2_SU_CLEAR ); - chip->ops =NULL ; -up_write (&chip->ops_sem); -} -static void tpm_del_legacy_sysfs (struct tpm_chip *chip) {struct attribute **i;@@ -384,6 +385,6 @@ void tpm_chip_unregister(struct tpm_chip *chip) {tpm_del_legacy_sysfs (chip);tpm_bios_log_teardown (chip); -tpm_del_char_device (chip); +tpm_del_char_device (chip, true); }EXPORT_SYMBOL_GPL (tpm_chip_unregister);Signature · 1 line
2.7.4
A message that is not in the archive (sent off-list or not yet received): 20170223211914.GA12752-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org
Quoted 6 lines · Jason Gunthorpe
Once
cdev_addis done the device node is visible to user space and could have been opened. Thus we have to go through the locking process intpm_del_char_deviceifdevice_addfails.Fixes 2c91ce8523a ("tpm: fix the rollback in tpm_chip_register()")
Pushed.
/Jarkko
Quoted 84 lines
--- drivers/char/tpm/tpm-chip.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-)static function moved to avoid a prototype
This was noticed while reviewing the cdev patchset from Logan
drivers/char/tpm/tpm-chip.c +22
-21@@ -226,6 +226,26 @@ struct tpm_chip *tpmm_chip_alloc(struct device *pdev, }EXPORT_SYMBOL_GPL (tpmm_chip_alloc); +static void tpm_del_char_device (struct tpm_chip *chip,bool with_device) +{ +cdev_del (&chip->cdev); +if (with_device) { +device_del (&chip->dev); + +/* Make the chip unavailable. */ +mutex_lock (&idr_lock); +idr_replace (&dev_nums_idr,NULL , chip->dev_num); +mutex_unlock (&idr_lock); + } + +/* Make the driver uncallable. */ +down_write (&chip->ops_sem); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_shutdown (chip,TPM2_SU_CLEAR ); + chip->ops =NULL ; +up_write (&chip->ops_sem); +} +static int tpm_add_char_device (struct tpm_chip *chip) {int rc;@@ -246,8 +266,7 @@ static int tpm_add_char_device(struct tpm_chip *chip)"unable to device_register() %s, major %d, minor %d, err=%d\n" ,dev_name (&chip->dev),MAJOR (chip->dev.devt), MINOR(chip->dev.devt), rc); - -cdev_del (&chip->cdev); +tpm_del_char_device (chip, false);return rc; }@@ -259,24 +278,6 @@ static int tpm_add_char_device(struct tpm_chip *chip)return rc; } -static void tpm_del_char_device (struct tpm_chip *chip) -{ -cdev_del (&chip->cdev); -device_del (&chip->dev); - -/* Make the chip unavailable. */ -mutex_lock (&idr_lock); -idr_replace (&dev_nums_idr,NULL , chip->dev_num); -mutex_unlock (&idr_lock); - -/* Make the driver uncallable. */ -down_write (&chip->ops_sem); -if (chip->flags &TPM_CHIP_FLAG_TPM2 ) -tpm2_shutdown (chip,TPM2_SU_CLEAR ); - chip->ops =NULL ; -up_write (&chip->ops_sem); -} -static void tpm_del_legacy_sysfs (struct tpm_chip *chip) {struct attribute **i;@@ -384,6 +385,6 @@ void tpm_chip_unregister(struct tpm_chip *chip) {tpm_del_legacy_sysfs (chip);tpm_bios_log_teardown (chip); -tpm_del_char_device (chip); +tpm_del_char_device (chip, true); }EXPORT_SYMBOL_GPL (tpm_chip_unregister);Signature · 1 line
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
A message that is not in the archive (sent off-list or not yet received): 20170224174354.w5e2v3nxntod72je-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
Quoted 9 lines · Jarkko Sakkinen
Quoted 6 lines · Jason Gunthorpe
Once
cdev_addis done the device node is visible to user space and could have been opened. Thus we have to go through the locking process intpm_del_char_deviceifdevice_addfails.Fixes 2c91ce8523a ("tpm: fix the rollback in tpm_chip_register()")Pushed.
It would make easier to merge this with resource manager commits if there was instead
void tpm_chip_shutdown(struct tpm_chip *chip)
{
/* Make the driver uncallable. */
down_write(&chip->ops_sem);
if (chip->flags & TPM_CHIP_FLAG_TPM2)
tpm2_shutdown(chip, TPM2_SU_CLEAR);
chip->ops = NULL;
up_write(&chip->ops_sem);
}And you would call this instead of wiring into tpm_del_char_device.
I can update the commit.
/Jarkko
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
A message that is not in the archive (sent off-list or not yet received): 20170224205949.u63xb5qhqzd7lqtp-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
Quoted 24 lines · Jarkko Sakkinen
Quoted 9 lines · Jarkko Sakkinen
Quoted 6 lines · Jason Gunthorpe
Once
cdev_addis done the device node is visible to user space and could have been opened. Thus we have to go through the locking process intpm_del_char_deviceifdevice_addfails.Fixes 2c91ce8523a ("tpm: fix the rollback in tpm_chip_register()")Pushed.
It would make easier to merge this with resource manager commits if there was instead
void
tpm_chip_shutdown(struct tpm_chip *chip){ /* Make the driver uncallable. */ down_write(&chip->ops_sem); if (chip->flags & TPM_CHIP_FLAG_TPM2) tpm2_shutdown(chip, TPM2_SU_CLEAR); chip->ops = NULL; up_write(&chip->ops_sem); }
Quoted 5 lines
And you would call this instead of wiring into
tpm_del_char_device.I can update the commit.
/Jarkko
Actually lets keep as it is. I'll extend tpm_del_char_device a bit instead in the RM series.
/Jarkko
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
Quoted 24 lines · Jarkko Sakkinen
Quoted 9 lines · Jarkko Sakkinen
Quoted 6 lines · Jason Gunthorpe
Once
cdev_addis done the device node is visible to user space and could have been opened. Thus we have to go through the locking process intpm_del_char_deviceifdevice_addfails.Fixes 2c91ce8523a ("tpm: fix the rollback in tpm_chip_register()")Signed-off-by Jason Gunthorpe <[email protected]>Pushed.
It would make easier to merge this with resource manager commits if there was instead
void
tpm_chip_shutdown(struct tpm_chip *chip){ /* Make the driver uncallable. */ down_write(&chip->ops_sem); if (chip->flags & TPM_CHIP_FLAG_TPM2) tpm2_shutdown(chip, TPM2_SU_CLEAR); chip->ops = NULL; up_write(&chip->ops_sem); }
Quoted 1 line
And you would call this instead of wiring into
tpm_del_char_device.
Hum.. I think this direction in the RM patch would be more maintainable.. Otherwise tpm_add_char_device has very complicated error handling.
drivers/char/tpm/tpm-chip.c +17 -8
@@ -353,18 +353,26 @@ int tpm_chip_register(struct tpm_chip *chip)tpm_add_ppi (chip); rc =tpm_add_char_device (chip); -if (rc) { -tpm_bios_log_teardown (chip); -return rc; - } +if (rc) + goto err_add_char; + + rc =tpm_add_rm_char_device (chip); +if (rc) + goto err_add_rm_char; rc =tpm_add_legacy_sysfs (chip); -if (rc) { -tpm_chip_unregister (chip); -return rc; - } +if (rc) + goto err_add_legacy_sysfs;return 0 ; + +err_add_legacy_sysfs: +tpm_del_rm_char_device (chip); +err_add_rm_char: +tpm_del_char_device (chip, true); +err_add_char: +tpm_bios_log_teardown (chip); +return rc; }EXPORT_SYMBOL_GPL (tpm_chip_register);
@@ -384,6 +392,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register);void tpm_chip_unregister (struct tpm_chip *chip) {tpm_del_legacy_sysfs (chip); +tpm_del_rm_char_device (chip);tpm_bios_log_teardown (chip);tpm_del_char_device (chip, true); }