Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Jorge Ramirez-Ortiz, Foundries" <jorge@foundries.io>
Date:   Wed, 5 Aug 2020 15:34:20 +0200
To:     Jorge Ramirez-Ortiz <jorge@foundries.io>
Cc:     sumit.garg@linaro.org, mpm@selenic.com,
        herbert@gondor.apana.org.au, jens.wiklander@linaro.org,
        arnd@arndb.de, ricardo@foundries.io, mike@foundries.io,
        gregkh@linuxfoundation.org, op-tee@lists.trustedfirmware.org,
        linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCHv2 2/2] hwrng: optee: fix wait use case
Message-ID: <20200805133420.GA8276@trex>
References: <20200723084622.31134-1-jorge@foundries.io>
 <20200723084622.31134-2-jorge@foundries.io>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200723084622.31134-2-jorge@foundries.io>
User-Agent: Mutt/1.9.4 (2018-02-28)
Sender: linux-crypto-owner@vger.kernel.org
Precedence: bulk

On 23/07/20, Jorge Ramirez-Ortiz wrote:
> The current code waits for data to be available before attempting a
> second read. However the second read would not be executed as the
> while loop exits.
> 
> This fix does not wait if all data has been read and reads a second
> time if only partial data was retrieved on the first read.
> 
> This fix also does not attempt to read if not data is requested.
> 
> Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io>
> ---
>  v2: tidy up the while loop to avoid reading when no data is requested
> 
>  drivers/char/hw_random/optee-rng.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/optee-rng.c
> index 5bc4700c4dae..a99d82949981 100644
> --- a/drivers/char/hw_random/optee-rng.c
> +++ b/drivers/char/hw_random/optee-rng.c
> @@ -122,14 +122,14 @@ static int optee_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
>  	if (max > MAX_ENTROPY_REQ_SZ)
>  		max = MAX_ENTROPY_REQ_SZ;
>  
> -	while (read == 0) {
> +	while (read < max) {
>  		rng_size = get_optee_rng_data(pvt_data, data, (max - read));
>  
>  		data += rng_size;
>  		read += rng_size;
>  
>  		if (wait && pvt_data->data_rate) {
> -			if (timeout-- == 0)
> +			if ((timeout-- == 0) || (read == max))
>  				return read;
>  			msleep((1000 * (max - read)) / pvt_data->data_rate);
>  		} else {

any comments please?