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

Commit c0b5eed1 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm: fix: set continueSession attribute for the unseal operation 



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.

Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fixes: 5beb0c43 ("keys, trusted: seal with a TPM2 authorization policy")
parent 8e0ee3c9

drivers/char/tpm/tpm2-cmd.c

+7 −3
Original line number Diff line number Diff line
@@ -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 *chip, 
		tpm_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 *chip, 
			     options->policyhandle ?

			     options->policyhandle : TPM2_RS_PW,

			     NULL /* nonce */, 0,

			     0 /* session_attributes */,

			     TPM2_SA_CONTINUE_SESSION,

			     options->blobauth /* hmac */,

			     TPM_DIGEST_SIZE);