[PATCH net-next] rxrpc: fix rxkad_verify_response()

[PATCH net-next] rxrpc: fix rxkad_verify_response()

[Dan Carpenter]

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")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
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(-)

diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 2706e59bf992..110a5550c0a6 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -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);
-- 
2.35.1

Re: [PATCH net-next] rxrpc: fix rxkad_verify_response()

[David Howells]

Dan Carpenter <error27@gmail.com> 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")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: David Howells <dhowells@redhat.com>

Re: [PATCH net-next] rxrpc: fix rxkad_verify_response()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

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")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> 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!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html