Skip to content

Commit

Permalink
resources: handle overflow when aligning start of available area
Browse files Browse the repository at this point in the history
If tmp.start is near ~0, ALIGN(tmp.start) may overflow, which would
make us think there's more available space than there really is.  We
would likely return something that conflicts with a previous resource,
which would cause a failure when allocate_resource() requests the newly-
allocated region.

Reference: https://bugzilla.redhat.com/show_bug.cgi?id=646027
Reported-by: Fabrice Bellet <fabrice@bellet.info>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Bjorn Helgaas authored and Jesse Barnes committed Oct 26, 2010
1 parent 6909ba1 commit a1862e3
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions kernel/resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,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, alloc;
struct resource tmp = *new, avail, alloc;

tmp.start = root->start;
/*
Expand All @@ -410,14 +410,19 @@ static int find_resource(struct resource *root, struct resource *new,
tmp.end = root->end;

resource_clip(&tmp, min, max);
tmp.start = ALIGN(tmp.start, align);

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;
/* Check for overflow after ALIGN() */
avail = *new;
avail.start = ALIGN(tmp.start, align);
avail.end = tmp.end;
if (avail.start >= tmp.start) {
alloc.start = alignf(alignf_data, &avail, size, align);
alloc.end = alloc.start + size - 1;
if (resource_contains(&avail, &alloc)) {
new->start = alloc.start;
new->end = alloc.end;
return 0;
}
}
if (!this)
break;
Expand Down

0 comments on commit a1862e3

Please sign in to comment.