Skip to content

Commit d04322a

Browse files
committed
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 <[email protected]>
2 parents 5a73015 + f45d01f commit d04322a

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

fs/afs/fs_probe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void afs_fileserver_probe_result(struct afs_call *call)
3232
struct afs_server *server = call->server;
3333
unsigned int server_index = call->server_index;
3434
unsigned int index = call->addr_ix;
35-
unsigned int rtt_us;
35+
unsigned int rtt_us = 0;
3636
bool have_result = false;
3737
int ret = call->error;
3838

net/rxrpc/rxkad.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,
11481148
ret = rxkad_decrypt_ticket(conn, skb, ticket, ticket_len, &session_key,
11491149
&expiry, _abort_code);
11501150
if (ret < 0)
1151-
goto temporary_error_free_resp;
1151+
goto temporary_error_free_ticket;
11521152

11531153
/* use the session key from inside the ticket to decrypt the
11541154
* response */
@@ -1230,7 +1230,6 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,
12301230

12311231
temporary_error_free_ticket:
12321232
kfree(ticket);
1233-
temporary_error_free_resp:
12341233
kfree(response);
12351234
temporary_error:
12361235
/* Ignore the response packet if we got a temporary error such as

0 commit comments

Comments
 (0)