Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 301310c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tpm fixes from Jarkko Sakkinen.

* tag 'tpmdd-next-20190925' of git://git.infradead.org/users/jjs/linux-tpmdd:
  tpm: Wrap the buffer from the caller to tpm_buf in tpm_send()
  MAINTAINERS: keys: Update path to trusted.h
  KEYS: trusted: correctly initialize digests and fix locking issue
  selftests/tpm2: Add log and *.pyc to .gitignore
  selftests/tpm2: Add the missing TEST_FILES assignment
parents 4ef5b13a e13cd21f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9056,7 +9056,7 @@ S: Supported 
F:	Documentation/security/keys/trusted-encrypted.rst

F:	include/keys/trusted-type.h

F:	security/keys/trusted.c

F:	security/keys/trusted.h

F:	include/keys/trusted.h















KEYS/KEYRINGS:















M:	David Howells <dhowells@redhat.com>

































drivers/char/tpm/tpm-interface.c



+11
−12




























Original line number
Diff line number
Diff line








@@ -320,18 +320,22 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,













	if (!chip)















		return -ENODEV;





























	for (i = 0; i < chip->nr_allocated_banks; i++)













		if (digests[i].alg_id != chip->allocated_banks[i].alg_id)













			return -EINVAL;













	for (i = 0; i < chip->nr_allocated_banks; i++) {













		if (digests[i].alg_id != chip->allocated_banks[i].alg_id) {













			rc = EINVAL;













			goto out;













		}













	}































	if (chip->flags & TPM_CHIP_FLAG_TPM2) {















		rc = tpm2_pcr_extend(chip, pcr_idx, digests);













		tpm_put_ops(chip);













		return rc;













		goto out;















	}































	rc = tpm1_pcr_extend(chip, pcr_idx, digests[0].digest,















			     "attempting extend a PCR value");



























out:















	tpm_put_ops(chip);















	return rc;















}









@@ -354,14 +358,9 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)













	if (!chip)















		return -ENODEV;





























	rc = tpm_buf_init(&buf, 0, 0);













	if (rc)













		goto out;



























	memcpy(buf.data, cmd, buflen);













	buf.data = cmd;















	rc = tpm_transmit_cmd(chip, &buf, 0, "attempting to a send a command");













	tpm_buf_destroy(&buf);













out:





























	tpm_put_ops(chip);















	return rc;















}

































security/keys/trusted.c



+5
−0




























Original line number
Diff line number
Diff line








@@ -1228,11 +1228,16 @@ static int __init trusted_shash_alloc(void)





























static int __init init_digests(void)















{













	int i;





























	digests = kcalloc(chip->nr_allocated_banks, sizeof(*digests),















			  GFP_KERNEL);















	if (!digests)















		return -ENOMEM;





























	for (i = 0; i < chip->nr_allocated_banks; i++)













		digests[i].alg_id = chip->allocated_banks[i].alg_id;





























	return 0;















}

















































tools/testing/selftests/.gitignore



+2
−0




























Original line number
Diff line number
Diff line








@@ -2,3 +2,5 @@ gpiogpio-event-mon













gpiogpio-hammer















gpioinclude/















gpiolsgpio













tpm2/SpaceTest.log













tpm2/*.pyc
























tools/testing/selftests/tpm2/Makefile



+1
−0




























Original line number
Diff line number
Diff line








@@ -2,3 +2,4 @@













include ../lib.mk































TEST_PROGS := test_smoke.sh test_space.sh













TEST_FILES := tpm2.py tpm2_tests.py