Skip to contentSkip to conversation

ata: libata-scsi: check cdb length for VARIABLE_LENGTH_CMD commands

PATCH New Artem Sadovnikov 1 participant 1 message Aug 16, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 ata: libata-scsi: check cdb length for VARIABLE_LENGTH_CMD commands

No upstream commit exists for this commit.

Fuzzing of 5.10 stable branch reports a slab-out-of-bounds error in ata_scsi_pass_thru.

The error is fixed in 5.18 by commit ce70fd9a551a ("scsi: core: Remove the cmd field from struct scsi_request") upstream.
Backporting this commit would require significant changes to the code so it is better to use a simple fix for that particular error.

The problem is that the length of the received SCSI command is not validated if scsi_op == VARIABLE_LENGTH_CMD. It can lead to out-of-bounds reading if the user sends a request with SCSI command of length less than 32.

Found by Linux Verification Center (linuxtesting.org) with Syzkaller.

---

unfortunately, [email protected] wasn't initially mentioned.

 drivers/ata/libata-scsi.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/ata/libata-scsi.c +3 -0
index 36f32fa052df..4397986db053 100644
@@ -3949,6 +3949,9 @@ static unsigned int ata_scsi_var_len_cdb_xlat(struct ata_queued_cmd *qc)
 	const u8 *cdb = scmd->cmnd;
 	const u16 sa = get_unaligned_be16(&cdb[8]);
 
+	if (scmd->cmd_len != 32)
+		return 1;
+
 	/*
 	 * if service action represents a ata pass-thru(32) command,
 	 * then pass it to ata_scsi_pass_thru handler.
Signature · 1 line
2.34.1