crypto: inside-secure/eip93 - acquire lock on eip93_put_descriptor hash

[PATCH] crypto: inside-secure/eip93 - acquire lock on eip93_put_descriptor hash

Posted by Christian Marangi 1 week, 2 days ago

In the EIP93 HASH functions, the eip93_put_descriptor is called without
acquiring lock. This is problematic when multiple thread execute hash
operations.

Correctly acquire ring write lock on calling eip93_put_descriptor to
prevent concurrent access and mess with the ring pointers.

Cc: stable@vger.kernel.org
Fixes: 9739f5f93b78 ("crypto: eip93 - Add Inside Secure SafeXcel EIP-93 crypto engine support")
Reported-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 drivers/crypto/inside-secure/eip93/eip93-hash.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/inside-secure/eip93/eip93-hash.c b/drivers/crypto/inside-secure/eip93/eip93-hash.c
index 5e9627467a42..df1b05ac5a57 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-hash.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-hash.c
@@ -260,7 +260,8 @@ static int eip93_send_hash_req(struct crypto_async_request *async, u8 *data,
 	}
 
 again:
-	ret = eip93_put_descriptor(eip93, &cdesc);
+	scoped_guard(spinlock_irqsave, &eip93->ring->write_lock)
+		ret = eip93_put_descriptor(eip93, &cdesc);
 	if (ret) {
 		usleep_range(EIP93_RING_BUSY_DELAY,
 			     EIP93_RING_BUSY_DELAY * 2);
-- 
2.48.1

Re: [PATCH] crypto: inside-secure/eip93 - acquire lock on eip93_put_descriptor hash

Posted by Herbert Xu 1 week ago

On Tue, Apr 01, 2025 at 01:57:30PM +0200, Christian Marangi wrote:
> In the EIP93 HASH functions, the eip93_put_descriptor is called without
> acquiring lock. This is problematic when multiple thread execute hash
> operations.
> 
> Correctly acquire ring write lock on calling eip93_put_descriptor to
> prevent concurrent access and mess with the ring pointers.
> 
> Cc: stable@vger.kernel.org
> Fixes: 9739f5f93b78 ("crypto: eip93 - Add Inside Secure SafeXcel EIP-93 crypto engine support")
> Reported-by: Herbert Xu <herbert@gondor.apana.org.au>
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> ---
>  drivers/crypto/inside-secure/eip93/eip93-hash.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt