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

Commit 282ef472 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David Howells
Browse files

rxrpc: Fix variable overwrite 

Values assigned to both variable resend_at and ack_at are overwritten
before they can be used.

The correct fix here is to add 'now' to the previously computed value in
resend_at and ack_at.

Addresses-Coverity-ID: 1462262
Addresses-Coverity-ID: 1462263
Addresses-Coverity-ID: 1462264
Fixes: beb8e5e4 ("rxrpc: Express protocol timeouts in terms of RTT")
Link: https://marc.info/?i=17004.1511808959%40warthog.procyon.org.uk


Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 5fc62f6a

net/rxrpc/call_event.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason, 
		else

			ack_at = expiry;



		ack_at = jiffies + expiry;

		ack_at += now;

		if (time_before(ack_at, call->ack_at)) {

			WRITE_ONCE(call->ack_at, ack_at);

			rxrpc_reduce_call_timer(call, ack_at, now,

net/rxrpc/sendmsg.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call, 
		if (resend_at < 1)

			resend_at = 1;



		resend_at = now + rxrpc_resend_timeout;

		resend_at += now;

		WRITE_ONCE(call->resend_at, resend_at);

		rxrpc_reduce_call_timer(call, resend_at, now,

					rxrpc_timer_set_for_send);