Skip to content

Commit

Permalink
keys: Invalidate used request_key authentication keys
Browse files Browse the repository at this point in the history
Invalidate used request_key authentication keys rather than revoking them
so that they get cleaned up immediately rather than potentially hanging
around.  There doesn't seem any need to keep the revoked keys around.

Signed-off-by: David Howells <dhowells@redhat.com>
  • Loading branch information
David Howells committed Jun 19, 2019
1 parent 504b69e commit a09003b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions security/keys/key.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ static int __key_instantiate_and_link(struct key *key,

/* disable the authorisation key */
if (authkey)
key_revoke(authkey);
key_invalidate(authkey);

if (prep->expiry != TIME64_MAX) {
key->expiry = prep->expiry;
Expand Down Expand Up @@ -616,7 +616,7 @@ int key_reject_and_link(struct key *key,

/* disable the authorisation key */
if (authkey)
key_revoke(authkey);
key_invalidate(authkey);
}

mutex_unlock(&key_construction_mutex);
Expand Down
2 changes: 1 addition & 1 deletion security/keys/request_key.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static int construct_key(struct key *key, const void *callout_info,
/* check that the actor called complete_request_key() prior to
* returning an error */
WARN_ON(ret < 0 &&
!test_bit(KEY_FLAG_REVOKED, &authkey->flags));
!test_bit(KEY_FLAG_INVALIDATED, &authkey->flags));

key_put(authkey);
kleave(" = %d", ret);
Expand Down

0 comments on commit a09003b

Please sign in to comment.