Messages in this thread Patch in this message | | | Date | Sun, 29 Nov 2015 22:47:35 +0100 | From | Willy Tarreau <> | Subject | [PATCH 2.6.32 33/38] [PATCH 33/38] devres: fix a for loop bounds check |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
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> --- lib/devres.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/devres.c b/lib/devres.c index 72c8909..e4891d5 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; -- 1.7.12.2.21.g234cd45.dirty
| |