Re: [PATCH 1/1] scsi: ufs: core: Fix error handler encryption support

[Bart Van Assche <bvanassche@acm.org>]

On 12/7/25 6:52 PM, Po-Wen Kao wrote:
> From: Brian Kao <powenkao@google.com>
> 
> The UFS driver utilizes block layer crypto fields, such as
> rq->crypt_keyslot and rq->crypt_ctx, to configure hardware for inline
> encryption. However, the SCSI error handler (EH) reuses the
> Protocol Data Unit (PDU) from the original failing request when issuing
> EH commands (e.g., TEST UNIT READY, START STOP UNIT).
> 
> This can lead to issues if the original request of reused PDU contains
> stale cryptographic configurations, which are not applicable for
> the simple EH commands. These commands should not involve data
> encryption.
> 
> This patch fixes this by checking if the command was submitted by the
> SCSI error handler. If so, it bypasses the cryptographic setup for
> the request, ensuring UTRDs are not inadvertently
> configured with potentially incorrect encryption parameters.
> 
> Signed-off-by: Brian Kao <powenkao@google.com>
> ---
>   drivers/ufs/core/ufshcd-crypto.h | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/ufs/core/ufshcd-crypto.h b/drivers/ufs/core/ufshcd-crypto.h
> index c148a5194378..26a0699c8412 100644
> --- a/drivers/ufs/core/ufshcd-crypto.h
> +++ b/drivers/ufs/core/ufshcd-crypto.h
> @@ -16,7 +16,12 @@
>   static inline void ufshcd_prepare_lrbp_crypto(struct request *rq,
>   					      struct ufshcd_lrb *lrbp)
>   {
> -	if (!rq || !rq->crypt_keyslot) {
> +	/*
> +	 * Do not use the crypto settings if the SCSI error handler has replaced
> +	 * the SCSI command
> +	 */
> +	if (!rq || !rq->crypt_keyslot ||
> +	    unlikely(lrbp->cmd->submitter == SUBMITTED_BY_SCSI_ERROR_HANDLER)) {
>   		lrbp->crypto_key_slot = -1;
>   		return;
>   	}

(+Christoph Hellwig and Eric Biggers)

Cc: stable@vger.kernel.org
Reviewed-by: Bart Van Assche <bvanassche@acm.org>