summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-09-21 19:21:51 +0300
committerWilly Tarreau <w@1wt.eu>2015-12-06 00:49:17 +0100
commit34066c1f9684e9e09d56a7942268197c99e62b60 (patch)
tree8f38f4d36101e78541cf63bd11eacd0019889bf7
parentcdd3e5db7efee3fc1382baf2f8c0e1cb32e9a45c (diff)
devres: fix a for loop bounds check
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: Ben Hutchings <ben@decadent.org.uk> (cherry picked from commit e7102453150c7081a27744989374c474d2ebea8e) Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--lib/devres.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/devres.c b/lib/devres.c
index 72c8909006da..e4891d5103a5 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -338,7 +338,7 @@ void pcim_iounmap_regions(struct pci_dev *pdev, u16 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;