mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
tpmdd updates for Linux v6.1-rc1
-----BEGIN PGP SIGNATURE----- iIgEABYKADAWIQRE6pSOnaBC00OEHEIaerohdGur0gUCYzylIxIcamFya2tvQGtl cm5lbC5vcmcACgkQGnq6IXRrq9IDBwEAmoMCHzq2JseDBj21H5iLXrB2G5Vl80a9 UW363r09ht4A/RnvCIdFcaYYdawhQbcBWkRSYezDOPu6hopwrElb9+ID =l5my -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
ada3bfb649
3 changed files with 6 additions and 2 deletions
|
@ -380,7 +380,7 @@ void tpm_add_ppi(struct tpm_chip *chip)
|
||||||
TPM_PPI_FN_VERSION,
|
TPM_PPI_FN_VERSION,
|
||||||
NULL, ACPI_TYPE_STRING);
|
NULL, ACPI_TYPE_STRING);
|
||||||
if (obj) {
|
if (obj) {
|
||||||
strlcpy(chip->ppi_version, obj->string.pointer,
|
strscpy(chip->ppi_version, obj->string.pointer,
|
||||||
sizeof(chip->ppi_version));
|
sizeof(chip->ppi_version));
|
||||||
ACPI_FREE(obj);
|
ACPI_FREE(obj);
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ static void keyring_revoke(struct key *keyring);
|
||||||
static void keyring_destroy(struct key *keyring);
|
static void keyring_destroy(struct key *keyring);
|
||||||
static void keyring_describe(const struct key *keyring, struct seq_file *m);
|
static void keyring_describe(const struct key *keyring, struct seq_file *m);
|
||||||
static long keyring_read(const struct key *keyring,
|
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 = {
|
struct key_type key_type_keyring = {
|
||||||
.name = "keyring",
|
.name = "keyring",
|
||||||
|
|
|
@ -371,6 +371,10 @@ class Client:
|
||||||
fcntl.fcntl(self.tpm, fcntl.F_SETFL, flags)
|
fcntl.fcntl(self.tpm, fcntl.F_SETFL, flags)
|
||||||
self.tpm_poll = select.poll()
|
self.tpm_poll = select.poll()
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
if self.tpm:
|
||||||
|
self.tpm.close()
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
self.tpm.close()
|
self.tpm.close()
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue