Skip to content

Commit

Permalink
rxrpc: The server keyring isn't network-namespaced
Browse files Browse the repository at this point in the history
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: a58946c ("keys: Pass the network namespace into request_key mechanism")
Signed-off-by: David Howells <dhowells@redhat.com>
  • Loading branch information
David Howells committed Oct 5, 2020
1 parent 2d914c1 commit fea9911
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/rxrpc/key.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ int rxrpc_server_keyring(struct rxrpc_sock *rx, sockptr_t optval, int optlen)
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));
Expand Down

0 comments on commit fea9911

Please sign in to comment.