From: Damien Le Moal <dlemoal@xxxxxxxxxx>
commit 0e9a2990a93f27daa643b6fa73cfa47b128947a7 upstream.
When the user requests the ALL_SUB_MPAGES mode sense page,
ata_msense_control() adds the CDL_T2A_SUB_MPAGE twice instead of adding
the CDL_T2A_SUB_MPAGE and CDL_T2B_SUB_MPAGE pages information. Correct
the second call to ata_msense_control_spgt2() to report the
CDL_T2B_SUB_MPAGE page.
Fixes: 673b2fe6ff1d ("scsi: ata: libata-scsi: Add support for CDL pages mode sense")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/ata/libata-scsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2356,7 +2356,7 @@ static unsigned int ata_msense_control(s
case ALL_SUB_MPAGES:
n = ata_msense_control_spg0(dev, buf, changeable);
n += ata_msense_control_spgt2(dev, buf + n, CDL_T2A_SUB_MPAGE);
- n += ata_msense_control_spgt2(dev, buf + n, CDL_T2A_SUB_MPAGE);
+ n += ata_msense_control_spgt2(dev, buf + n, CDL_T2B_SUB_MPAGE);
n += ata_msense_control_ata_feature(dev, buf + n);
return n;
default:
Patches currently in stable-queue which might be from dlemoal@xxxxxxxxxx are
queue-6.11/nbd-correct-the-maximum-value-for-discard-sectors.patch
queue-6.11/reset-k210-fix-of-node-leak-in-probe-error-path.patch
queue-6.11/reset-berlin-fix-of-node-leak-in-probe-error-path.patch
queue-6.11/ata-libata-scsi-fix-ata_msense_control-cdl-page-reporting.patch
queue-6.11/ublk-move-zone-report-data-out-of-request-pdu.patch
queue-6.11/ata-libata-clear-did_time_out-for-ata-pt-commands-wi.patch
