From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932099AbdLTPZr convert rfc822-to-8bit (ORCPT ); Wed, 20 Dec 2017 10:25:47 -0500 Received: from mga14.intel.com ([192.55.52.115]:36808 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755452AbdLTPZo (ORCPT ); Wed, 20 Dec 2017 10:25:44 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,432,1508828400"; d="scan'208";a="3425006" From: "Shaikh, Azhar" To: Javier Martinez Canillas , "linux-kernel@vger.kernel.org" CC: James Ettle , Hans de Goede , Arnd Bergmann , Jarkko Sakkinen , Peter Huewe , "Jason Gunthorpe" , Greg Kroah-Hartman , "linux-integrity@vger.kernel.org" Subject: RE: [PATCH 1/4] tpm: fix access attempt to an already unmapped I/O memory region Thread-Topic: [PATCH 1/4] tpm: fix access attempt to an already unmapped I/O memory region Thread-Index: AQHTeYa8mq32R+iVBkysqRaAWn4zXKNMWmlw Date: Wed, 20 Dec 2017 15:25:42 +0000 Message-ID: <5FFFAD06ADE1CA4381B3F0F7C6AF582898874E@ORSMSX109.amr.corp.intel.com> References: <20171220113538.16099-1-javierm@redhat.com> <20171220113538.16099-2-javierm@redhat.com> In-Reply-To: <20171220113538.16099-2-javierm@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMGM0N2I1YTMtY2MzOC00MzVmLTk5ZmMtMGZhZWJhN2FmNmM3IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJadTAwQUNZeUdob0t6WUxsM3hsVUJCcXlBR05mZ0VBZkZYY2pWczVZcWRmdzZya0h6RWNkMTVSMk9uTkNUVkZyIn0= dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.22.254.139] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >-----Original Message----- >From: Javier Martinez Canillas [mailto:javierm@redhat.com] >Sent: Wednesday, December 20, 2017 3:36 AM >To: linux-kernel@vger.kernel.org >Cc: James Ettle ; Hans de Goede >; Shaikh, Azhar ; Javier >Martinez Canillas ; Arnd Bergmann ; >Jarkko Sakkinen ; Peter Huewe >; Jason Gunthorpe ; Greg Kroah- >Hartman ; linux-integrity@vger.kernel.org >Subject: [PATCH 1/4] tpm: fix access attempt to an already unmapped I/O >memory region > >The driver maps the I/O memory address to control the LPC bus CLKRUN_EN, >but on the error path the memory is accessed by the .clk_enable handler after >this was already unmapped. So only unmap the I/O memory region if it will >not be used anymore. > >Also, the correct thing to do is to cleanup the resources in the inverse order >that were acquired to prevent issues like these. > Thanks for catching this! >Signed-off-by: Javier Martinez Canillas >--- > > drivers/char/tpm/tpm_tis_core.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > >diff --git a/drivers/char/tpm/tpm_tis_core.c >b/drivers/char/tpm/tpm_tis_core.c index c2227983ed88..3455abbb2035 >100644 >--- a/drivers/char/tpm/tpm_tis_core.c >+++ b/drivers/char/tpm/tpm_tis_core.c >@@ -923,7 +923,7 @@ int tpm_tis_core_init(struct device *dev, struct >tpm_tis_data *priv, int irq, > > rc = tpm_chip_register(chip); > if (rc && is_bsw()) >- iounmap(priv->ilb_base_addr); >+ goto out_err; > > if (chip->ops->clk_enable != NULL) > chip->ops->clk_enable(chip, false); >@@ -931,12 +931,13 @@ int tpm_tis_core_init(struct device *dev, struct >tpm_tis_data *priv, int irq, > return rc; > out_err: > tpm_tis_remove(chip); >- if (is_bsw()) >- iounmap(priv->ilb_base_addr); > > if (chip->ops->clk_enable != NULL) > chip->ops->clk_enable(chip, false); > >+ if (is_bsw()) >+ iounmap(priv->ilb_base_addr); >+ > return rc; > } > EXPORT_SYMBOL_GPL(tpm_tis_core_init); >-- >2.14.3