Commit 0fda5ccf authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'rxrpc-miscellaneous-fixes' 

David Howells says:

====================
rxrpc: Miscellaneous fixes

Here are some miscellaneous fixes for rxrpc:

 (1) Fix assertion failure due to preallocation collision.

 (2) Fix oops due to prealloc backlog struct not yet having been allocated
     if no service calls have yet been preallocated.
====================

Link: https://patch.msgid.link/20250708211506.2699012-1-dhowells@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ee48b0ab 880a88f3

net/rxrpc/call_accept.c

+4 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static int rxrpc_service_prealloc_one(struct rxrpc_sock *rx, 


id_in_use:

	write_unlock(&rx->call_lock);

	rxrpc_prefail_call(call, RXRPC_CALL_LOCAL_ERROR, -EBADSLT);

	rxrpc_cleanup_call(call);

	_leave(" = -EBADSLT");

	return -EBADSLT;
@@ -254,6 +255,9 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx, 
	unsigned short call_tail, conn_tail, peer_tail;

	unsigned short call_count, conn_count;



	if (!b)

		return NULL;



	/* #calls >= #conns >= #peers must hold true. */

	call_head = smp_load_acquire(&b->call_backlog_head);

	call_tail = b->call_backlog_tail;