diff options
| author | David Howells <dhowells@redhat.com> | 2022-05-21 10:03:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-05-22 22:30:53 +0200 |
| commit | 81524b6312535897707f2942695da1d359a5e56b (patch) | |
| tree | fcd07bf0d8f48e2e0df44cf25b5ee0368a73ef31 /net/rxrpc/input.c | |
| parent | rxrpc: Fix overlapping ACK accounting (diff) | |
| download | linux-81524b6312535897707f2942695da1d359a5e56b.tar.xz linux-81524b6312535897707f2942695da1d359a5e56b.zip | |
rxrpc: Don't let ack.previousPacket regress
The previousPacket field in the rx ACK packet should never go backwards -
it's now the highest DATA sequence number received, not the last on
received (it used to be used for out of sequence detection).
Fixes: 248f219cb8bc ("rxrpc: Rewrite the data and ack handling code")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/input.c')
| -rw-r--r-- | net/rxrpc/input.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index f11673cda217..2e61545ad8ca 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -453,7 +453,6 @@ static void rxrpc_input_data(struct rxrpc_call *call, struct sk_buff *skb) !rxrpc_receiving_reply(call)) goto unlock; - call->ackr_prev_seq = seq0; hard_ack = READ_ONCE(call->rx_hard_ack); nr_subpackets = sp->nr_subpackets; @@ -534,6 +533,9 @@ static void rxrpc_input_data(struct rxrpc_call *call, struct sk_buff *skb) ack_serial = serial; } + if (after(seq0, call->ackr_highest_seq)) + call->ackr_highest_seq = seq0; + /* Queue the packet. We use a couple of memory barriers here as need * to make sure that rx_top is perceived to be set after the buffer * pointer and that the buffer pointer is set after the annotation and |