Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 442050 | Differences between
and this patch

Collapse All | Expand All

(-)grub-core/loader/i386/bsd.c (-5 / +5 lines)
Lines 1309-1315 Link Here
1309
      && phdr->p_type != PT_DYNAMIC)
1309
      && phdr->p_type != PT_DYNAMIC)
1310
      return 0;
1310
      return 0;
1311
1311
1312
  paddr = phdr->p_paddr & 0xFFFFFF;
1312
  paddr = phdr->p_paddr & 0xFFFFFFF;
1313
1313
1314
  if (paddr < kern_start)
1314
  if (paddr < kern_start)
1315
    kern_start = paddr;
1315
    kern_start = paddr;
Lines 1333-1339 Link Here
1333
    }
1333
    }
1334
1334
1335
  *do_load = 1;
1335
  *do_load = 1;
1336
  phdr->p_paddr &= 0xFFFFFF;
1336
  phdr->p_paddr &= 0xFFFFFFF;
1337
  paddr = phdr->p_paddr;
1337
  paddr = phdr->p_paddr;
1338
1338
1339
  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
1339
  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
Lines 1351-1357 Link Here
1351
      && phdr->p_type != PT_DYNAMIC)
1351
      && phdr->p_type != PT_DYNAMIC)
1352
    return 0;
1352
    return 0;
1353
1353
1354
  paddr = phdr->p_paddr & 0xffffff;
1354
  paddr = phdr->p_paddr & 0xfffffff;
1355
1355
1356
  if (paddr < kern_start)
1356
  if (paddr < kern_start)
1357
    kern_start = paddr;
1357
    kern_start = paddr;
Lines 1375-1381 Link Here
1375
    }
1375
    }
1376
1376
1377
  *do_load = 1;
1377
  *do_load = 1;
1378
  paddr = phdr->p_paddr & 0xffffff;
1378
  paddr = phdr->p_paddr & 0xfffffff;
1379
1379
1380
  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
1380
  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
1381
1381
Lines 1394-1400 Link Here
1394
    {
1394
    {
1395
      grub_relocator_chunk_t ch;
1395
      grub_relocator_chunk_t ch;
1396
1396
1397
      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
1397
      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFFF;
1398
      err = grub_elf32_phdr_iterate (elf, filename,
1398
      err = grub_elf32_phdr_iterate (elf, filename,
1399
				     grub_bsd_elf32_size_hook, NULL);
1399
				     grub_bsd_elf32_size_hook, NULL);
1400
      if (err)
1400
      if (err)

Return to bug 442050