Commit ada3bfb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd 

Pull tpm updates from Jarkko Sakkinen:
 "Just a few bug fixes this time"

* tag 'tpmdd-next-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle
  security/keys: Remove inconsistent __user annotation
  char: move from strlcpy with unused retval to strscpy
parents 3604a7f5 2d869f0b

drivers/char/tpm/tpm_ppi.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ void tpm_add_ppi(struct tpm_chip *chip) 
				      TPM_PPI_FN_VERSION,

				      NULL, ACPI_TYPE_STRING);

	if (obj) {

		strlcpy(chip->ppi_version, obj->string.pointer,

		strscpy(chip->ppi_version, obj->string.pointer,

			sizeof(chip->ppi_version));

		ACPI_FREE(obj);

	}

security/keys/keyring.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void keyring_revoke(struct key *keyring); 
static void keyring_destroy(struct key *keyring);

static void keyring_describe(const struct key *keyring, struct seq_file *m);

static long keyring_read(const struct key *keyring,

			 char __user *buffer, size_t buflen);

			 char *buffer, size_t buflen);



struct key_type key_type_keyring = {

	.name		= "keyring",

tools/testing/selftests/tpm2/tpm2.py

+4 −0
Original line number Diff line number Diff line
@@ -371,6 +371,10 @@ class Client: 
            fcntl.fcntl(self.tpm, fcntl.F_SETFL, flags)

            self.tpm_poll = select.poll()



    def __del__(self):

        if self.tpm:

            self.tpm.close()



    def close(self):

        self.tpm.close()