]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
rxrpc: Fix Tx ring annotation after initial Tx failure
authorDavid Howells <dhowells@redhat.com>
Fri, 30 Mar 2018 20:04:43 +0000 (21:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 May 2018 05:50:42 +0000 (07:50 +0200)
commit9b7c95ac2e0272b34b26ecc3a6bd9163e92e33c2
tree31f03fef8f5725bf71b367eb77edb406a5bd5462
parent9c38c3ba5310b31196a8c2eca32c9398d723c25d
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: 248f219cb8bc ("rxrpc: Rewrite the data and ack handling code")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/rxrpc/sendmsg.c