Commit e6d7eba23b66 for kernel

commit e6d7eba23b666d85cacee0643be280d6ce1ebffc
Author: Damien Le Moal <dlemoal@kernel.org>
Date:   Fri Mar 20 12:48:01 2026 +0900

    ata: libata-scsi: report correct sense field pointer in ata_scsiop_maint_in()

    Commit 4ab7bb976343 ("ata: libata-scsi: Refactor ata_scsiop_maint_in()")
    modified ata_scsiop_maint_in() to directly call
    ata_scsi_set_invalid_field() to set the field pointer of the sense data
    of a failed MAINTENANCE IN command. However, in the case of an invalid
    command format, the sense data field incorrectly indicates byte 1 of
    the CDB. Fix this to indicate byte 2 of the command.

    Reported-by: Guenter Roeck <linux@roeck-us.net>
    Fixes: 4ab7bb976343 ("ata: libata-scsi: Refactor ata_scsiop_maint_in()")
    Cc: stable@vger.kernel.org
    Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
    Signed-off-by: Niklas Cassel <cassel@kernel.org>

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index ad798e5246b4..3b65df914ebb 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3600,7 +3600,7 @@ static unsigned int ata_scsiop_maint_in(struct ata_device *dev,

 	if (cdb[2] != 1 && cdb[2] != 3) {
 		ata_dev_warn(dev, "invalid command format %d\n", cdb[2]);
-		ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);
+		ata_scsi_set_invalid_field(dev, cmd, 2, 0xff);
 		return 0;
 	}