Skip to contentSkip to conversation

rxrpc: fix rxkad_verify_response()

PATCH Applied Dan Carpenter 3 participants 3 messages Nov 17, 2022 – Nov 18, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rxrpc: fix rxkad_verify_response()

The error handling for if skb_copy_bits() fails was accidentally deleted so the rxkad_decrypt_ticket() function is not called.

Fixes 5d7edbc9231e ("rxrpc: Get rid of the Rx ring")

---
This applies to net-next. It might go throught some kind of an AFS tree judging by the S-o-b tags on the earlier patches? Tracking everyone's trees is really complicated now that I'm dealing with over 300 trees.

 net/rxrpc/rxkad.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
net/rxrpc/rxkad.c +4 -2
index 2706e59bf992..110a5550c0a6 100644
@@ -1165,8 +1165,10 @@ static int rxkad_verify_response(struct rxrpc_connection *conn,
 
 	eproto = tracepoint_string("rxkad_tkt_short");
 	abort_code = RXKADPACKETSHORT;
-	if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header) + sizeof(*response),
-			  ticket, ticket_len) < 0)
+	ret = skb_copy_bits(skb, sizeof(struct rxrpc_wire_header) + sizeof(*response),
+			    ticket, ticket_len);
+	if (ret < 0)
+		goto temporary_error_free_ticket;
 
 	ret = rxkad_decrypt_ticket(conn, server_key, skb, ticket, ticket_len,
 				   &session_key, &expiry, _abort_code);
Signature · 1 line
2.35.1
#2 lore raw
In reply to Dan Carpenter
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:

Quoted 5 lines · On Thu, 17 Nov 2022 10:43:38 +0300 you wrote:

The error handling for if skb_copy_bits() fails was accidentally deleted so the rxkad_decrypt_ticket() function is not called.

Fixes 5d7edbc9231e ("rxrpc: Get rid of the Rx ring")
Quoted 7 lines

---
This applies to net-next. It might go throught some kind of an AFS tree judging by the S-o-b tags on the earlier patches? Tracking everyone's trees is really complicated now that I'm dealing with over 300 trees.

[...]

Here is the summary with links:
- [net-next] rxrpc: fix rxkad_verify_response()

    https://git.kernel.org/netdev/net-next/c/101c1bb6c556

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html