Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 27 Nov 2017 14:36:05 -0600
Message-ID: <20171127143605.Horde.e1mO3GN28r_3LfsfiZdmeqJ@gator4166.hostgator.com>
From:   "Gustavo A. R. Silva" <garsilva@embeddedor.com>
To:     David Howells <dhowells@redhat.com>
Cc:     "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] rxrpc: sendmsg: Fix variable overwrite in
 rxrpc_queue_packet
References: <20171127180207.GA25428@embeddedor.com>
 <17004.1511808959@warthog.procyon.org.uk>
In-Reply-To: <17004.1511808959@warthog.procyon.org.uk>
User-Agent: Horde Application Framework 5
Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes
MIME-Version: 1.0
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi David,

Quoting David Howells <dhowells@redhat.com>:

> Gustavo A. R. Silva <garsilva@embeddedor.com> wrote:
>
>> Value assigned to variable resend_at is overwritten before it can be used.
>>
>> Fix this by removing the value overwrite as it seems that this is a
>> leftover code.
>
> NAK.  Your fix will actually cause the code to break.
>
> The resend_at value used for the timer must be based on the current time
> (ie. jiffies in this case), so we can't simply remove that line as the
> previously calculated resend_at value is a duration, not a time.
>
> What you need to do is to instead modify the line you wanted to remove to add
> 'now' to the previously-computed value.
>

You mean something like the following?

--- a/net/rxrpc/sendmsg.c
+++ b/net/rxrpc/sendmsg.c
@@ -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);


Thanks
--
Gustavo A. R. Silva


From 1585246761033048233@xxx Mon Nov 27 18:58:41 +0000 2017
X-GM-THRID: 1585244557315777648
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread