Commit d04322a0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'rxrpc-fixes-20200523-v2' of... 

Merge tag 'rxrpc-fixes-20200523-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs



David Howells says:

====================
rxrpc: Fix a warning and a leak [ver #2]

Here are a couple of fixes for AF_RXRPC:

 (1) Fix an uninitialised variable warning.

 (2) Fix a leak of the ticket on error in rxkad.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a730153 f45d01f4

fs/afs/fs_probe.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ void afs_fileserver_probe_result(struct afs_call *call) 
	struct afs_server *server = call->server;

	unsigned int server_index = call->server_index;

	unsigned int index = call->addr_ix;

	unsigned int rtt_us;

	unsigned int rtt_us = 0;

	bool have_result = false;

	int ret = call->error;

net/rxrpc/rxkad.c

+1 −2
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ static int rxkad_verify_response(struct rxrpc_connection *conn, 
	ret = rxkad_decrypt_ticket(conn, skb, ticket, ticket_len, &session_key,

				   &expiry, _abort_code);

	if (ret < 0)

		goto temporary_error_free_resp;

		goto temporary_error_free_ticket;



	/* use the session key from inside the ticket to decrypt the

	 * response */
@@ -1230,7 +1230,6 @@ protocol_error: 


temporary_error_free_ticket:

	kfree(ticket);

temporary_error_free_resp:

	kfree(response);

temporary_error:

	/* Ignore the response packet if we got a temporary error such as

CRA Git | Maintained and supported by SUSTech CRA and CCSE