Module Name: src
Committed By: riastradh
Date: Sat May 21 20:37:18 UTC 2022
Modified Files:
src/sys/opencrypto: cryptodev.c
Log Message:
crypto(4): Don't signal the condvar for multi-operation completion.
The condvar may be destroyed by the time we got here, and nothing
waits on it anyway -- instead the caller is expected to select/poll
for completion in userland.
The bug was already here, but the recent change to eliminate
CRYPTO_F_CBIMM made it happen more often by causing the callback to
_always_ be run asynchronously instead of sometimes being run
synchronously.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/opencrypto/cryptodev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.113 src/sys/opencrypto/cryptodev.c:1.114
--- src/sys/opencrypto/cryptodev.c:1.113 Thu May 19 20:51:46 2022
+++ src/sys/opencrypto/cryptodev.c Sat May 21 20:37:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.113 2022/05/19 20:51:46 riastradh Exp $ */
+/* $NetBSD: cryptodev.c,v 1.114 2022/05/21 20:37:18 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.113 2022/05/19 20:51:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.114 2022/05/21 20:37:18 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -746,9 +746,6 @@ cryptodev_mcb(struct cryptop *crp)
error = crypto_dispatch(crp);
mutex_enter(&cryptodev_mtx);
}
- if (error != 0 || (crp->crp_flags & CRYPTO_F_DONE)) {
- cv_signal(&crp->crp_cv);
- }
TAILQ_INSERT_TAIL(&crp->fcrp->crp_ret_mq, crp, crp_next);
selnotify(&crp->fcrp->sinfo, 0, 0);
