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

Commit 298bc15b authored by David Howells's avatar David Howells
Browse files

rxrpc: Only take the rwind and mtu values from latest ACK 



Move the out-of-order and duplicate ACK packet check to before the call to
rxrpc_input_ackinfo() so that the receive window size and MTU size are only
checked in the latest ACK packet and don't regress.

Fixes: 248f219c ("rxrpc: Rewrite the data and ack handling code")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent dfe99522

net/rxrpc/input.c

+10 −9
Original line number Diff line number Diff line
@@ -868,6 +868,16 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb, 
				  rxrpc_propose_ack_respond_to_ack);

	}



	/* Discard any out-of-order or duplicate ACKs. */

	if (before_eq(sp->hdr.serial, call->acks_latest)) {

		_debug("discard ACK %d <= %d",

		       sp->hdr.serial, call->acks_latest);

		return;

	}

	call->acks_latest_ts = skb->tstamp;

	call->acks_latest = sp->hdr.serial;



	/* Parse rwind and mtu sizes if provided. */

	ioffset = offset + nr_acks + 3;

	if (skb->len >= ioffset + sizeof(buf.info)) {

		if (skb_copy_bits(skb, ioffset, &buf.info, sizeof(buf.info)) < 0)
@@ -889,15 +899,6 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb, 
		return;

	}



	/* Discard any out-of-order or duplicate ACKs. */

	if (before_eq(sp->hdr.serial, call->acks_latest)) {

		_debug("discard ACK %d <= %d",

		       sp->hdr.serial, call->acks_latest);

		return;

	}

	call->acks_latest_ts = skb->tstamp;

	call->acks_latest = sp->hdr.serial;



	if (before(hard_ack, call->tx_hard_ack) ||

	    after(hard_ack, call->tx_top))

		return rxrpc_proto_abort("AKW", call, 0);