D26811.id78291.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26811.id78291.diff
View Options

	Index: sys/opencrypto/crypto.c
	===================================================================
	--- sys/opencrypto/crypto.c
	+++ sys/opencrypto/crypto.c
	@@ -1539,7 +1539,7 @@
	* match), then skip.
	*/
	cap = crypto_drivers[hid];
	- if (cap->cc_dev == NULL \|\|
	+ if (cap == NULL \|\|
	(cap->cc_flags & match) == 0)
	continue;

	@@ -1879,15 +1879,18 @@

	if (krp->krp_status != 0)
	CRYPTOSTAT_INC(cs_kerrs);
	- CRYPTO_DRIVER_LOCK();
	cap = krp->krp_cap;
	- KASSERT(cap->cc_koperations > 0, ("cc_koperations == 0"));
	- cap->cc_koperations--;
	- if (cap->cc_koperations == 0 && cap->cc_flags & CRYPTOCAP_F_CLEANUP)
	- wakeup(cap);
	- CRYPTO_DRIVER_UNLOCK();
	- krp->krp_cap = NULL;
	- cap_rele(cap);
	+ if (cap != NULL) {
	+ CRYPTO_DRIVER_LOCK();
	+ KASSERT(cap->cc_koperations > 0, ("cc_koperations == 0"));
	+ cap->cc_koperations--;
	+ if (cap->cc_koperations == 0 &&
	+ cap->cc_flags & CRYPTOCAP_F_CLEANUP)
	+ wakeup(cap);
	+ CRYPTO_DRIVER_UNLOCK();
	+ krp->krp_cap = NULL;
	+ cap_rele(cap);
	+ }

	ret_worker = CRYPTO_RETW(0);