diff options
| author | David Howells <dhowells@redhat.com> | 2020-09-30 19:52:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-14 10:33:05 +0200 |
| commit | ae1a085b4aacda829f7a469c6d3d9d52e18a5e1d (patch) | |
| tree | 9eca7b8ecc262f0a0c5541abae38584c66cfc108 | |
| parent | 513dd1609c9d094b7863f02f05509db3c78adf20 (diff) | |
| download | linux-ae1a085b4aacda829f7a469c6d3d9d52e18a5e1d.tar.gz linux-ae1a085b4aacda829f7a469c6d3d9d52e18a5e1d.tar.bz2 linux-ae1a085b4aacda829f7a469c6d3d9d52e18a5e1d.zip | |
rxrpc: The server keyring isn't network-namespaced
[ Upstream commit fea99111244bae44e7d82a973744d27ea1567814 ]
The keyring containing the server's tokens isn't network-namespaced, so it
shouldn't be looked up with a network namespace. It is expected to be
owned specifically by the server, so namespacing is unnecessary.
Fixes: a58946c158a0 ("keys: Pass the network namespace into request_key mechanism")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/rxrpc/key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c index 32f46edcf7c6..64cbbd2f1694 100644 --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -941,7 +941,7 @@ int rxrpc_server_keyring(struct rxrpc_sock *rx, char __user *optval, if (IS_ERR(description)) return PTR_ERR(description); - key = request_key_net(&key_type_keyring, description, sock_net(&rx->sk), NULL); + key = request_key(&key_type_keyring, description, NULL); if (IS_ERR(key)) { kfree(description); _leave(" = %ld", PTR_ERR(key)); |