Commit 47ea91b4 authored by Ram Pai's avatar Ram Pai Committed by Linus Torvalds

Resource: fix wrong resource window calculation

__find_resource() incorrectly returns a resource window which overlaps
an existing allocated window.  This happens when the parent's
resource-window spans 0x00000000 to 0xffffffff and is entirely allocated
to all its children resource-windows.

__find_resource() looks for gaps in resource allocation among the
children resource windows.  When it encounters the last child window it
blindly tries the range next to one allocated to the last child.  Since
the last child's window ends at 0xffffffff the calculation overflows,
leading the algorithm to believe that any window in the range 0x0000000
to 0xfffffff is available for allocation.  This leads to a conflicting
window allocation.

Michal Ludvig reported this issue seen on his platform.  The following
patch fixes the problem and has been verified by Michal.  I believe this
bug has been there for ages.  It got exposed by git commit 2bbc6942
("PCI : ability to relocate assigned pci-resources")
Signed-off-by: default avatarRam Pai <linuxram@us.ibm.com>
Tested-by: default avatarMichal Ludvig <mludvig@logix.net.nz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 92bb062f
...@@ -419,6 +419,9 @@ static int __find_resource(struct resource *root, struct resource *old, ...@@ -419,6 +419,9 @@ static int __find_resource(struct resource *root, struct resource *old,
else else
tmp.end = root->end; tmp.end = root->end;
if (tmp.end < tmp.start)
goto next;
resource_clip(&tmp, constraint->min, constraint->max); resource_clip(&tmp, constraint->min, constraint->max);
arch_remove_reservations(&tmp); arch_remove_reservations(&tmp);
...@@ -436,8 +439,10 @@ static int __find_resource(struct resource *root, struct resource *old, ...@@ -436,8 +439,10 @@ static int __find_resource(struct resource *root, struct resource *old,
return 0; return 0;
} }
} }
if (!this)
next: if (!this || this->end == root->end)
break; break;
if (this != old) if (this != old)
tmp.start = this->end + 1; tmp.start = this->end + 1;
this = this->sibling; this = this->sibling;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment