Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

resources: ensure callback doesn't allocate outside available space

Browse Source 
The alignment callback returns a proposed location, which may have been
adjusted to avoid ISA aliases or for other architecture-specific reasons.

We already had a check ("tmp.start < tmp.end") to make sure the callback
doesn't return an area that extends past the available area.  This patch
reworks the check to make sure it doesn't return an area that extends
either below or above the available area.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2010-10-26 15:41:23 -06:00 committed by Jesse Barnes
parent 5d6b1fa301
commit 6909ba14c2
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/resource.c
View File

@ -374,6 +374,11 @@ static void resource_clip(struct resource *res, resource_size_t min,
res->end = max;
}
static bool resource_contains(struct resource *res1, struct resource *res2)
{
return res1->start <= res2->start && res1->end >= res2->end;
}
/*
* Find empty slot in the resource tree given range and alignment.
*/
@ -387,7 +392,7 @@ static int find_resource(struct resource *root, struct resource *new,
void *alignf_data)
{
struct resource *this = root->child;
struct resource tmp = *new;
struct resource tmp = *new, alloc;
tmp.start = root->start;
/*
@ -407,10 +412,11 @@ static int find_resource(struct resource *root, struct resource *new,
resource_clip(&tmp, min, max);
tmp.start = ALIGN(tmp.start, align);
tmp.start = alignf(alignf_data, &tmp, size, align);
if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) {
new->start = tmp.start;
new->end = tmp.start + size - 1;
alloc.start = alignf(alignf_data, &tmp, size, align);
alloc.end = alloc.start + size - 1;
if (resource_contains(&tmp, &alloc)) {
new->start = alloc.start;
new->end = alloc.end;
return 0;
}
if (!this)