linux-stable.git/drivers/char, branch linux-3.19.y

tpm/tpm_i2c_stm_st33: Add status check when reading data on the FIFO

2015-03-26T12:59:43+00:00

commit c4eadfafb91d5501095c55ffadaa1168743f39d3 upstream.

Add a return value check when reading data from the FIFO register.

Reviewed-by: Jason Gunthorpe 
Signed-off-by: Christophe Ricard 
Reviewed-by: Peter Huewe 
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman

tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send

2015-03-26T12:59:43+00:00

commit 62dfd912ab3b5405b6fe72d0135c37e9648071f1 upstream.

Problem: When IMA and VTPM are both enabled in kernel config,
kernel hangs during bootup on LE OS.

Why?: IMA calls tpm_pcr_read() which results in tpm_ibmvtpm_send
and tpm_ibmtpm_recv getting called. A trace showed that
tpm_ibmtpm_recv was hanging.

Resolution: tpm_ibmtpm_recv was hanging because tpm_ibmvtpm_send
was sending CRQ message that probably did not make much sense
to phype because of Endianness. The fix below sends correctly
converted CRQ for LE. This was not caught before because it
seems IMA is not enabled by default in kernel config and
IMA exercises this particular code path in vtpm.

Tested with IMA and VTPM enabled in kernel config and VTPM
enabled on both a BE OS and a LE OS ppc64 lpar. This exercised
CRQ and TPM command code paths in vtpm.
Patch is against Peter's tpmdd tree on github which included
Vicky's previous vtpm le patches.

Signed-off-by: Joy Latten 
Reviewed-by: Ashley Lai 
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman

virtio_console: avoid config access from irq

2015-03-26T12:59:40+00:00

commit eeb8a7e8bb123e84daeef84f5a2eab99ad2839a2 upstream.

when multiport is off, virtio console invokes config access from irq
context, config access is blocking on s390.
Fix this up by scheduling work from config irq - similar to what we do
for multiport configs.

Signed-off-by: Michael S. Tsirkin 
Reviewed-by: Amit Shah 
Signed-off-by: Rusty Russell 
Signed-off-by: Greg Kroah-Hartman

virtio_console: init work unconditionally

2015-03-26T12:59:39+00:00

commit 4f6e24ed9de8634d6471ef86b382cba6d4e57ca8 upstream.

when multiport is off, we don't initialize config work,
but we then cancel uninitialized control_work on freeze.

Signed-off-by: Michael S. Tsirkin 
Reviewed-by: Amit Shah 
Signed-off-by: Rusty Russell 
Signed-off-by: Greg Kroah-Hartman

Added Little Endian support to vtpm module

2015-03-06T22:57:30+00:00

commit eb71f8a5e33fa1066fb92f0111ab366a341e1f6c upstream.

The tpm_ibmvtpm module is affected by an unaligned access problem.
ibmvtpm_crq_get_version failed with rc=-4 during boot when vTPM is
enabled in Power partition, which supports both little endian and
big endian modes.

We added little endian support to fix this problem:
1) added cpu_to_be64 calls to ensure BE data is sent from an LE OS.
2) added be16_to_cpu and be32_to_cpu calls to make sure data received
   is in LE format on a LE OS.

Signed-off-by: Hon Ching(Vicky) Lo 
Signed-off-by: Joy Latten 
[phuewe: manually applied the patch :( ]
Reviewed-by: Ashley Lai 
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman

tpm/tpm_i2c_stm_st33: Fix potential bug in tpm_stm_i2c_send

2015-03-06T22:57:30+00:00

commit 1ba3b0b6f218072afe8372d12f1b6bf26a26008e upstream.

When sending data in tpm_stm_i2c_send, each loop iteration send buf.
Send buf + i instead as the goal of this for loop is to send a number
of byte from buf that fit in burstcnt. Once those byte are sent, we are
supposed to send the next ones.

The driver was working because the burstcount value returns always the maximum size for a TPM
command or response. (0x800 for a command and 0x400 for a response).

Reviewed-by: Jason Gunthorpe 
Signed-off-by: Christophe Ricard 
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman

tpm: Fix NULL return in tpm_ibmvtpm_get_desired_dma

2015-03-06T22:57:30+00:00

commit 84eb186bc37c0900b53077ca21cf6dd15823a232 upstream.

There was an oops in tpm_ibmvtpm_get_desired_dma, which caused
kernel panic during boot when vTPM is enabled in Power partition
configured in AMS mode.

vio_bus_probe calls vio_cmo_bus_probe which calls
tpm_ibmvtpm_get_desired_dma to get the size needed for DMA allocation.
The problem is, vio_cmo_bus_probe is called before calling probe, which
for vtpm is tpm_ibmvtpm_probe and it's this function that initializes
and sets up vtpm's CRQ and gets required data values.  Therefore,
since this has not yet been done, NULL is returned in attempt to get
the size for DMA allocation.

We added a NULL check.  In addition, a default buffer size will
be set when NULL is returned.

Signed-off-by: Hon Ching (Vicky) Lo 
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman

char: tpm: Add missing error check for devm_kzalloc

2015-03-06T22:57:30+00:00

commit bb95cd34ba4c9467114acc78eeddd53ab1c10085 upstream.

Currently these driver are missing a check on the return value of devm_kzalloc,
which would cause a NULL pointer dereference in a OOM situation.

This patch adds a missing check for tpm_i2c_atmel.c and tpm_i2c_nuvoton.c

Signed-off-by: Kiran Padwal 
Reviewed-By: Jason Gunthorpe 
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman

TPM: Add new TPMs to the tail of the list to prevent inadvertent change of dev

2015-03-06T22:57:30+00:00

commit 398a1e71dc827b994b7f2f56c7c2186fea7f8d75 upstream.

Add newly registered TPMs to the tail of the list, not the beginning, so that
things that are specifying TPM_ANY_NUM don't find that the device they're
using has inadvertently changed.  Adding a second device would break IMA, for
instance.

Signed-off-by: David Howells 
Reviewed-by: Jason Gunthorpe 
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman

tpm_tis: verify interrupt during init

2015-03-06T22:57:30+00:00

commit 448e9c55c12d6bd4fa90a7e31d802e045666d7c8 upstream.

Some machines, such as the Acer C720 and Toshiba CB35, have TPMs that do
not send IRQs while also having an ACPI TPM entry indicating that they
will be sent. These machines freeze on resume while the tpm_tis module
waits for an IRQ, eventually timing out.

When in interrupt mode, the tpm_tis module should receive an IRQ during
module init. Fall back to polling mode if none is received when expected.

Signed-off-by: Scot Doyle 
Tested-by: Michael Mullin 
Reviewed-by: Jason Gunthorpe 
[phuewe: minor checkpatch fixed]
Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman