lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <5FFFAD06ADE1CA4381B3F0F7C6AF582898874E@ORSMSX109.amr.corp.intel.com> Date: Wed, 20 Dec 2017 15:25:42 +0000 From: "Shaikh, Azhar" <azhar.shaikh@...el.com> To: Javier Martinez Canillas <javierm@...hat.com>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> CC: James Ettle <james@...le.org.uk>, Hans de Goede <hdegoede@...hat.com>, Arnd Bergmann <arnd@...db.de>, Jarkko Sakkinen <jarkko.sakkinen@...ux.intel.com>, Peter Huewe <peterhuewe@....de>, "Jason Gunthorpe" <jgg@...pe.ca>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, "linux-integrity@...r.kernel.org" <linux-integrity@...r.kernel.org> Subject: RE: [PATCH 1/4] tpm: fix access attempt to an already unmapped I/O memory region >-----Original Message----- >From: Javier Martinez Canillas [mailto:javierm@...hat.com] >Sent: Wednesday, December 20, 2017 3:36 AM >To: linux-kernel@...r.kernel.org >Cc: James Ettle <james@...le.org.uk>; Hans de Goede ><hdegoede@...hat.com>; Shaikh, Azhar <azhar.shaikh@...el.com>; Javier >Martinez Canillas <javierm@...hat.com>; Arnd Bergmann <arnd@...db.de>; >Jarkko Sakkinen <jarkko.sakkinen@...ux.intel.com>; Peter Huewe ><peterhuewe@....de>; Jason Gunthorpe <jgg@...pe.ca>; Greg Kroah- >Hartman <gregkh@...uxfoundation.org>; linux-integrity@...r.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 <javierm@...hat.com> >--- > > 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
Powered by blists - more mailing lists