mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Antoine Tenart <antoine.tenart@bootlin.com>
To: herbert@gondor.apana.org.au, davem@davemloft.net
Cc: Antoine Tenart <antoine.tenart@bootlin.com>,
	linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	thomas.petazzoni@bootlin.com, maxime.chevallier@bootlin.com,
	gregory.clement@bootlin.com, miquel.raynal@bootlin.com,
	nadavh@marvell.com, igall@marvell.com
Subject: [PATCH 10/14] crypto: inside-secure - fix queued len computation
Date: Mon, 27 May 2019 16:51:02 +0200	[thread overview]
Message-ID: <20190527145106.8693-11-antoine.tenart@bootlin.com> (raw)
In-Reply-To: <20190527145106.8693-1-antoine.tenart@bootlin.com>

This patch fixes the queued len computation, which could theoretically
be wrong if req->len[1] - req->processed[1] > 1. Be future-proof here,
and fix it.

Fixes: b460edb6230a ("crypto: inside-secure - sha512 support")
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
---
 drivers/crypto/inside-secure/safexcel_hash.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index ba0732fd4ed4..a9197d2c5a48 100644
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -50,10 +50,12 @@ struct safexcel_ahash_req {
 
 static inline u64 safexcel_queued_len(struct safexcel_ahash_req *req)
 {
-	if (req->len[1] > req->processed[1])
-		return 0xffffffff - (req->len[0] - req->processed[0]);
+	u64 len, processed;
 
-	return req->len[0] - req->processed[0];
+	len = (0xffffffff * req->len[1]) + req->len[0];
+	processed = (0xffffffff * req->processed[1]) + req->processed[0];
+
+	return len - processed;
 }
 
 static void safexcel_hash_token(struct safexcel_command_desc *cdesc,
-- 
2.21.0


  parent reply	other threads:[~2019-05-27 14:51 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-27 14:50 [PATCH 00/14] crypto: inside-secure - self-test fixes Antoine Tenart
2019-05-27 14:50 ` [PATCH 01/14] crypto: inside-secure - remove empty line Antoine Tenart
2019-05-27 14:50 ` [PATCH 02/14] crypto: inside-secure - move comment Antoine Tenart
2019-05-27 14:50 ` [PATCH 03/14] crypto: inside-secure - fix coding style for a condition Antoine Tenart
2019-05-27 14:50 ` [PATCH 04/14] crypto: inside-secure - remove useless check Antoine Tenart
2019-05-27 14:50 ` [PATCH 05/14] crypto: inside-secure - improve the result error format when displayed Antoine Tenart
2019-05-27 14:50 ` [PATCH 06/14] crypto: inside-secure - change returned error when a descriptor reports an error Antoine Tenart
2019-05-27 14:50 ` [PATCH 07/14] crypto: inside-secure - enable context reuse Antoine Tenart
2019-05-27 14:51 ` [PATCH 08/14] crypto: inside-secure - unify cache reset Antoine Tenart
2019-05-27 14:51 ` [PATCH 09/14] crypto: inside-secure - fix zeroing of the request in ahash_exit_inv Antoine Tenart
2019-05-27 14:51 ` Antoine Tenart [this message]
2019-05-27 14:51 ` [PATCH 11/14] crypto: inside-secure - implement IV retrieval Antoine Tenart
2019-05-27 14:51 ` [PATCH 12/14] crypto: inside-secure - add support for HMAC updates Antoine Tenart
2019-05-27 14:51 ` [PATCH 13/14] crypto: inside-secure - fix use of the SG list Antoine Tenart
2019-05-27 14:51 ` [PATCH 14/14] crypto: inside-secure - do not rely on the hardware last bit for result descriptors Antoine Tenart
2019-06-06  6:50 ` [PATCH 00/14] crypto: inside-secure - self-test fixes Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190527145106.8693-11-antoine.tenart@bootlin.com \
    --to=antoine.tenart@bootlin.com \
    --cc=davem@davemloft.net \
    --cc=gregory.clement@bootlin.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=igall@marvell.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxime.chevallier@bootlin.com \
    --cc=miquel.raynal@bootlin.com \
    --cc=nadavh@marvell.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®