aboutsummaryrefslogtreecommitdiff
path: root/net/rxrpc/rxkad.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2020-05-25 08:55:12 +0200
committerGreg Kroah-Hartman2020-05-25 08:55:12 +0200
commitf7d8f3f092d001f8d91552d2697643e727694942 (patch)
tree0dfa61cc5b94eef94dfbaf1efdc362385792d0f2 /net/rxrpc/rxkad.c
parent2cd38fd15e4ebcfe917a443734820269f8b5ba2b (diff)
parent9cb1fd0efd195590b828b9b865421ad345a4a145 (diff)
Merge 5.7-rc7 into driver-core-next
We need the driver core fixes in here as well Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/rxrpc/rxkad.c')
-rw-r--r--net/rxrpc/rxkad.c3
1 files changed, 1 insertions, 2 deletions
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