Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b7c95ac authored by David Howells's avatar David Howells Committed by Greg Kroah-Hartman
Browse files

rxrpc: Fix Tx ring annotation after initial Tx failure 



[ Upstream commit 03877bf6a30cca7d4bc3ffabd3c3e9464a7a1a19 ]

rxrpc calls have a ring of packets that are awaiting ACK or retransmission
and a parallel ring of annotations that tracks the state of those packets.
If the initial transmission of a packet on the underlying UDP socket fails
then the packet annotation is marked for resend - but the setting of this
mark accidentally erases the last-packet mark also stored in the same
annotation slot.  If this happens, a call won't switch out of the Tx phase
when all the packets have been transmitted.

Fix this by retaining the last-packet mark and only altering the packet
state.

Fixes: 248f219c ("rxrpc: Rewrite the data and ack handling code")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c38c3ba

net/rxrpc/sendmsg.c

+3 −1
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ static inline void rxrpc_instant_resend(struct rxrpc_call *call, int ix) 
	spin_lock_bh(&call->lock);



	if (call->state < RXRPC_CALL_COMPLETE) {

		call->rxtx_annotations[ix] = RXRPC_TX_ANNO_RETRANS;

		call->rxtx_annotations[ix] =

			(call->rxtx_annotations[ix] & RXRPC_TX_ANNO_LAST) |

			RXRPC_TX_ANNO_RETRANS;

		if (!test_and_set_bit(RXRPC_CALL_EV_RESEND, &call->events))

			rxrpc_queue_call(call);

	}