* [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices"
@ 2011-01-07 3:24 Olof Johansson
2011-01-20 17:37 ` Olof Johansson
0 siblings, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2011-01-07 3:24 UTC (permalink / raw)
To: linux-kernel
Cc: Debora Velarde, Rajiv Andrade, Marcel Selhorst, tpmdd-devel,
James Morris, Olof Johansson, Matthew Garrett
commit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 adds a check for
PNP device id to the common tpm_tis_init() function, which in some
cases (force=1) will be called without the device being a member of
a pnp_dev. Oopsing and panics ensue.
Move the test up to before the call to tpm_tis_init(), since it
just modifies a global variable anyway.
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: stable@kernel.org [2.6.37+]
---
drivers/char/tpm/tpm_tis.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index c17a305..dd21df5 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -493,9 +493,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
"1.2 TPM (device-id 0x%X, rev-id %d)\n",
vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
- if (is_itpm(to_pnp_dev(dev)))
- itpm = 1;
-
if (itpm)
dev_info(dev, "Intel iTPM workaround enabled\n");
@@ -637,6 +634,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
else
interrupts = 0;
+ if (is_itpm(pnp_dev))
+ itpm = 1;
+
return tpm_tis_init(&pnp_dev->dev, start, len, irq);
}
--
1.7.3.GIT
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices"
2011-01-07 3:24 [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices" Olof Johansson
@ 2011-01-20 17:37 ` Olof Johansson
2011-01-20 18:44 ` Rajiv Andrade
2011-01-24 0:31 ` James Morris
0 siblings, 2 replies; 6+ messages in thread
From: Olof Johansson @ 2011-01-20 17:37 UTC (permalink / raw)
To: linux-kernel
Cc: Debora Velarde, Rajiv Andrade, Marcel Selhorst, tpmdd-devel,
James Morris, Olof Johansson, Matthew Garrett
Are all TPM maintainers MIA? This is a trivial patch that fixes a
panic, and it was a late-added regression in 2.6.37.
-Olof
On Thu, Jan 6, 2011 at 7:24 PM, Olof Johansson <olof@lixom.net> wrote:
> commit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 adds a check for
> PNP device id to the common tpm_tis_init() function, which in some
> cases (force=1) will be called without the device being a member of
> a pnp_dev. Oopsing and panics ensue.
>
> Move the test up to before the call to tpm_tis_init(), since it
> just modifies a global variable anyway.
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> Cc: Matthew Garrett <mjg@redhat.com>
> Cc: stable@kernel.org [2.6.37+]
> ---
> drivers/char/tpm/tpm_tis.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index c17a305..dd21df5 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -493,9 +493,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
> "1.2 TPM (device-id 0x%X, rev-id %d)\n",
> vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
>
> - if (is_itpm(to_pnp_dev(dev)))
> - itpm = 1;
> -
> if (itpm)
> dev_info(dev, "Intel iTPM workaround enabled\n");
>
> @@ -637,6 +634,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
> else
> interrupts = 0;
>
> + if (is_itpm(pnp_dev))
> + itpm = 1;
> +
> return tpm_tis_init(&pnp_dev->dev, start, len, irq);
> }
>
> --
> 1.7.3.GIT
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices"
2011-01-20 17:37 ` Olof Johansson
@ 2011-01-20 18:44 ` Rajiv Andrade
2011-01-20 23:11 ` James Morris
2011-01-24 0:31 ` James Morris
1 sibling, 1 reply; 6+ messages in thread
From: Rajiv Andrade @ 2011-01-20 18:44 UTC (permalink / raw)
To: Olof Johansson
Cc: linux-kernel, Debora Velarde, Marcel Selhorst, tpmdd-devel,
James Morris, Matthew Garrett
On 01/20/2011 03:37 PM, Olof Johansson wrote:
> Are all TPM maintainers MIA? This is a trivial patch that fixes a
> panic, and it was a late-added regression in 2.6.37.
>
Not myself. I missed this one unfortunately in my work queue, sorry,
will keep alert to avoid this happening again.
Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
> -Olof
>
> On Thu, Jan 6, 2011 at 7:24 PM, Olof Johansson<olof@lixom.net> wrote:
>> commit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 adds a check for
>> PNP device id to the common tpm_tis_init() function, which in some
>> cases (force=1) will be called without the device being a member of
>> a pnp_dev. Oopsing and panics ensue.
>>
>> Move the test up to before the call to tpm_tis_init(), since it
>> just modifies a global variable anyway.
>>
>> Signed-off-by: Olof Johansson<olof@lixom.net>
>> Cc: Matthew Garrett<mjg@redhat.com>
>> Cc: stable@kernel.org [2.6.37+]
>> ---
>> drivers/char/tpm/tpm_tis.c | 6 +++---
>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
>> index c17a305..dd21df5 100644
>> --- a/drivers/char/tpm/tpm_tis.c
>> +++ b/drivers/char/tpm/tpm_tis.c
>> @@ -493,9 +493,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
>> "1.2 TPM (device-id 0x%X, rev-id %d)\n",
>> vendor>> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
>>
>> - if (is_itpm(to_pnp_dev(dev)))
>> - itpm = 1;
>> -
>> if (itpm)
>> dev_info(dev, "Intel iTPM workaround enabled\n");
>>
>> @@ -637,6 +634,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
>> else
>> interrupts = 0;
>>
>> + if (is_itpm(pnp_dev))
>> + itpm = 1;
>> +
>> return tpm_tis_init(&pnp_dev->dev, start, len, irq);
>> }
>>
>> --
>> 1.7.3.GIT
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices"
2011-01-20 18:44 ` Rajiv Andrade
@ 2011-01-20 23:11 ` James Morris
2011-01-26 14:59 ` Rajiv Andrade
0 siblings, 1 reply; 6+ messages in thread
From: James Morris @ 2011-01-20 23:11 UTC (permalink / raw)
To: Rajiv Andrade
Cc: Olof Johansson, linux-kernel, Debora Velarde, Marcel Selhorst,
tpmdd-devel, Matthew Garrett
On Thu, 20 Jan 2011, Rajiv Andrade wrote:
> On 01/20/2011 03:37 PM, Olof Johansson wrote:
> > Are all TPM maintainers MIA? This is a trivial patch that fixes a
> > panic, and it was a late-added regression in 2.6.37.
> >
> Not myself. I missed this one unfortunately in my work queue, sorry, will keep
> alert to avoid this happening again.
>
> Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Rajiv,
I've mentioned this at least once before: as maintainer of TPM, ideally,
what you should be doing is collecting the TPM patches, testing them in
your own tree, then pushing them to me with an indication of where they
need to end up (e.g. bugfixes for current linus vs. next), preferably via
git.
This is a significant part of what distinguishes maintainership from
simply developing or reviewing code.
- James
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices"
2011-01-20 23:11 ` James Morris
@ 2011-01-26 14:59 ` Rajiv Andrade
0 siblings, 0 replies; 6+ messages in thread
From: Rajiv Andrade @ 2011-01-26 14:59 UTC (permalink / raw)
To: James Morris
Cc: Olof Johansson, linux-kernel, Debora Velarde, Marcel Selhorst,
tpmdd-devel, Matthew Garrett
On 01/20/2011 09:11 PM, James Morris wrote:
> On Thu, 20 Jan 2011, Rajiv Andrade wrote:
>
>> On 01/20/2011 03:37 PM, Olof Johansson wrote:
>>> Are all TPM maintainers MIA? This is a trivial patch that fixes a
>>> panic, and it was a late-added regression in 2.6.37.
>>>
>> Not myself. I missed this one unfortunately in my work queue, sorry, will keep
>> alert to avoid this happening again.
>>
>> Acked-by: Rajiv Andrade<srajiv@linux.vnet.ibm.com>
> Rajiv,
>
> I've mentioned this at least once before: as maintainer of TPM, ideally,
> what you should be doing is collecting the TPM patches, testing them in
> your own tree, then pushing them to me with an indication of where they
> need to end up (e.g. bugfixes for current linus vs. next), preferably via
> git.
>
> This is a significant part of what distinguishes maintainership from
> simply developing or reviewing code.
>
>
> - James
Sorry for the delays, I'm setting up a git tree now. Thanks for the
heads up.
Rajiv
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices"
2011-01-20 17:37 ` Olof Johansson
2011-01-20 18:44 ` Rajiv Andrade
@ 2011-01-24 0:31 ` James Morris
1 sibling, 0 replies; 6+ messages in thread
From: James Morris @ 2011-01-24 0:31 UTC (permalink / raw)
To: Olof Johansson
Cc: linux-kernel, Debora Velarde, Rajiv Andrade, Marcel Selhorst,
tpmdd-devel, Matthew Garrett, linux-security-module
On Thu, 20 Jan 2011, Olof Johansson wrote:
> On Thu, Jan 6, 2011 at 7:24 PM, Olof Johansson <olof@lixom.net> wrote:
> > commit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 adds a check for
> > PNP device id to the common tpm_tis_init() function, which in some
> > cases (force=1) will be called without the device being a member of
> > a pnp_dev. Oopsing and panics ensue.
> >
> > Move the test up to before the call to tpm_tis_init(), since it
> > just modifies a global variable anyway.
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#for-linus
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-26 14:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-07 3:24 [PATCH] tpm: fix panic caused by "tpm: Autodetect itpm devices" Olof Johansson
2011-01-20 17:37 ` Olof Johansson
2011-01-20 18:44 ` Rajiv Andrade
2011-01-20 23:11 ` James Morris
2011-01-26 14:59 ` Rajiv Andrade
2011-01-24 0:31 ` James Morris
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).