diff options
| author |   David Howells <dhowells@redhat.com> | 2019-06-26 21:02:33 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-06-27 23:02:12 +0100 |
| commit | a58946c158a040068e7c94dc1d58bbd273258068 (patch) | |
| tree | e655258b700359cdfd9f762c099b7587dc0eed9b /security/keys/keyring.c | |
| parent | keys: Network namespace domain tag (diff) | |
| download | linux-dev-a58946c158a040068e7c94dc1d58bbd273258068.tar.xz linux-dev-a58946c158a040068e7c94dc1d58bbd273258068.zip | |
keys: Pass the network namespace into request_key mechanism
Create a request_key_net() function and use it to pass the network
namespace domain tag into DNS revolver keys and rxrpc/AFS keys so that keys
for different domains can coexist in the same keyring.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: netdev@vger.kernel.org
cc: linux-nfs@vger.kernel.org
cc: linux-cifs@vger.kernel.org
cc: linux-afs@lists.infradead.org
Diffstat (limited to '')
| -rw-r--r-- | security/keys/keyring.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index bca070f6ab46..29c31585ed61 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -222,10 +222,13 @@ void key_set_index_key(struct keyring_index_key *index_key) memcpy(index_key->desc, index_key->description, n); - if (index_key->type->flags & KEY_TYPE_NET_DOMAIN) - index_key->domain_tag = current->nsproxy->net_ns->key_domain; - else - index_key->domain_tag = &default_domain_tag; + if (!index_key->domain_tag) { + if (index_key->type->flags & KEY_TYPE_NET_DOMAIN) + index_key->domain_tag = current->nsproxy->net_ns->key_domain; + else + index_key->domain_tag = &default_domain_tag; + } + hash_key_type_and_desc(index_key); } |