Commit a8662bcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents dd9db3bf 12e0b15b

drivers/crypto/inside-secure/eip93/eip93-hash.c

+2 −1
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static int eip93_send_hash_req(struct crypto_async_request *async, u8 *data, 
	}



again:

	scoped_guard(spinlock_irqsave, &eip93->ring->write_lock)

		ret = eip93_put_descriptor(eip93, &cdesc);

	if (ret) {

		usleep_range(EIP93_RING_BUSY_DELAY,