vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/kern/mm.c (grub_free): Fix agglomerating of free regions.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-23 00:39:10 +02:00
parent 3988c4a09f
commit 0f92dca7ef
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-06-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/mm.c (grub_free): Fix agglomerating of free regions.
2012-06-22 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-22 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/mm.c (get_header_from_pointer): Put a more informative * grub-core/kern/mm.c (get_header_from_pointer): Put a more informative

34
grub-core/kern/mm.c
View file

@ -371,7 +371,7 @@ grub_free (void *ptr)
} }
else else
{ {
grub_mm_header_t q; grub_mm_header_t q, s;
#if 0 #if 0
q = r->first; q = r->first;
@ -384,12 +384,12 @@ grub_free (void *ptr)
while (q != r->first); while (q != r->first);
#endif #endif
for (q = r->first; q >= p || q->next <= p; q = q->next) for (s = r->first, q = s->next; q <= p || q->next >= p; s = q, q = s->next)
{ {
if (q->magic != GRUB_MM_FREE_MAGIC) if (q->magic != GRUB_MM_FREE_MAGIC)
grub_fatal ("free magic is broken at %p: 0x%x", q, q->magic); grub_fatal ("free magic is broken at %p: 0x%x", q, q->magic);
if (q >= q->next && (q < p || q->next > p)) if (q <= q->next && (q > p || q->next < p))
break; break;
} }
@ -397,21 +397,25 @@ grub_free (void *ptr)
p->next = q->next; p->next = q->next;
q->next = p; q->next = p;
if (p + p->size == p->next) if (p->next + p->next->size == p)
{
if (p->next == q)
q = p;
p->next->magic = 0;
p->size += p->next->size;
p->next = p->next->next;
}
if (q + q->size == p)
{ {
p->magic = 0; p->magic = 0;
q->size += p->size;
p->next->size += p->size;
q->next = p->next; q->next = p->next;
p = p->next;
}
r->first = q;
if (q == p + p->size)
{
q->magic = 0;
p->size += q->size;
if (q == s)
s = p;
s->next = p;
q = s;
} }
r->first = q; r->first = q;