From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarkko Sakkinen Subject: Re: [PATCH] tpm: Fix IRQ unwind ordering in TIS Date: Thu, 28 Apr 2016 11:53:16 +0300 Message-ID: <1461833596.3482.2.camel@linux.intel.com> References: <20160427165846.GA17064@obsidianresearch.com> <1461830953.3482.1.camel@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1461830953.3482.1.camel-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tpmdd-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Jason Gunthorpe Cc: linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: tpmdd-devel@lists.sourceforge.net T24gVGh1LCAyMDE2LTA0LTI4IGF0IDExOjA5ICswMzAwLCBKYXJra28gU2Fra2luZW4gd3JvdGU6 Cj4gT24gV2VkLCAyMDE2LTA0LTI3IGF0IDEwOjU4IC0wNjAwLCBKYXNvbiBHdW50aG9ycGUgd3Jv dGU6Cj4gPiAKPiA+IFRoZSBkZXZtIGZvciB0aGUgSVJRIHdhcyBwbGFjZWQgb24gdGhlIGNoaXAs IG5vdCB0aGUgcGRldi4gVGhpcyBjYW4KPiA+IGNhdXNlIHRoZSBpcnEgdG8gYmUgc3RpbGwgY2Fs bGFibGUgYWZ0ZXIgdGhlIHBkZXYgaGFzIGJlZW4gY2xlYW5lZCB1cAo+ID4gKGVnIHByaXYga2Zy ZWUnZCkuCj4gPiDCoAo+ID4gRm91bmQgYnkgQ09ORklHX0RFQlVHX1NISVJRPXkKPiA+IMKgCj4g PiBSZXBvcnRlZC1ieTogU3RlZmFuIEJlcmdlciA8c3RlZmFuYkBsaW51eC52bmV0LmlibS5jb20+ Cj4gPiBGaXhlczogMjMzYTA2NWUwY2QwICgidHBtOiBHZXQgcmlkIG9mIGNoaXAtPnBkZXYiKQo+ ID4gU2lnbmVkLW9mZi1ieTogSmFzb24gR3VudGhvcnBlIDxqZ3VudGhvcnBlQG9ic2lkaWFucmVz ZWFyY2guY29tPgo+ID4gVGVzdGVkLWJ5OsKgwqBTdGVmYW4gQmVyZ2VyIDxzdGVmYW5iQGxpbnV4 LnZuZXQuaWJtLmNvbT4KPiBSZXZpZXdlZC1ieTogSmFya2tvIFNha2tpbmVuIDxqYXJra28uc2Fr a2luZW5AbGludXguaW50ZWwuY29tPgoKQW5kIGFwcGxpZWQgwqBhbmQgbWVyZ2VkIHRvIG5leHQu CgovSmFya2tvCgo+IC9KYXJra28KPiAKPiA+IAo+ID4gLS0tCj4gPiDCoGRyaXZlcnMvY2hhci90 cG0vdHBtX3Rpcy5jIHwgNCArKy0tCj4gPiDCoDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo KyksIDIgZGVsZXRpb25zKC0pCj4gPiDCoAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvY2hhci90 cG0vdHBtX3Rpcy5jIGIvZHJpdmVycy9jaGFyL3RwbS90cG1fdGlzLmMKPiA+IGluZGV4IGE2YjJk NDYwYmZjMC4uZDg4ODI3MDQ2YTQyIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9jaGFyL3RwbS90 cG1fdGlzLmMKPiA+ICsrKyBiL2RyaXZlcnMvY2hhci90cG0vdHBtX3Rpcy5jCj4gPiBAQCAtMzg3 LDcgKzM4Nyw3IEBAIHN0YXRpYyB2b2lkIGRpc2FibGVfaW50ZXJydXB0cyhzdHJ1Y3QgdHBtX2No aXAgKmNoaXApCj4gPiDCoAlpbnRtYXNrICY9IH5UUE1fR0xPQkFMX0lOVF9FTkFCTEU7Cj4gPiDC oAlpb3dyaXRlMzIoaW50bWFzaywKPiA+IMKgCQnCoMKgcHJpdi0+aW9iYXNlICsgVFBNX0lOVF9F TkFCTEUocHJpdi0+bG9jYWxpdHkpKTsKPiA+IC0JZGV2bV9mcmVlX2lycSgmY2hpcC0+ZGV2LCBw cml2LT5pcnEsIGNoaXApOwo+ID4gKwlkZXZtX2ZyZWVfaXJxKGNoaXAtPmRldi5wYXJlbnQsIHBy aXYtPmlycSwgY2hpcCk7Cj4gPiDCoAlwcml2LT5pcnEgPSAwOwo+ID4gwqAJY2hpcC0+ZmxhZ3Mg Jj0gflRQTV9DSElQX0ZMQUdfSVJROwo+ID4gwqB9Cj4gPiBAQCAtNjA0LDcgKzYwNCw3IEBAIHN0 YXRpYyBpbnQgdHBtX3Rpc19wcm9iZV9pcnFfc2luZ2xlKHN0cnVjdCB0cG1fY2hpcCAqY2hpcCwg dTMyCj4gPiBpbnRtYXNrLAo+ID4gwqAJc3RydWN0IHByaXZfZGF0YSAqcHJpdiA9IGRldl9nZXRf ZHJ2ZGF0YSgmY2hpcC0+ZGV2KTsKPiA+IMKgCXU4IG9yaWdpbmFsX2ludF92ZWM7Cj4gPiDCoAo+ ID4gLQlpZiAoZGV2bV9yZXF1ZXN0X2lycSgmY2hpcC0+ZGV2LCBpcnEsIHRpc19pbnRfaGFuZGxl ciwgZmxhZ3MsCj4gPiArCWlmIChkZXZtX3JlcXVlc3RfaXJxKGNoaXAtPmRldi5wYXJlbnQsIGly cSwgdGlzX2ludF9oYW5kbGVyLCBmbGFncywKPiA+IMKgCQkJwqDCoMKgwqDCoGRldl9uYW1lKCZj aGlwLT5kZXYpLCBjaGlwKSAhPSAwKSB7Cj4gPiDCoAkJZGV2X2luZm8oJmNoaXAtPmRldiwgIlVu YWJsZSB0byByZXF1ZXN0IGlycTogJWQgZm9yIHByb2JlXG4iLAo+ID4gwqAJCQnCoGlycSk7Cgot LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KRmluZCBhbmQgZml4IGFwcGxpY2F0aW9uIHBlcmZvcm1hbmNl IGlzc3VlcyBmYXN0ZXIgd2l0aCBBcHBsaWNhdGlvbnMgTWFuYWdlcgpBcHBsaWNhdGlvbnMgTWFu YWdlciBwcm92aWRlcyBkZWVwIHBlcmZvcm1hbmNlIGluc2lnaHRzIGludG8gbXVsdGlwbGUgdGll cnMgb2YKeW91ciBidXNpbmVzcyBhcHBsaWNhdGlvbnMuIEl0IHJlc29sdmVzIGFwcGxpY2F0aW9u IHByb2JsZW1zIHF1aWNrbHkgYW5kCnJlZHVjZXMgeW91ciBNVFRSLiBHZXQgeW91ciBmcmVlIHRy aWFsIQpodHRwczovL2FkLmRvdWJsZWNsaWNrLm5ldC9kZG0vY2xrLzMwMjk4MjE5ODsxMzAxMDU1 MTY7egpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwp0cG1k ZC1kZXZlbCBtYWlsaW5nIGxpc3QKdHBtZGQtZGV2ZWxAbGlzdHMuc291cmNlZm9yZ2UubmV0Cmh0 dHBzOi8vbGlzdHMuc291cmNlZm9yZ2UubmV0L2xpc3RzL2xpc3RpbmZvL3RwbWRkLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753263AbcD1IxZ (ORCPT ); Thu, 28 Apr 2016 04:53:25 -0400 Received: from mga09.intel.com ([134.134.136.24]:51499 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752685AbcD1IxW (ORCPT ); Thu, 28 Apr 2016 04:53:22 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,546,1455004800"; d="scan'208";a="941946836" Message-ID: <1461833596.3482.2.camel@linux.intel.com> Subject: Re: [PATCH] tpm: Fix IRQ unwind ordering in TIS From: Jarkko Sakkinen To: Jason Gunthorpe Cc: Stefan Berger , linux-security-module@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Date: Thu, 28 Apr 2016 11:53:16 +0300 In-Reply-To: <1461830953.3482.1.camel@linux.intel.com> References: <20160427165846.GA17064@obsidianresearch.com> <1461830953.3482.1.camel@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2016-04-28 at 11:09 +0300, Jarkko Sakkinen wrote: > On Wed, 2016-04-27 at 10:58 -0600, Jason Gunthorpe wrote: > > > > The devm for the IRQ was placed on the chip, not the pdev. This can > > cause the irq to be still callable after the pdev has been cleaned up > > (eg priv kfree'd). > >   > > Found by CONFIG_DEBUG_SHIRQ=y > >   > > Reported-by: Stefan Berger > > Fixes: 233a065e0cd0 ("tpm: Get rid of chip->pdev") > > Signed-off-by: Jason Gunthorpe > > Tested-by:  Stefan Berger > Reviewed-by: Jarkko Sakkinen And applied  and merged to next. /Jarkko > /Jarkko > > > > > --- > >  drivers/char/tpm/tpm_tis.c | 4 ++-- > >  1 file changed, 2 insertions(+), 2 deletions(-) > >   > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > > index a6b2d460bfc0..d88827046a42 100644 > > --- a/drivers/char/tpm/tpm_tis.c > > +++ b/drivers/char/tpm/tpm_tis.c > > @@ -387,7 +387,7 @@ static void disable_interrupts(struct tpm_chip *chip) > >   intmask &= ~TPM_GLOBAL_INT_ENABLE; > >   iowrite32(intmask, > >     priv->iobase + TPM_INT_ENABLE(priv->locality)); > > - devm_free_irq(&chip->dev, priv->irq, chip); > > + devm_free_irq(chip->dev.parent, priv->irq, chip); > >   priv->irq = 0; > >   chip->flags &= ~TPM_CHIP_FLAG_IRQ; > >  } > > @@ -604,7 +604,7 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 > > intmask, > >   struct priv_data *priv = dev_get_drvdata(&chip->dev); > >   u8 original_int_vec; > >   > > - if (devm_request_irq(&chip->dev, irq, tis_int_handler, flags, > > + if (devm_request_irq(chip->dev.parent, irq, tis_int_handler, flags, > >        dev_name(&chip->dev), chip) != 0) { > >   dev_info(&chip->dev, "Unable to request irq: %d for probe\n", > >    irq);