]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
devres: fix a for loop bounds check
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 21 Sep 2015 16:21:51 +0000 (19:21 +0300)
committerZefan Li <lizefan@huawei.com>
Wed, 26 Oct 2016 15:15:23 +0000 (23:15 +0800)
commit 1f35d04a02a652f14566f875aef3a6f2af4cb77b upstream.

The iomap[] array has PCIM_IOMAP_MAX (6) elements and not
DEVICE_COUNT_RESOURCE (16).  This bug was found using a static checker.
It may be that the "if (!(mask & (1 << i)))" check means we never
actually go past the end of the array in real life.

Fixes: ec04b075843d ('iomap: implement pcim_iounmap_regions()')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Zefan Li <lizefan@huawei.com>
lib/devres.c

index 80b9c76d436a0d96b17fae6dd5184d46b83695f5..584c2dcfcb0308f352762487d0d30b85d90cef92 100644 (file)
@@ -390,7 +390,7 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
        if (!iomap)
                return;
 
-       for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+       for (i = 0; i < PCIM_IOMAP_MAX; i++) {
                if (!(mask & (1 << i)))
                        continue;