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

Fix overflow and add more dprintfs

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-03 23:02:18 +02:00
parent cfdcef121f
commit 0cb0344d11
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/relocator.c
View File

@ -201,14 +201,20 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
struct grub_mm_header *foll = NULL; struct grub_mm_header *foll = NULL;
grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb)); grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb));
grub_dprintf ("relocator",
"inreg paddr = 0x%x, size = %d, hb = %p, hbp = %p, rb = %p, vaddr = 0x%x\n",
paddr, size, hb, hbp, rb, vaddr);
if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
<= (grub_addr_t) (hb + hb->size)) <= (grub_addr_t) (hb + hb->size))
{ {
foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN); foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN);
foll->magic = GRUB_MM_FREE_MAGIC; foll->magic = GRUB_MM_FREE_MAGIC;
foll->size = hb->size - (foll - hb); foll->size = hb + hb->size - foll;
} }
grub_dprintf ("relocator", "foll = %p, foll->size = %d\n", foll, foll->size);
if (vaddr - (grub_addr_t) hb >= sizeof (*hb)) if (vaddr - (grub_addr_t) hb >= sizeof (*hb))
{ {
hb->size = ((vaddr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2); hb->size = ((vaddr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);
@ -431,12 +437,16 @@ malloc_in_range (struct grub_relocator *rel,
p = r->first; p = r->first;
do do
{ {
if ((grub_addr_t) p < (grub_addr_t) (r + 1)
|| (grub_addr_t) p >= (grub_addr_t) (r + 1) + r->size)
grub_fatal ("%d: out of range pointer: %p\n", __LINE__, p);
maxevents += 2; maxevents += 2;
p = p->next; p = p->next;
} }
while (p != r->first); while (p != r->first);
maxevents += 4; maxevents += 4;
} }
if (collisioncheck && rel) if (collisioncheck && rel)
{ {
struct grub_relocator_chunk *chunk; struct grub_relocator_chunk *chunk;
@ -617,6 +627,7 @@ malloc_in_range (struct grub_relocator *rel,
eventt = events; eventt = events;
events = t; events = t;
} }
{ {
unsigned i; unsigned i;
for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS); for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
@ -1146,6 +1157,7 @@ malloc_in_range (struct grub_relocator *rel,
res->size = size; res->size = size;
grub_dprintf ("relocator", "allocated: 0x%lx+0x%lx\n", (unsigned long) target, grub_dprintf ("relocator", "allocated: 0x%lx+0x%lx\n", (unsigned long) target,
(unsigned long) size); (unsigned long) size);
return 1; return 1;
} }
@ -1190,7 +1202,6 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel,
|| (target <= chunk->target && chunk->target < target + size)) || (target <= chunk->target && chunk->target < target + size))
return grub_error (GRUB_ERR_BAD_ARGUMENT, "overlap detected"); return grub_error (GRUB_ERR_BAD_ARGUMENT, "overlap detected");
chunk = grub_malloc (sizeof (struct grub_relocator_chunk)); chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
if (!chunk) if (!chunk)
return grub_errno; return grub_errno;