Skip to content

Commit

Permalink
Merge tag 'rxrpc-fixes-20200523-v2' of git://git.kernel.org/pub/scm/l…
Browse files Browse the repository at this point in the history
…inux/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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed May 22, 2020
2 parents 5a73015 + f45d01f commit d04322a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion fs/afs/fs_probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions net/rxrpc/rxkad.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -1230,7 +1230,6 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,

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
Expand Down

0 comments on commit d04322a

Please sign in to comment.