keys: Fix dependency loop between construction record and auth key
authorDavid Howells <dhowells@redhat.com>
Thu, 14 Feb 2019 16:20:25 +0000 (16:20 +0000)
committerJames Morris <james.morris@microsoft.com>
Fri, 15 Feb 2019 22:12:09 +0000 (14:12 -0800)
commit822ad64d7e46a8e2c8b8a796738d7b657cbb146d
tree1a90686fb8e972e8d202500ab3d53196ec29cd16
parentbb2ba2d75a2d673e76ddaf13a9bd30d6a8b1bb08
keys: Fix dependency loop between construction record and auth key

In the request_key() upcall mechanism there's a dependency loop by which if
a key type driver overrides the ->request_key hook and the userspace side
manages to lose the authorisation key, the auth key and the internal
construction record (struct key_construction) can keep each other pinned.

Fix this by the following changes:

 (1) Killing off the construction record and using the auth key instead.

 (2) Including the operation name in the auth key payload and making the
     payload available outside of security/keys/.

 (3) The ->request_key hook is given the authkey instead of the cons
     record and operation name.

Changes (2) and (3) allow the auth key to naturally be cleaned up if the
keyring it is in is destroyed or cleared or the auth key is unlinked.

Fixes: 7ee02a316600 ("keys: Fix dependency loop between construction record and auth key")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
fs/nfs/nfs4idmap.c
include/keys/request_key_auth-type.h [new file with mode: 0644]
include/linux/key-type.h
security/keys/internal.h
security/keys/keyctl.c
security/keys/process_keys.c
security/keys/request_key.c
security/keys/request_key_auth.c