diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-02-13 11:58:16 +0200 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-02-20 09:59:32 +0200 |
| commit | 4f3b193dee4423d8c89c9a3e8e05f9197ea459a4 (patch) | |
| tree | 56561ff7da6f2fb42e868270e6988f7218f361d4 /drivers/char/tpm | |
| parent | c0b5eed110dcf520aadafefbcc40658cbdd18b95 (diff) | |
| download | blackbird-op-linux-4f3b193dee4423d8c89c9a3e8e05f9197ea459a4.tar.gz blackbird-op-linux-4f3b193dee4423d8c89c9a3e8e05f9197ea459a4.zip | |
tpm: fix: return rc when devm_add_action() fails
Call put_device() and return error code if devm_add_action() fails.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reported-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Fixes: 8e0ee3c9faed ("tpm: fix the cleanup of struct tpm_chip")
Diffstat (limited to 'drivers/char/tpm')
| -rw-r--r-- | drivers/char/tpm/tpm-chip.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 252142524ff2..274dd0123237 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -88,6 +88,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, const struct tpm_class_ops *ops) { struct tpm_chip *chip; + int rc; chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (chip == NULL) @@ -136,7 +137,11 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, chip->cdev.owner = chip->pdev->driver->owner; chip->cdev.kobj.parent = &chip->dev.kobj; - devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev); + rc = devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev); + if (rc) { + put_device(&chip->dev); + return ERR_PTR(rc); + } return chip; } |
