2015-06-30 19:15:45

by Jason Gunthorpe

Subject: [PATCH] tpm: Fix initialization of the cdev

When a cdev is contained in a dynamic structure the cdev parent kobj
should be set to the kobj that controls the lifetime of the enclosing
structure. In TPM's case this is the embedded struct device.

Also, cdev_init 0's the whole structure, so all sets must be after,
not before. This fixes module ref counting and cdev.

Fixes: 313d21eeab92 ("tpm: device class for tpm")
Signed-off-by: Jason Gunthorpe <[email protected]>
---
drivers/char/tpm/tpm-chip.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Peter, I've only compile tests this. Thanks

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 283f00a7f036..1082d4bb016a 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -129,8 +129,9 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,

device_initialize(&chip->dev);

- chip->cdev.owner = chip->pdev->driver->owner;
cdev_init(&chip->cdev, &tpm_fops);
+ chip->cdev.owner = chip->pdev->driver->owner;
+ chip->cdev.kobj.parent = &chip->dev.kobj;

return chip;
}
--
2.1.4

2015-07-01 22:06:17

by Dmitry Torokhov

Subject: Re: [PATCH] tpm: Fix initialization of the cdev

On Tue, Jun 30, 2015 at 01:15:31PM -0600, Jason Gunthorpe wrote:
> When a cdev is contained in a dynamic structure the cdev parent kobj
> should be set to the kobj that controls the lifetime of the enclosing
> structure. In TPM's case this is the embedded struct device.
>
> Also, cdev_init 0's the whole structure, so all sets must be after,
> not before. This fixes module ref counting and cdev.
>
> Fixes: 313d21eeab92 ("tpm: device class for tpm")
> Signed-off-by: Jason Gunthorpe <[email protected]>

Right, when embedding cdev its lifetime should be tied to the lifetime
of the enclosing structure.

Reviewed-by: Dmitry Torokhov <[email protected]>

> ---
> drivers/char/tpm/tpm-chip.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> Peter, I've only compile tests this. Thanks
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 283f00a7f036..1082d4bb016a 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -129,8 +129,9 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,
>
> device_initialize(&chip->dev);
>
> - chip->cdev.owner = chip->pdev->driver->owner;
> cdev_init(&chip->cdev, &tpm_fops);
> + chip->cdev.owner = chip->pdev->driver->owner;
> + chip->cdev.kobj.parent = &chip->dev.kobj;
>
> return chip;
> }
> --
> 2.1.4
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
Dmitry