From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19C1C3537DF; Fri, 24 Apr 2026 13:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777038102; cv=none; b=nTTh+/kLvxLCOCRJ5t45R7Ss58XRa0tdLr+szckOT3csQLVG5GzCYwURFQCwpGxeUTm0LkGae9f+wqQ9CScCmAOnf+O/eHj9ZvkDPAoETvI8kiBL9FeFFGHRr3222rhKeCsPgAAnc+kzawbD+ge2/Q3w1TiFrcwzwRzhbqAn6XA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777038102; c=relaxed/simple; bh=usNrle+4vi2CX5dh45TYJJM2zE/6MRL4J47EbUOsGkY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m56ikeaQe+kZa5FcOTPHwlliA0equYrZ3WnxiRNckRrDys+nI7qWkSwIpW3ASiSwiQMIJJigRG4VlPqBDl2WNrhdnhcyCUOC70s9f6Kk14gBqUH//rpaEo69cFdfEx5gxXBZmIEwkXFyE8j/wYLY19ateeUqUspjXE9JHvrIt4g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WDVCyjdS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WDVCyjdS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4CA2C19425; Fri, 24 Apr 2026 13:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777038102; bh=usNrle+4vi2CX5dh45TYJJM2zE/6MRL4J47EbUOsGkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WDVCyjdSwiVsELXOCN3suyE2aoVrGGNlo1OD8HGh5AcHT+QvgxU/OBPfGceOtJlAf XnRz4JG2PEYPOlM+Qc93vfpcUJ1H0xsoYfegf224/tYk+tB9s96jLJW8Yve1++D1Nj YWwFeaysgLqsFW0sXXNadBUKkIXcSKqFa+cfI6UU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wesley Atwell , Herbert Xu Subject: [PATCH 6.18 05/55] crypto: krb5enc - fix sleepable flag handling in encrypt dispatch Date: Fri, 24 Apr 2026 15:30:44 +0200 Message-ID: <20260424132431.170228159@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424132430.006424517@linuxfoundation.org> References: <20260424132430.006424517@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wesley Atwell commit 2ef3bac16fb5e9eee4fb1d722578a79b751ea58a upstream. krb5enc_encrypt_ahash_done() continues encryption from an ahash completion callback by calling krb5enc_dispatch_encrypt(). That helper takes a flags argument for this continuation path, but it ignored that argument and reused aead_request_flags(req) when setting up the skcipher subrequest callback. This can incorrectly preserve CRYPTO_TFM_REQ_MAY_SLEEP when the encrypt step is started from callback context. Preserve the original request flags but clear CRYPTO_TFM_REQ_MAY_SLEEP for the callback continuation path, and use the caller-supplied flags when setting up the skcipher subrequest. Fixes: d1775a177f7f ("crypto: Add 'krb5enc' hash and cipher AEAD algorithm") Assisted-by: Codex:GPT-5 Signed-off-by: Wesley Atwell Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- crypto/krb5enc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/crypto/krb5enc.c +++ b/crypto/krb5enc.c @@ -154,7 +154,7 @@ static int krb5enc_dispatch_encrypt(stru dst = scatterwalk_ffwd(areq_ctx->dst, req->dst, req->assoclen); skcipher_request_set_tfm(skreq, enc); - skcipher_request_set_callback(skreq, aead_request_flags(req), + skcipher_request_set_callback(skreq, flags, krb5enc_encrypt_done, req); skcipher_request_set_crypt(skreq, src, dst, req->cryptlen, req->iv); @@ -192,7 +192,8 @@ static void krb5enc_encrypt_ahash_done(v krb5enc_insert_checksum(req, ahreq->result); - err = krb5enc_dispatch_encrypt(req, 0); + err = krb5enc_dispatch_encrypt(req, + aead_request_flags(req) & ~CRYPTO_TFM_REQ_MAY_SLEEP); if (err != -EINPROGRESS) aead_request_complete(req, err); }