ata: libata-core: Reject an invalid concurrent positioning ranges count

ata_dev_config_cpr() takes the number of range descriptors from buf[0]
of the concurrent positioning ranges log (up to 255), which the device
reports independently of the log size in the GPL directory. The count is
then walked at a fixed 32-byte stride in two places with no bound: the
log read here, and the INQUIRY VPD page B9h emitter, which writes one
descriptor per range into the fixed 2048-byte ata_scsi_rbuf. A device
reporting a count larger than its own log overflows the read buffer (up
to 7704 bytes past a 512-byte slab), and a count above 62 overflows the
response buffer on the emit side.

Bound the count once, on probe, against both the log the device returned
and the number of descriptors the VPD B9h response buffer can hold
(ATA_DEV_MAX_CPR, derived from the rbuf size). Reject an out-of-range
count with a warning; this keeps the emitter in bounds with no separate
change there.

Suggested-by: Damien Le Moal <dlemoal@kernel.org>
Fixes: fe22e1c2f705 ("libata: support concurrent positioning ranges log")
Fixes: c745dfc541e7 ("libata: fix reading concurrent positioning ranges log")
Cc: stable@vger.kernel.org
Signed-off-by: Bryam Vargas <hexlabsecurity@proton.me>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index c9a6eade8faf6905a9aa2ea770a850fcd5233e1d..bdc88cf7470927e77c280a5335ed7a5a993e3410 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2847,6 +2847,24 @@ static void ata_dev_config_cpr(struct ata_device *dev)
        if (!nr_cpr)
                goto out;
 
+       /*
+        * The device reports the number of CPR descriptors independently of the
+        * log size, and that count is also used to emit VPD page B9h into the
+        * fixed-size rbuf. Reject a count larger than what that buffer can hold
+        * (ATA_DEV_MAX_CPR) or larger than the log the device actually returned.
+        */
+       if (nr_cpr > ATA_DEV_MAX_CPR) {
+               ata_dev_warn(dev,
+                            "Too many concurrent positioning ranges\n");
+               goto out;
+       }
+
+       if (buf_len < 64 + (size_t)nr_cpr * 32) {
+               ata_dev_warn(dev,
+                            "Invalid number of concurrent positioning ranges\n");
+               goto out;
+       }
+
        cpr_log = kzalloc_flex(*cpr_log, cpr, nr_cpr);
        if (!cpr_log)
                goto out;

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index d54ec1631e9a6325d6bb4ab4af8dc693afc226b1..6e0615f2af5dbb0d774f18bdd4c9ef69e113609b 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -37,8 +37,6 @@
 #include "libata.h"
 #include "libata-transport.h"
 
-#define ATA_SCSI_RBUF_SIZE     2048
-
 static DEFINE_SPINLOCK(ata_scsi_rbuf_lock);
 static u8 ata_scsi_rbuf[ATA_SCSI_RBUF_SIZE];
 

diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 0dd735c2e5b555b407a51f5330c95159f0faa01d..700627596ce11ffad0d6a2ccdfa3cce56fd6a738 100644 (file)
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -149,6 +149,15 @@ static inline bool ata_acpi_dev_manage_restart(struct ata_device *dev) { return
 #endif
 
 /* libata-scsi.c */
+#define ATA_SCSI_RBUF_SIZE     2048
+
+/*
+ * Maximum number of concurrent positioning ranges (CPR) supported. The ACS
+ * specifications allow up to 255, but we limit this to the number of CPR
+ * descriptors that fit in the rbuf buffer used to emit VPD page B9h.
+ */
+#define ATA_DEV_MAX_CPR                min(255, ((ATA_SCSI_RBUF_SIZE - 64) / 32))
+
 extern struct ata_device *ata_scsi_find_dev(struct ata_port *ap,
                                            const struct scsi_device *scsidev);
 extern int ata_scsi_add_hosts(struct ata_host *host,