* [PATCH] tpm: Fix IRQ unwind ordering in TIS
@ 2016-04-27 16:58 Jason Gunthorpe
2016-04-28 8:09 ` Jarkko Sakkinen
0 siblings, 1 reply; 3+ messages in thread
From: Jason Gunthorpe @ 2016-04-27 16:58 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: linux-security-module-u79uwXL29TY76Z2rM5mHXA,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
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 <stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Fixes: 233a065e0cd0 ("tpm: Get rid of chip->pdev")
Signed-off-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
Tested-by: Stefan Berger <stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
---
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);
--
2.1.4
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tpm: Fix IRQ unwind ordering in TIS
2016-04-27 16:58 [PATCH] tpm: Fix IRQ unwind ordering in TIS Jason Gunthorpe
@ 2016-04-28 8:09 ` Jarkko Sakkinen
[not found] ` <1461830953.3482.1.camel-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Sakkinen @ 2016-04-28 8:09 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: Stefan Berger, linux-security-module, tpmdd-devel, linux-kernel
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 <stefanb@linux.vnet.ibm.com>
> Fixes: 233a065e0cd0 ("tpm: Get rid of chip->pdev")
> Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/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);
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-28 8:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-27 16:58 [PATCH] tpm: Fix IRQ unwind ordering in TIS Jason Gunthorpe
2016-04-28 8:09 ` Jarkko Sakkinen
[not found] ` <1461830953.3482.1.camel-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2016-04-28 8:53 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).