]> git.hungrycats.org Git - linux/commitdiff
libata: array underflow in ata_find_dev()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 19 Jul 2017 10:06:41 +0000 (13:06 +0300)
committerSasha Levin <alexander.levin@verizon.com>
Sun, 10 Sep 2017 20:35:58 +0000 (16:35 -0400)
[ Upstream commit 59a5e266c3f5c1567508888dd61a45b86daed0fa ]

My static checker complains that "devno" can be negative, meaning that
we read before the start of the loop.  I've looked at the code, and I
think the warning is right.  This come from /proc so it's root only or
it would be quite a quite a serious bug.  The call tree looks like this:

proc_scsi_write() <- gets id and channel from simple_strtoul()
-> scsi_add_single_device() <- calls shost->transportt->user_scan()
   -> ata_scsi_user_scan()
      -> ata_find_dev()

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org # all versions at this point
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
drivers/ata/libata-scsi.c

index ae7cfcb562dca9beece61657c4088572ba5db09e..4d4cdade9d7e3e788cad9c74eabea666a7a9b576 100644 (file)
@@ -2834,10 +2834,12 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
 static struct ata_device *ata_find_dev(struct ata_port *ap, int devno)
 {
        if (!sata_pmp_attached(ap)) {
-               if (likely(devno < ata_link_max_devices(&ap->link)))
+               if (likely(devno >= 0 &&
+                          devno < ata_link_max_devices(&ap->link)))
                        return &ap->link.device[devno];
        } else {
-               if (likely(devno < ap->nr_pmp_links))
+               if (likely(devno >= 0 &&
+                          devno < ap->nr_pmp_links))
                        return &ap->pmp_link[devno].device[0];
        }