A challenge can abort a connection during validation. The caller may then queue the challenge with an extra reference to that connection. If the connection worker sees the abort first, it drops the skb without dropping that reference. Check the connection state again after validation and release the challenge reference when an aborted connection discards a queued challenge. Fixes: 5800b1cf3fd8 ("rxrpc: Allow CHALLENGEs to the passed to the app for a RESPONSE") Assisted-by: Codex:GPT-6 Signed-off-by: Lin Ma --- net/rxrpc/conn_event.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index 98ad9b51ca2c..bdb762b2fc05 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -249,8 +249,16 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, struct rxrpc_skb_priv *sp = rxrpc_skb(skb); int ret; - if (conn->state == RXRPC_CONN_ABORTED) + if (conn->state == RXRPC_CONN_ABORTED) { + /* A challenge queued before the abort still owns a conn ref. */ + if (sp->hdr.type == RXRPC_PACKET_TYPE_CHALLENGE && + sp->chall.conn) { + rxrpc_put_connection(sp->chall.conn, + rxrpc_conn_put_challenge_input); + sp->chall.conn = NULL; + } return -ECONNABORTED; + } _enter("{%d},{%u,%%%u},", conn->debug_id, sp->hdr.type, sp->hdr.serial); @@ -486,6 +494,11 @@ bool rxrpc_input_conn_packet(struct rxrpc_connection *conn, struct sk_buff *skb) } if (!conn->security->validate_challenge(conn, skb)) return false; + if (rxrpc_is_conn_aborted(conn)) { + if (conn->completion == RXRPC_CALL_LOCALLY_ABORTED) + rxrpc_send_conn_abort(conn); + return true; + } return rxrpc_post_challenge(conn, skb); case RXRPC_PACKET_TYPE_RESPONSE: