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 /fs/nfs | |
| parent | 9b242610514fe387ef957bce05e1fdd3efd60359 (diff) | |
| download | linux-a58946c158a040068e7c94dc1d58bbd273258068.tar.gz linux-a58946c158a040068e7c94dc1d58bbd273258068.tar.bz2 linux-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 'fs/nfs')
| -rw-r--r-- | fs/nfs/dns_resolve.c | 3 | ||||
| -rw-r--r-- | fs/nfs/nfs4idmap.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c index e6a700f01452..aec769a500a1 100644 --- a/fs/nfs/dns_resolve.c +++ b/fs/nfs/dns_resolve.c @@ -22,7 +22,8 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen, char *ip_addr = NULL; int ip_len; - ip_len = dns_query(NULL, name, namelen, NULL, &ip_addr, NULL, false); + ip_len = dns_query(net, NULL, name, namelen, NULL, &ip_addr, NULL, + false); if (ip_len > 0) ret = rpc_pton(net, ip_addr, ip_len, sa, salen); else diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c index 4884fdae28fb..1e7296395d71 100644 --- a/fs/nfs/nfs4idmap.c +++ b/fs/nfs/nfs4idmap.c @@ -291,7 +291,7 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen, if (IS_ERR(rkey)) { mutex_lock(&idmap->idmap_mutex); rkey = request_key_with_auxdata(&key_type_id_resolver_legacy, - desc, "", 0, idmap); + desc, NULL, "", 0, idmap); mutex_unlock(&idmap->idmap_mutex); } if (!IS_ERR(rkey)) |