[PATCH] rxrpc: call_event: Fix variable overwrite in __rxrpc_propose_ACK

[PATCH] rxrpc: call_event: Fix variable overwrite in __rxrpc_propose_ACK

[Gustavo A. R. Silva]

Value assigned to variable ack_at is overwritten before it can be used.

Fix this by removing the value overwrite as it seems that this is a
leftover code.

Addresses-Coverity-ID: 1462263
Addresses-Coverity-ID: 1462264
Fixes: beb8e5e4f38c ("rxrpc: Express protocol timeouts in terms of RTT")
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
---
 net/rxrpc/call_event.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index bda952f..03074ba 100644
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -123,7 +123,6 @@ static void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
 		else
 			ack_at = expiry;
 
-		ack_at = jiffies + expiry;
 		if (time_before(ack_at, call->ack_at)) {
 			WRITE_ONCE(call->ack_at, ack_at);
 			rxrpc_reduce_call_timer(call, ack_at, now,
-- 
2.7.4

Re: [PATCH] rxrpc: call_event: Fix variable overwrite in __rxrpc_propose_ACK

[David Howells]

Gustavo A. R. Silva <garsilva@embeddedor.com> wrote:

> -		ack_at = jiffies + expiry;

Same issue as with the other patch.  Can you just combine the two please?

David

Re: [PATCH] rxrpc: call_event: Fix variable overwrite in __rxrpc_propose_ACK

[Gustavo A. R. Silva]

Quoting David Howells <dhowells@redhat.com>:

> Gustavo A. R. Silva <garsilva@embeddedor.com> wrote:
>
>> -		ack_at = jiffies + expiry;
>
> Same issue as with the other patch.  Can you just combine the two please?
>

Sure. I'll send a patch shortly.

Thanks
--
Gustavo A. R. Silva