diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-22 16:43:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-22 16:43:58 -0700 |
| commit | d04322a0da1e86aedaa322ce933cfb8c0191d1eb (patch) | |
| tree | ef99f5b618065716ff017a5ced9f8402721d0737 | |
| parent | 5a730153984dd13f82ffae93d7170d76eba204e9 (diff) | |
| parent | f45d01f4f30b53c3a0a1c6c1c154acb7ff74ab9f (diff) | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | fs/afs/fs_probe.c | 2 | ||||
| -rw-r--r-- | net/rxrpc/rxkad.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c index 237352d3cb53..37d1bba57b00 100644 --- a/fs/afs/fs_probe.c +++ b/fs/afs/fs_probe.c @@ -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; diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index 098f1f9ec53b..52a24d4ef5d8 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -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 |