From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751422AbcBLDfs (ORCPT ); Thu, 11 Feb 2016 22:35:48 -0500 Received: from mga01.intel.com ([192.55.52.88]:44115 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750932AbcBLDfr (ORCPT ); Thu, 11 Feb 2016 22:35:47 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,434,1449561600"; d="scan'208";a="910473539" Date: Fri, 12 Feb 2016 05:35:44 +0200 From: Jarkko Sakkinen To: Jason Gunthorpe Cc: Peter Huewe , 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 Message-ID: <20160212033543.GA6098@intel.com> References: <1454988630-27942-1-git-send-email-jarkko.sakkinen@linux.intel.com> <20160211193415.GA24465@obsidianresearch.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160211193415.GA24465@obsidianresearch.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 > > 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