From nobody Sun Jun 1 19:54:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNH0Yzcz5y5wY; Sun, 01 Jun 2025 19:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNG0Jc3z3sws; Sun, 01 Jun 2025 19:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f8+1Gw+y07NDcVHcDcWsBo0sqSxqu0ez+8SHYxmdnh0=; b=fWpFQNT3R95IGgR/EVEdGHh8bQpDEslE+AnSndcLF/Y2CxmGyMExfQL3bRjGovo6RIKI1F 3QRPR0mJdOMNNwi0qqsUAOIWQKVsQ3M/EPczGyo2BOSyOXjwMts0miisC5TOgv2R10xkHR D27FPrUzlLThUMwxFQ16UHfvFIUvKR5bIV5ZntjMFy8oyNZG46OQDe4pFbUMCeKHxRQrRP UA6P5XfMj8Qs5vl5GIwqOd1f6i4qjw0nK/t8CvgqT5H/IXPWOeso4ktE7JXLqLenmi9WPs 0G+54AeOHVk/LbQsWNlWbWUOhYROHgxe9BXRIFmtcLkLWN6E1g8guW3cqmr0Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f8+1Gw+y07NDcVHcDcWsBo0sqSxqu0ez+8SHYxmdnh0=; b=fScGIW4X3M51apxH0CGGo3RMsHN4sIOZIwMGTIlmq2KYW9Pf8b8JfNHwfEwdC/6n3YBgwH tFPKj7MubWWWdY3xy6TDXVUTce9WlcOvkFfv9RnsvKvI5UboT+cnjnKbspkDjDLbsnwinP +fuxer9MuM48kRl3H4+IKoqjKUPmqdPmIQn33Xp47nHi6Lz6wgMZZLz2Dq5Mz9BVZD6X4N wA084lrfzPT11xfK6CFg+cxFvodHZxUvq5wvVwv36MRxb8zbbzuGEv3PUqFxoBtRwIioiC at9v/1jFTe6sXATBHx3YHA9lH3vYjTc5z05AgWLJAwODLMMCe9/OEyR98A2t8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807646; a=rsa-sha256; cv=none; b=x051ItW5ISdX1ULTocbGfXw0kRkhOvLccg6+FHcJOJyVVfwUgm1OTeNqilWtYxYcnB7dGk Crhs6kX9m7OHldXPfmIw2tKaH44XDSEh2JfGDBVCo+jDYQCPiudHI+8QfEusKe8ttTN/iD 4vBHzkn6tdDusoka5uIisiiIADjNVJ2+ntfq0Oq1R//RufIyeFvIKdEe1CufSmN+uCmKy8 tDCEK1FTEn7aN8jUNx8X/dyQV44mpK6ESRjhg30LwMhQ8vyRNHsn5TsnKLzOG4iS0UDOE+ /9JRNIvDXrb+BSj7uokIM96dUHcvZAMtJdqf2eu/rFhE8MnryrrH67rNg2DMNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNF58FNzdy2; Sun, 01 Jun 2025 19:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 551Js5D9046222; Sun, 1 Jun 2025 19:54:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js5R2046219; Sun, 1 Jun 2025 19:54:05 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:05 GMT Message-Id: <202506011954.551Js5R2046219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cdf6e2d9feec - stable/14 - krb5: Fix handling of transient crypto request failures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cdf6e2d9feec03b0995c54be46d70471c3d69e5f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cdf6e2d9feec03b0995c54be46d70471c3d69e5f commit cdf6e2d9feec03b0995c54be46d70471c3d69e5f Author: Mark Johnston AuthorDate: 2025-05-09 00:16:53 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 krb5: Fix handling of transient crypto request failures - Instead of using CRYPTO_F_DONE to decide whether a request has completed, use a custom protocol of setting crp_opaque = NULL in the callback and checking that instead. CRYPTO_F_DONE is set independent of whether an error occurred, but for transient errors signaled by EAGAIN, we want to simply retry the request. - Clear CRYPTO_F_DONE before retrying the request. - Panic if the request truly failed, as we currently have no way to pass hard errors back up. Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50238 (cherry picked from commit 04421fda140b92eb0d22bc4c0f81b6de05f21225) --- sys/kgssapi/krb5/kcrypto_aes.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/sys/kgssapi/krb5/kcrypto_aes.c b/sys/kgssapi/krb5/kcrypto_aes.c index 39d3ee1aac2b..fa871b695226 100644 --- a/sys/kgssapi/krb5/kcrypto_aes.c +++ b/sys/kgssapi/krb5/kcrypto_aes.c @@ -117,19 +117,24 @@ aes_random_to_key(struct krb5_key_state *ks, const void *in) 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); } @@ -165,11 +170,12 @@ aes_encrypt_1(const struct krb5_key_state *ks, int buftype, void *buf, 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); } @@ -335,11 +341,13 @@ aes_checksum(const struct krb5_key_state *ks, int usage, 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); }