diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 07:00:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 07:00:09 -0500 |
| commit | 398d999f96bf8e02573b0c7e32896c7812393bc0 (patch) | |
| tree | 839f1616cc205b9a74f07f7b571a603814446de6 /security/keys/trusted-keys/trusted_tpm2.c | |
| parent | staging: nvec: check return value (diff) | |
| parent | Linux 5.5-rc3 (diff) | |
| download | linux-dev-398d999f96bf8e02573b0c7e32896c7812393bc0.tar.xz linux-dev-398d999f96bf8e02573b0c7e32896c7812393bc0.zip | |
Merge 5.5-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/keys/trusted-keys/trusted_tpm2.c')
| -rw-r--r-- | security/keys/trusted-keys/trusted_tpm2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index a9810ac2776f..08ec7f48f01d 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -309,6 +309,7 @@ int tpm2_unseal_trusted(struct tpm_chip *chip, return rc; rc = tpm2_unseal_cmd(chip, payload, options, blob_handle); + tpm2_flush_context(chip, blob_handle); return rc; } |