From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: linux-integrity@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.ibm.com>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Subject: [PATCH 7/8] security: keys: trusted: add ability to specify arbitrary policy
Date: Sat, 07 Dec 2019 21:13:20 -0800 [thread overview]
Message-ID: <1575782000.14069.17.camel@HansenPartnership.com> (raw)
In-Reply-To: <1575781600.14069.8.camel@HansenPartnership.com>
This patch adds a policy= argument to key creation. The policy is the
standard tss policymaker format and each separate policy line must
have a newline after it.
Thus to construct a policy requiring authorized value and pcr 16
locking using a sha256 hash, the policy (policy.txt) file would be two
lines:
0000017F00000001000B03000001303095B49BE85E381E5B20E557E46363EF55B0F43B132C2D8E3DE9AC436656F2
0000016b
This can be inserted into the key with
keyctl add trusted kmk "new 32 policy=`cat policy.txt` keyhandle=0x81000001 hash=sha256" @u
Note that although a few policies work like this, most require special
handling which must be added to the kernel policy construction
routine.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
Documentation/security/keys/trusted-encrypted.rst | 16 ++++++++
security/keys/trusted-keys/tpm2-policy.c | 46 +++++++++++++++++++++++
security/keys/trusted-keys/tpm2-policy.h | 1 +
security/keys/trusted-keys/trusted_tpm1.c | 14 ++++++-
4 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/Documentation/security/keys/trusted-encrypted.rst b/Documentation/security/keys/trusted-encrypted.rst
index 1a3ca84ad3cd..ade1a9dc8367 100644
--- a/Documentation/security/keys/trusted-encrypted.rst
+++ b/Documentation/security/keys/trusted-encrypted.rst
@@ -70,6 +70,9 @@ Usage::
hash= hash algorithm name as a string. For TPM 1.x the only
allowed value is sha1. For TPM 2.x the allowed values
are sha1, sha256, sha384, sha512 and sm3-256.
+ policy= specify an arbitrary set of policies. These must
+ be in policymaker format with each separate
+ policy line newline terminated.
"keyctl print" returns an ascii hex copy of the sealed key, which is in standard
TPM_STORED_DATA format. The key length for new keys are always in bytes.
@@ -162,6 +165,19 @@ zeros (the value of PCR 16)::
$ dd if=/dev/zero bs=1 count=20 2>/dev/null|sha1sum
6768033e216468247bd031a0a2d9876d79818f8f
+You can also specify arbitrary policy in policymaker format, so a two
+value policy (the pcr example above and authvalue) would look like
+this in policymaker format::
+
+ 0000017F000000010004030000016768033e216468247bd031a0a2d9876d79818f8f
+ 0000016b
+
+This can be placed in a file (say policy.txt) and then added to the key as::
+
+ $ keyctl add trusted kmk "new 32 keyhandle=0x81000001 hash=sha1 policy=`cat policy.txt`" @u
+
+The newlines in the file policy.txt will be automatically processed.
+
Reseal a trusted key under new pcr values::
$ keyctl update 268728824 "update pcrinfo=`cat pcr.blob`"
diff --git a/security/keys/trusted-keys/tpm2-policy.c b/security/keys/trusted-keys/tpm2-policy.c
index ae83636ece37..4f8549219055 100644
--- a/security/keys/trusted-keys/tpm2-policy.c
+++ b/security/keys/trusted-keys/tpm2-policy.c
@@ -342,3 +342,49 @@ int tpm2_get_policy_session(struct tpm_chip *chip, struct tpm2_policies *pols,
}
return 0;
}
+
+int tpm2_parse_policies(struct tpm2_policies **ppols, char *str)
+{
+ struct tpm2_policies *pols;
+ char *p;
+ u8 *ptr;
+ int i = 0, left = PAGE_SIZE, res;
+
+ pols = kmalloc(left, GFP_KERNEL);
+ if (!pols)
+ return -ENOMEM;
+
+ ptr = (u8 *)(pols + 1);
+ left -= ptr - (u8 *)pols;
+
+ while ((p = strsep(&str, "\n"))) {
+ if (*p == '\0' || *p == '\n')
+ continue;
+ pols->len[i] = strlen(p)/2;
+ if (pols->len[i] > left) {
+ res = -E2BIG;
+ goto err;
+ }
+ res = hex2bin(ptr, p, pols->len[i]);
+ if (res)
+ goto err;
+ /* get command code and skip past */
+ pols->code[i] = get_unaligned_be32(ptr);
+ pols->policies[i] = ptr + 4;
+ ptr += pols->len[i];
+ left -= pols->len[i];
+ pols->len[i] -= 4;
+ /*
+ * FIXME: this does leave the code embedded in dead
+ * regions of the memory, but it's easier than
+ * hexdumping to a temporary or copying over
+ */
+ i++;
+ }
+ pols->count = i;
+ *ppols = pols;
+ return 0;
+ err:
+ kfree(pols);
+ return res;
+}
diff --git a/security/keys/trusted-keys/tpm2-policy.h b/security/keys/trusted-keys/tpm2-policy.h
index 152c948743f3..cb804a544ced 100644
--- a/security/keys/trusted-keys/tpm2-policy.h
+++ b/security/keys/trusted-keys/tpm2-policy.h
@@ -28,3 +28,4 @@ int tpm2_generate_policy_digest(struct tpm2_policies *pols, u32 hash,
int tpm2_encode_policy(struct tpm2_policies *pols, u8 **data, u32 *len);
int tpm2_get_policy_session(struct tpm_chip *chip, struct tpm2_policies *pols,
u32 *handle);
+int tpm2_parse_policies(struct tpm2_policies **ppols, char *str);
diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c
index 6290e611b632..ba05c75c3170 100644
--- a/security/keys/trusted-keys/trusted_tpm1.c
+++ b/security/keys/trusted-keys/trusted_tpm1.c
@@ -29,6 +29,8 @@
#include <keys/trusted_tpm.h>
+#include "tpm2-policy.h"
+
static const char hmac_alg[] = "hmac(sha1)";
static const char hash_alg[] = "sha1";
static struct tpm_chip *chip;
@@ -706,7 +708,7 @@ enum {
Opt_new, Opt_load, Opt_update,
Opt_keyhandle, Opt_keyauth, Opt_blobauth,
Opt_pcrinfo, Opt_pcrlock, Opt_migratable,
- Opt_hash,
+ Opt_hash, Opt_policy,
};
static const match_table_t key_tokens = {
@@ -720,6 +722,7 @@ static const match_table_t key_tokens = {
{Opt_pcrlock, "pcrlock=%s"},
{Opt_migratable, "migratable=%s"},
{Opt_hash, "hash=%s"},
+ {Opt_policy, "policy=%s"},
{Opt_err, NULL}
};
@@ -809,6 +812,15 @@ static int getoptions(char *c, struct trusted_key_payload *pay,
return -EINVAL;
}
break;
+ case Opt_policy:
+ if (pay->policies)
+ return -EINVAL;
+ if (!tpm2)
+ return -EINVAL;
+ res = tpm2_parse_policies(&pay->policies, args[0].from);
+ if (res)
+ return res;
+ break;
default:
return -EINVAL;
}
--
2.16.4
next prev parent reply other threads:[~2019-12-08 5:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-08 5:06 [PATCH 0/8] Fix TPM 2.0 trusted keys James Bottomley
2019-12-08 5:07 ` [PATCH 1/8] security: keys: trusted: flush the key handle after use James Bottomley
2019-12-09 8:31 ` David Woodhouse
2019-12-09 15:38 ` James Bottomley
2019-12-08 5:08 ` [PATCH 2/8] lib: add asn.1 encoder James Bottomley
2019-12-09 8:50 ` David Woodhouse
2019-12-09 15:46 ` James Bottomley
2019-12-09 22:05 ` Matthew Garrett
2019-12-09 22:43 ` James Bottomley
2019-12-08 5:09 ` [PATCH 3/8] oid_registry: Add TCG defined OIDS for TPM keys James Bottomley
2019-12-09 8:55 ` David Woodhouse
2019-12-09 16:21 ` James Bottomley
2020-06-19 20:45 ` Wiseman, Monty (GE Research, US)
2020-06-19 22:50 ` Jerry Snitselaar
2020-06-20 15:36 ` James Bottomley
2020-06-23 1:17 ` Jarkko Sakkinen
2019-12-08 5:10 ` [PATCH 4/8] security: keys: trusted: use ASN.1 tpm2 key format for the blobs James Bottomley
2019-12-09 10:04 ` David Woodhouse
2019-12-09 16:31 ` James Bottomley
2019-12-08 5:11 ` [PATCH 5/8] security: keys: trusted: Make sealed key properly interoperable James Bottomley
2019-12-09 10:09 ` David Woodhouse
2019-12-09 17:23 ` James Bottomley
2019-12-08 5:12 ` [PATCH 6/8] security: keys: trusted: add PCR policy to TPM2 keys James Bottomley
2019-12-09 10:18 ` David Woodhouse
2019-12-09 18:03 ` James Bottomley
2019-12-09 18:44 ` David Woodhouse
2019-12-09 19:11 ` James Bottomley
2019-12-25 17:08 ` Ken Goldman
2019-12-08 5:13 ` James Bottomley [this message]
2019-12-08 5:14 ` [PATCH 8/8] security: keys: trusted: implement counter/timer policy James Bottomley
2019-12-09 20:20 ` [PATCH 0/8] Fix TPM 2.0 trusted keys Jarkko Sakkinen
2019-12-09 20:57 ` James Bottomley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575782000.14069.17.camel@HansenPartnership.com \
--to=james.bottomley@hansenpartnership.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-integrity@vger.kernel.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).