]> git.ipfire.org Git - thirdparty/linux.git/commit
scsi: core: Fix error handler encryption support
authorBrian Kao <powenkao@google.com>
Thu, 18 Dec 2025 03:17:23 +0000 (03:17 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sun, 4 Jan 2026 20:16:20 +0000 (15:16 -0500)
commit9a49157deeb23581fc5c8189b486340d7343264a
tree11027b7ae5bd4ee653f2e92c9d1d03695da418e7
parent1523d50abad0ef8a261a5c38099b462629941156
scsi: core: Fix error handler encryption support

Some low-level drivers (LLD) access block layer crypto fields, such as
rq->crypt_keyslot and rq->crypt_ctx within `struct request`, to
configure hardware for inline encryption.  However, SCSI Error Handling
(EH) commands (e.g., TEST UNIT READY, START STOP UNIT) should not
involve any encryption setup.

To prevent drivers from erroneously applying crypto settings during EH,
this patch saves the original values of rq->crypt_keyslot and
rq->crypt_ctx before an EH command is prepared via scsi_eh_prep_cmnd().
These fields in the 'struct request' are then set to NULL.  The original
values are restored in scsi_eh_restore_cmnd() after the EH command
completes.

This ensures that the block layer crypto context does not leak into EH
command execution.

Signed-off-by: Brian Kao <powenkao@google.com>
Link: https://patch.msgid.link/20251218031726.2642834-1-powenkao@google.com
Cc: stable@vger.kernel.org
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_error.c
include/scsi/scsi_eh.h