Commit 5da10728 authored by James Morris's avatar James Morris
Browse files

Merge tag 'tpmdd-next-20190213' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm 

tpmdd updates for Linux v5.1

From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

Clean up the transmission flow
==============================

Cleaned up the whole transmission flow. Locking of the chip is now done in
the level of tpm_try_get_ops() and tpm_put_ops() instead taking the chip
lock inside tpm_transmit(). The nested calls inside tpm_transmit(), used
with the resource manager, have been refactored out.

Should make easier to perform more complex transactions with the TPM
without making the subsystem a bigger mess (e.g. encrypted channel patches
by James Bottomley).

PPI 1.3 support
===============

TPM PPI 1.3 introduces an additional optional command parameter that may be
needed for some commands. Display the parameter if the command requires
such a parameter. Only command 23 (SetPCRBanks) needs one.

The PPI request file will show output like this then:

   # echo "23 16" > request
   # cat request
   23 16

   # echo "5" > request
   # cat request
   5

Extend all PCR banks in IMA
===========================

Instead of static PCR banks array, the array of available PCR banks is now
allocated dynamically. The digests sizes are determined dynamically using a
probe PCR read without relying crypto's static list of hash algorithms.

This should finally make sealing of measurements in IMA safe and secure.

TPM 2.0 selftests
=================

Added a test suite to tools/testing/selftests/tpm2 previously outside of
the kernel tree: https://github.com/jsakkine-intel/tpm2-scripts.
parents e7a44cfd 50a81b60

drivers/char/tpm/eventlog/tpm1.c

+16 −25
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static const char* tcpa_pc_event_id_strings[] = { 
/* returns pointer to start of pos. entry of tcg log */

static void *tpm1_bios_measurements_start(struct seq_file *m, loff_t *pos)

{

	loff_t i;

	loff_t i = 0;

	struct tpm_chip *chip = m->private;

	struct tpm_bios_log *log = &chip->log;

	void *addr = log->bios_event_log;
@@ -83,39 +83,30 @@ static void *tpm1_bios_measurements_start(struct seq_file *m, loff_t *pos) 
	u32 converted_event_size;

	u32 converted_event_type;





	/* read over *pos measurements */

	for (i = 0; i < *pos; i++) {

	do {

		event = addr;



		/* check if current entry is valid */

		if (addr + sizeof(struct tcpa_event) > limit)

			return NULL;



		converted_event_size =

		    do_endian_conversion(event->event_size);

		converted_event_type =

		    do_endian_conversion(event->event_type);



		if ((addr + sizeof(struct tcpa_event)) < limit) {

			if ((converted_event_type == 0) &&

			    (converted_event_size == 0))

				return NULL;

			addr += (sizeof(struct tcpa_event) +

				 converted_event_size);

		}

	}



	/* now check if current entry is valid */

	if ((addr + sizeof(struct tcpa_event)) >= limit)

		return NULL;



	event = addr;



	converted_event_size = do_endian_conversion(event->event_size);

	converted_event_type = do_endian_conversion(event->event_type);



		if (((converted_event_type == 0) && (converted_event_size == 0))

		    || ((addr + sizeof(struct tcpa_event) + converted_event_size)

		>= limit))

			> limit))

			return NULL;



		if (i++ == *pos)

			break;



		addr += (sizeof(struct tcpa_event) + converted_event_size);

	} while (1);



	return addr;

}
@@ -134,7 +125,7 @@ static void *tpm1_bios_measurements_next(struct seq_file *m, void *v, 
	v += sizeof(struct tcpa_event) + converted_event_size;



	/* now check if current entry is valid */

	if ((v + sizeof(struct tcpa_event)) >= limit)

	if ((v + sizeof(struct tcpa_event)) > limit)

		return NULL;



	event = v;
@@ -143,7 +134,7 @@ static void *tpm1_bios_measurements_next(struct seq_file *m, void *v, 
	converted_event_type = do_endian_conversion(event->event_type);



	if (((converted_event_type == 0) && (converted_event_size == 0)) ||

	    ((v + sizeof(struct tcpa_event) + converted_event_size) >= limit))

	    ((v + sizeof(struct tcpa_event) + converted_event_size) > limit))

		return NULL;



	(*pos)++;

drivers/char/tpm/eventlog/tpm2.c

+6 −6
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ 
 *

 * Returns size of the event. If it is an invalid event, returns 0.

 */

static int calc_tpm2_event_size(struct tcg_pcr_event2 *event,

static int calc_tpm2_event_size(struct tcg_pcr_event2_head *event,

				struct tcg_pcr_event *event_header)

{

	struct tcg_efi_specid_event *efispecid;

	struct tcg_efi_specid_event_head *efispecid;

	struct tcg_event_field *event_field;

	void *marker;

	void *marker_start;
@@ -55,7 +55,7 @@ static int calc_tpm2_event_size(struct tcg_pcr_event2 *event, 
	marker = marker + sizeof(event->pcr_idx) + sizeof(event->event_type)

		+ sizeof(event->count);



	efispecid = (struct tcg_efi_specid_event *)event_header->event;

	efispecid = (struct tcg_efi_specid_event_head *)event_header->event;



	/* Check if event is malformed. */

	if (event->count > efispecid->num_algs)
@@ -95,7 +95,7 @@ static void *tpm2_bios_measurements_start(struct seq_file *m, loff_t *pos) 
	void *addr = log->bios_event_log;

	void *limit = log->bios_event_log_end;

	struct tcg_pcr_event *event_header;

	struct tcg_pcr_event2 *event;

	struct tcg_pcr_event2_head *event;

	size_t size;

	int i;
@@ -136,7 +136,7 @@ static void *tpm2_bios_measurements_next(struct seq_file *m, void *v, 
					 loff_t *pos)

{

	struct tcg_pcr_event *event_header;

	struct tcg_pcr_event2 *event;

	struct tcg_pcr_event2_head *event;

	struct tpm_chip *chip = m->private;

	struct tpm_bios_log *log = &chip->log;

	void *limit = log->bios_event_log_end;
@@ -180,7 +180,7 @@ static int tpm2_binary_bios_measurements_show(struct seq_file *m, void *v) 
	struct tpm_chip *chip = m->private;

	struct tpm_bios_log *log = &chip->log;

	struct tcg_pcr_event *event_header = log->bios_event_log;

	struct tcg_pcr_event2 *event = v;

	struct tcg_pcr_event2_head *event = v;

	void *temp_ptr;

	size_t size;

drivers/char/tpm/st33zp24/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


struct st33zp24_i2c_phy {

	struct i2c_client *client;

	u8 buf[TPM_BUFSIZE + 1];

	u8 buf[ST33ZP24_BUFSIZE + 1];

	int io_lpcpd;

};

drivers/char/tpm/st33zp24/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
 * some latency byte before the answer is available (max 15).

 * We have 2048 + 1024 + 15.

 */

#define ST33ZP24_SPI_BUFFER_SIZE (TPM_BUFSIZE + (TPM_BUFSIZE / 2) +\

#define ST33ZP24_SPI_BUFFER_SIZE (ST33ZP24_BUFSIZE + (ST33ZP24_BUFSIZE / 2) +\

				  MAX_SPI_LATENCY)

drivers/char/tpm/st33zp24/st33zp24.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf, 
			goto out_err;

	}



	return len;

	return 0;

out_err:

	st33zp24_cancel(chip);

	release_locality(chip);

CRA Git | Maintained and supported by SUSTech CRA and CCSE