From 1159bdce4a53adba09be544cfe87a02bfe0dea21 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sun, 14 Mar 2010 23:56:13 +0100 Subject: [PATCH] * kern/mm.c (grub_real_malloc): Satisfy alignment requirement when extra == 0. --- ChangeLog.memalign_fix | 4 ++++ kern/mm.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ChangeLog.memalign_fix diff --git a/ChangeLog.memalign_fix b/ChangeLog.memalign_fix new file mode 100644 index 000000000..3dac2e51c --- /dev/null +++ b/ChangeLog.memalign_fix @@ -0,0 +1,4 @@ +2010-03-14 Vladimir Serbinenko + + * kern/mm.c (grub_real_malloc): Satisfy alignment requirement when + extra == 0. \ No newline at end of file diff --git a/kern/mm.c b/kern/mm.c index ef97b018e..9720a8b9d 100644 --- a/kern/mm.c +++ b/kern/mm.c @@ -223,7 +223,7 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align) q->next = p->next; p->magic = GRUB_MM_ALLOC_MAGIC; } - else if (extra == 0 || p->size == n + extra) + else if (align == 1 || p->size == n + extra) { /* There might be alignment requirement, when taking it into account memory block fits in. @@ -240,11 +240,25 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align) | alloc, size=n | | +---------------+ v */ + p->size -= n; p += p->size; p->size = n; p->magic = GRUB_MM_ALLOC_MAGIC; } + else if (extra == 0) + { + grub_mm_header_t r; + + p->magic = GRUB_MM_ALLOC_MAGIC; + p->size = n; + + r = p + extra + n; + r->magic = GRUB_MM_FREE_MAGIC; + r->size = p->size - extra - n; + r->next = p->next; + q->next = r; + } else { /* There is alignment requirement and there is room in memory