diff options
| author | David Howells <dhowells@redhat.com> | 2020-09-16 11:12:03 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2020-11-23 18:09:29 +0000 |
| commit | 8eb621698fd4c49703d512fe437d84ab822bc59e (patch) | |
| tree | fd8ed4ababeef92b63bb64fd2e2aee70a9174f62 /security/keys | |
| parent | f9e425e99b0756c1479042afe761073779df2a30 (diff) | |
| download | linux-rpi-8eb621698fd4c49703d512fe437d84ab822bc59e.tar.gz linux-rpi-8eb621698fd4c49703d512fe437d84ab822bc59e.tar.bz2 linux-rpi-8eb621698fd4c49703d512fe437d84ab822bc59e.zip | |
keys: Provide the original description to the key preparser
Provide the proposed description (add key) or the original description
(update/instantiate key) when preparsing a key so that the key type can
validate it against the data.
This is important for rxrpc server keys as we need to check that they have
the right amount of key material present - and it's better to do that when
the key is loaded rather than deep in trying to process a response packet.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
cc: keyrings@vger.kernel.org
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/key.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index e282c6179b21..ebe752b137aa 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -504,6 +504,7 @@ int key_instantiate_and_link(struct key *key, int ret; memset(&prep, 0, sizeof(prep)); + prep.orig_description = key->description; prep.data = data; prep.datalen = datalen; prep.quotalen = key->type->def_datalen; @@ -854,6 +855,7 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref, goto error_put_type; memset(&prep, 0, sizeof(prep)); + prep.orig_description = description; prep.data = payload; prep.datalen = plen; prep.quotalen = index_key.type->def_datalen; |