diff options
| author | royger <royger@FreeBSD.org> | 2015-01-20 12:28:24 +0000 |
|---|---|---|
| committer | royger <royger@FreeBSD.org> | 2015-01-20 12:28:24 +0000 |
| commit | 313e96ad334aae0ab1c78f7cdd21462fd5e91e22 (patch) | |
| tree | db7c7f8e92fd204402e5aa2f2547d77692ce34bd | |
| parent | 827c65e7ef3341ba0cd7906e6e8417b2db035566 (diff) | |
| download | FreeBSD-src-313e96ad334aae0ab1c78f7cdd21462fd5e91e22.zip FreeBSD-src-313e96ad334aae0ab1c78f7cdd21462fd5e91e22.tar.gz | |
loader: fix the size of MODINFOMD_MODULEP
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
| -rw-r--r-- | sys/boot/i386/libi386/bootinfo64.c | 5 | ||||
| -rw-r--r-- | sys/x86/xen/pv.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c index a97ab84..751e806 100644 --- a/sys/boot/i386/libi386/bootinfo64.c +++ b/sys/boot/i386/libi386/bootinfo64.c @@ -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); diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index e8cdca4..233bf3e 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -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); |
