upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

loader: fix the size of MODINFOMD_MODULEP

Browse source 
The data in MODINFOMD_MODULEP is packed by the loader as a 4 byte type, but
the amd64 kernel expects a vm_paddr_t, which is of size 8 bytes. Fix this by
saving it as 8 bytes in the loader and retrieving it using the proper type
in the kernel.

Sponsored by: Citrix Systems R&D
This commit is contained in:
Roger Pau Monné 2015-01-20 12:28:24 +00:00
parent 84e3f97e6d
commit b829c841ad
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/boot/i386/libi386/bootinfo64.c
View file

@ -185,6 +185,7 @@ bi_load64(char *args, vm_offset_t addr, vm_offset_t *modulep,
struct file_metadata *md;
u_int64_t kernend;
u_int64_t envp;
u_int64_t module;
vm_offset_t size;
char *rootdevname;
int howto;
@ -222,7 +223,7 @@ bi_load64(char *args, vm_offset_t addr, vm_offset_t *modulep,
addr = roundup(addr, PAGE_SIZE);
/* place the metadata before anything */
*modulep = addr;
module = *modulep = addr;
kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
@ -233,7 +234,7 @@ bi_load64(char *args, vm_offset_t addr, vm_offset_t *modulep,
file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);
file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp);
file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend);
file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof modulep, modulep);
file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof module, &module);
if (add_smap != 0)
bios_addsmapdata(kfp);

2
sys/x86/xen/pv.c
View file

@ -402,7 +402,7 @@ xen_pv_parse_preload_data(u_int64_t modulep)
* then calculating the offset with mod_start,
* which contains the relocated modulep address.
*/
metadata = MD_FETCH(kmdp, MODINFOMD_MODULEP, int);
metadata = MD_FETCH(kmdp, MODINFOMD_MODULEP, vm_paddr_t);
off = HYPERVISOR_start_info->mod_start - metadata;
preload_bootstrap_relocate(off);