Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b00aa56 authored by David Howells's avatar David Howells Committed by Greg Kroah-Hartman
Browse files

rxrpc: Fix server keyring leak 



[ Upstream commit 38b1dc47a35ba14c3f4472138ea56d014c2d609b ]

If someone calls setsockopt() twice to set a server key keyring, the first
keyring is leaked.

Fix it to return an error instead if the server key keyring is already set.

Fixes: 17926a79 ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3995eed6

net/rxrpc/key.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ int rxrpc_request_key(struct rxrpc_sock *rx, char __user *optval, int optlen) 


	_enter("");



	if (optlen <= 0 || optlen > PAGE_SIZE - 1)

	if (optlen <= 0 || optlen > PAGE_SIZE - 1 || rx->securities)

		return -EINVAL;



	description = memdup_user_nul(optval, optlen);