Page MenuHomeFreeBSD
Files F142569083

D50238.id.diff
No OneTemporary
Actions

D50238.id.diff
View Options

diff --git a/sys/kgssapi/krb5/kcrypto_aes.c b/sys/kgssapi/krb5/kcrypto_aes.c
--- a/sys/kgssapi/krb5/kcrypto_aes.c
+++ b/sys/kgssapi/krb5/kcrypto_aes.c
@@ -116,19 +116,24 @@
static int
aes_crypto_cb(struct cryptop *crp)
{
- int error;
struct aes_state *as = (struct aes_state *) crp->crp_opaque;
- if (CRYPTO_SESS_SYNC(crp->crp_session))
+ if (CRYPTO_SESS_SYNC(crp->crp_session)) {
+ KASSERT(crp->crp_etype == 0,
+ ("%s: callback with error %d", __func__, crp->crp_etype));
return (0);
+ }
- error = crp->crp_etype;
- if (error == EAGAIN)
- error = crypto_dispatch(crp);
- mtx_lock(&as->as_lock);
- if (error || (crp->crp_flags & CRYPTO_F_DONE))
+ if (crp->crp_etype == EAGAIN) {
+ crp->crp_etype = 0;
+ crp->crp_flags &= ~CRYPTO_F_DONE;
+ (void)crypto_dispatch(crp);
+ } else {
+ mtx_lock(&as->as_lock);
+ crp->crp_opaque = NULL;
wakeup(crp);
- mtx_unlock(&as->as_lock);
+ mtx_unlock(&as->as_lock);
+ }
return (0);
}
@@ -164,11 +169,12 @@
if (!CRYPTO_SESS_SYNC(as->as_session_aes)) {
mtx_lock(&as->as_lock);
- if (!error && !(crp->crp_flags & CRYPTO_F_DONE))
+ if (error == 0 && crp->crp_opaque != NULL)
error = msleep(crp, &as->as_lock, 0, "gssaes", 0);
mtx_unlock(&as->as_lock);
}
-
+ if (crp->crp_etype != 0)
+ panic("%s: crypto req failed: %d", __func__, crp->crp_etype);
crypto_freereq(crp);
}
@@ -334,11 +340,13 @@
if (!CRYPTO_SESS_SYNC(as->as_session_sha1)) {
mtx_lock(&as->as_lock);
- if (!error && !(crp->crp_flags & CRYPTO_F_DONE))
+ if (error == 0 && crp->crp_opaque != NULL)
error = msleep(crp, &as->as_lock, 0, "gssaes", 0);
mtx_unlock(&as->as_lock);
}
+ if (crp->crp_etype != 0)
+ panic("%s: crypto req failed: %d", __func__, crp->crp_etype);
crypto_freereq(crp);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 3:03 AM (12 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27787488
Default Alt Text
D50238.id.diff (1 KB)

Event Timeline