diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-14 03:57:09 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-14 03:57:09 +0300 |
| commit | eea89e13a9c61d3928223d2f9bf2295e22e0efb6 (patch) | |
| tree | f6b2cc514071d276a287eb666333667b6ee67c4f /lib | |
| parent | d9b2b2a277219d4812311d995054ce4f95067725 (diff) | |
| download | linux-eea89e13a9c61d3928223d2f9bf2295e22e0efb6.tar.xz | |
[LMB]: Fix bug in __lmb_alloc_base().
We need to check lmb_add_region() for errors, it can run out
of regions etc.
Also, the size needs to be padded to the given alignment
or else the lmb.reserved regions don't get expanded and
instead we get tons of holes and eventually run out of
regions prematurely.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lmb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/lmb.c b/lib/lmb.c index 98078b4ec20e..6390d63a2a0e 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -245,6 +245,11 @@ static unsigned long lmb_align_down(unsigned long addr, unsigned long size) return addr & ~(size - 1); } +static unsigned long lmb_align_up(unsigned long addr, unsigned long size) +{ + return (addr + (size - 1)) & ~(size - 1); +} + unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr) { @@ -281,7 +286,8 @@ unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align, if (i < 0) return 0; - lmb_add_region(&lmb.reserved, base, size); + if (lmb_add_region(&lmb.reserved, base, lmb_align_up(size, align)) < 0) + return 0; return base; } |