From nobody Fri May 9 00:34:08 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 4ZtqkS6R2lz5vqGM; Fri, 09 May 2025 00:34:08 +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 4ZtqkS4bnxz3HRh; Fri, 09 May 2025 00:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746750848; 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=AW2/bzHZA921PzEMxIlrEOaoI1DundTbP9GXkrORfEs=; b=M3vQQXc5LdBLsj9AtMOS/YGcACSFep7QNh9+ZCb3kuiqrlu2wtxCGyol1JfjGFUbnj8CCL SkOUkPb+u5xche8MI4FMB2MLZRNadtPV4Ny9tUi3AwvWwPXSo2nR13BL+5yqFYS6NayPlI BZFX+W5NTg9AmbwaRjwMlVKBycrWjK1WM1EVPgn1oRIMCZI9TpT+M7QSZoXKgx7q3erNk+ qrhS9DLku+KUqJNvHtOqvfVehYDD480Y3MVFcMllvGr2z7isfeH5egELQHTiaTMu/vCjFE v3E55/3wcFI+g27mmbgx/PGBdIGmJF1sbt3N23Q7/z1+3mOI3mfiFSE72dUdpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746750848; 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=AW2/bzHZA921PzEMxIlrEOaoI1DundTbP9GXkrORfEs=; b=K0CVhR+1WXTtXH2gfzDHSHwnDS4w7+lF38r0zVfJVo6M0d2NCL+Uc0IXy3CKq3qJXaUAx1 LBMSMkuwlSwgeTOHsJmmZ8wPPknEhG8+6trtuP6TvuYA3N3eM02pVJxjr687W6WJsliLCO d/b0+yEIXKUMmxiC4v0WGKeiSO4boA42wKQmUuOxG+QMqpbWfaGKq2CmpELnzAYH/sDLKa vH+Q34l6CSmJGAAE2cL8TAEcZUTM3v6PovKK9TjDkUa+uE40tEm7fYiizCVxfgccbLhJ4r 2cIVYd4RWuoCL5dJ67XBVV5U+V/eSnNxEjd5cUMlycQWeWgVEfU7ZNEFkJiPVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746750848; a=rsa-sha256; cv=none; b=Jr9P0BCFMTWoxlOIOvVGQdA8RHMLkc9T/UVMspP0i7tF6NPJK4ypLbf/z9lglBUytw0Ac/ 3CXY7Kuopy65f8m1J4VZVnpBW/pbEQvTpNMyRYlVoZQNaiWLhnHjKUB/PXcgs46OvAEyI5 RXjixTqgLkUfK2WNLImTAsowaHE/a6bsrcKqn7A4Bw7YlcXen1wOxrGDV0/ivhqqVk+ur5 oJwUX1IBbQcTlTYpQS4fYkuknCRepqgseNUcUhTpWD0V1dz+64iehLVZMxtl88e7Dsq1hF gjzPnGyEW5CYVRXB8lg+qQyuwfjblfppiYxcx0hrCp3eYDq9L+1rW1bjcnh/Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZtqkS46thzdw9; Fri, 09 May 2025 00:34:08 +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 5490Y8n8029886; Fri, 9 May 2025 00:34:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5490Y8OH029883; Fri, 9 May 2025 00:34:08 GMT (envelope-from git) Date: Fri, 9 May 2025 00:34:08 GMT Message-Id: <202505090034.5490Y8OH029883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 04421fda140b - main - 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/main X-Git-Reftype: branch X-Git-Commit: 04421fda140b92eb0d22bc4c0f81b6de05f21225 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04421fda140b92eb0d22bc4c0f81b6de05f21225 commit 04421fda140b92eb0d22bc4c0f81b6de05f21225 Author: Mark Johnston AuthorDate: 2025-05-09 00:16:53 +0000 Commit: Mark Johnston CommitDate: 2025-05-09 00:29:15 +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 --- 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 ddaf1cec5b45..6761b7c815ad 100644 --- a/sys/kgssapi/krb5/kcrypto_aes.c +++ b/sys/kgssapi/krb5/kcrypto_aes.c @@ -116,19 +116,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); } @@ -164,11 +169,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); } @@ -334,11 +340,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); }