Patch "tpm: fix: set continueSession attribute for the unseal operation" has been added to the 4.5-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
tpm: fix: set continueSession attribute for the unseal operation
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tpm-fix-set-continuesession-attribute-for-the-unseal-operation.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c0b5eed110dcf520aadafefbcc40658cbdd18b95Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <[email protected]>
Date: Sat, 13 Feb 2016 11:51:23 +0200
Subject: tpm: fix: set continueSession attribute for the unseal operation
From: Jarkko Sakkinen <[email protected]>
commit c0b5eed110dcf520aadafefbcc40658cbdd18b95 upstream.
It's better to set the continueSession attribute for the unseal operation so that the session object is not removed as a side-effect when the operation is successful. Since a user process created the session, it should be also decide when the session is destroyed.
--- drivers/char/tpm/tpm2-cmd.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/char/tpm/tpm2-cmd.c +7 -3
@@ -20,7 +20,11 @@#include <keys/trusted-type.h> enum tpm2_object_attributes { -TPM2_ATTR_USER_WITH_AUTH =BIT (6 ), +TPM2_OA_USER_WITH_AUTH =BIT (6 ), +}; + +enum tpm2_session_attributes { +TPM2_SA_CONTINUE_SESSION =BIT (0 ), };struct tpm2_startup_in {
@@ -489,7 +493,7 @@ int tpm2_seal_trusted(struct tpm_chip *ctpm_buf_append (&buf, options->policydigest, options->policydigest_len); }else { -tpm_buf_append_u32 (&buf,TPM2_ATTR_USER_WITH_AUTH ); +tpm_buf_append_u32 (&buf,TPM2_OA_USER_WITH_AUTH );tpm_buf_append_u16 (&buf,0 ); }
@@ -627,7 +631,7 @@ static int tpm2_unseal(struct tpm_chip * options->policyhandle ? options->policyhandle :TPM2_RS_PW ,NULL /* nonce */ ,0 , -0 /* session_attributes */ , +TPM2_SA_CONTINUE_SESSION , options->blobauth/* hmac */ , TPM_DIGEST_SIZE);
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/tpm-fix-set-continuesession-attribute-for-the-unseal-operation.patch queue-4.5/tpm-fix-checks-for-policy-digest-existence-in-tpm2_seal_trusted.patch