]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
rxrpc: Fix return from none_validate_challenge()
authorDavid Howells <dhowells@redhat.com>
Tue, 27 May 2025 15:01:43 +0000 (16:01 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 29 May 2025 10:03:21 +0000 (12:03 +0200)
Fix the return value of none_validate_challenge() to be explicitly true
(which indicates the source packet should simply be discarded) rather than
implicitly true (because rxrpc_abort_conn() always returns -EPROTO which
gets converted to true).

Note that this change doesn't change the behaviour of the code (which is
correct by accident) and, in any case, we *shouldn't* get a CHALLENGE
packet to an rxnull connection (ie. no security).

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lists.infradead.org/pipermail/linux-afs/2025-April/009738.html
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Paolo Abeni <pabeni@redhat.com>
cc: Simon Horman <horms@kernel.org>
cc: linux-afs@lists.infradead.org
cc: netdev@vger.kernel.org
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/10720.1748358103@warthog.procyon.org.uk
Fixes: 5800b1cf3fd8 ("rxrpc: Allow CHALLENGEs to the passed to the app for a RESPONSE")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/rxrpc/insecure.c

index 1f7c136d6d0e67454c798d6bc3f9ce47ce3e9523..0a260df45d25ac3e88333d33e5370aa38e3c0156 100644 (file)
@@ -45,8 +45,9 @@ static void none_free_call_crypto(struct rxrpc_call *call)
 static bool none_validate_challenge(struct rxrpc_connection *conn,
                                    struct sk_buff *skb)
 {
-       return rxrpc_abort_conn(conn, skb, RX_PROTOCOL_ERROR, -EPROTO,
-                               rxrpc_eproto_rxnull_challenge);
+       rxrpc_abort_conn(conn, skb, RX_PROTOCOL_ERROR, -EPROTO,
+                        rxrpc_eproto_rxnull_challenge);
+       return true;
 }
 
 static int none_sendmsg_respond_to_challenge(struct sk_buff *challenge,