From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Jason Gunthorpe
<jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
Cc: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] tpm: fix the cleanup of struct tpm_chip
Date: Fri, 12 Feb 2016 05:35:44 +0200 [thread overview]
Message-ID: <20160212033543.GA6098@intel.com> (raw)
In-Reply-To: <20160211193415.GA24465-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
On Thu, Feb 11, 2016 at 12:34:15PM -0700, Jason Gunthorpe wrote:
> On Tue, Feb 09, 2016 at 05:30:30AM +0200, Jarkko Sakkinen wrote:
> > If the initialization fails before tpm_chip_register(), put_device()
> > will be not called, which causes release callback not to be called.
> > This patch fixes the issue by adding put_device() to devres list of
> > the parent device.
> >
> > Fixes: 313d21eeab ("tpm: device class for tpm")
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > drivers/char/tpm/tpm-chip.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > index 1a9dcee..ea904d1 100644
> > +++ b/drivers/char/tpm/tpm-chip.c
> > @@ -136,6 +136,8 @@ 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);
> > +
>
> Erm, don't forget the error handling here.
>
> Something like this:
>
> rc = devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev);
> if (rc) {
> put_device(&chip->dev);
> return ERR_PTR(rc);
> }
I'll implement that as a separate commit since it is already in pull
request. Thanks.
/Jarkko
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
WARNING: multiple messages have this Message-ID (diff)
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Peter Huewe <peterhuewe@gmx.de>,
stable@vger.kernel.org, tpmdd-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: Re: [tpmdd-devel] [PATCH] tpm: fix the cleanup of struct tpm_chip
Date: Fri, 12 Feb 2016 05:35:44 +0200 [thread overview]
Message-ID: <20160212033543.GA6098@intel.com> (raw)
In-Reply-To: <20160211193415.GA24465@obsidianresearch.com>
On Thu, Feb 11, 2016 at 12:34:15PM -0700, Jason Gunthorpe wrote:
> On Tue, Feb 09, 2016 at 05:30:30AM +0200, Jarkko Sakkinen wrote:
> > If the initialization fails before tpm_chip_register(), put_device()
> > will be not called, which causes release callback not to be called.
> > This patch fixes the issue by adding put_device() to devres list of
> > the parent device.
> >
> > Fixes: 313d21eeab ("tpm: device class for tpm")
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > cc: stable@vger.kernel.org
> > drivers/char/tpm/tpm-chip.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > index 1a9dcee..ea904d1 100644
> > +++ b/drivers/char/tpm/tpm-chip.c
> > @@ -136,6 +136,8 @@ 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);
> > +
>
> Erm, don't forget the error handling here.
>
> Something like this:
>
> rc = devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev);
> if (rc) {
> put_device(&chip->dev);
> return ERR_PTR(rc);
> }
I'll implement that as a separate commit since it is already in pull
request. Thanks.
/Jarkko
next prev parent reply other threads:[~2016-02-12 3:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 3:30 [PATCH] tpm: fix the cleanup of struct tpm_chip Jarkko Sakkinen
[not found] ` <1454988630-27942-1-git-send-email-jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2016-02-09 5:26 ` Jason Gunthorpe
2016-02-09 5:26 ` [tpmdd-devel] " Jason Gunthorpe
[not found] ` <20160209052655.GA12657-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2016-02-09 6:19 ` Jarkko Sakkinen
2016-02-09 6:19 ` [tpmdd-devel] " Jarkko Sakkinen
[not found] ` <20160209061951.GA29607-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-02-09 6:27 ` Jarkko Sakkinen
2016-02-09 6:27 ` [tpmdd-devel] " Jarkko Sakkinen
[not found] ` <20160209062735.GA25621-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-02-09 17:00 ` Jason Gunthorpe
2016-02-09 17:00 ` [tpmdd-devel] " Jason Gunthorpe
2016-02-11 19:34 ` Jason Gunthorpe
[not found] ` <20160211193415.GA24465-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2016-02-12 3:35 ` Jarkko Sakkinen [this message]
2016-02-12 3:35 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160212033543.GA6098@intel.com \
--to=jarkko.sakkinen-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.