Merge tag 'v6.15-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

torvalds · torvalds · commit a8662bcd2ff1 · 2025-04-04T19:34:38.000-07:00
Pull crypto fix from Herbert Xu:
 "This fixes a race condition in the newly added eip93 driver"

* tag 'v6.15-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: inside-secure/eip93 - acquire lock on eip93_put_descriptor hash
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,8 @@ static int eip93_send_hash_req(struct crypto_async_request async, u8 data,`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`again:`
`263`		`- ret = eip93_put_descriptor(eip93, &cdesc);`
	`263`	`+ scoped_guard(spinlock_irqsave, &eip93->ring->write_lock)`
	`264`	`+ ret = eip93_put_descriptor(eip93, &cdesc);`
`264`	`265`	`if (ret) {`
`265`	`266`	`usleep_range(EIP93_RING_BUSY_DELAY,`
`266`	`267`	`EIP93_RING_BUSY_DELAY * 2);`