From b4dedc2d52be5e4b220e70ea840d6bf4ac9b783a Mon Sep 17 00:00:00 2001 From: Alfredo Mazzinghi Date: Wed, 27 Jan 2021 17:51:35 +0000 Subject: [PATCH] purecap-kernel: Use vm_pointer_t for shm_mmap --- sys/kern/uipc_shm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 4e93894c0f4c..6b8356d439be 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1585,7 +1585,7 @@ shm_mmap_large(struct shmfd *shmfd, vm_map_t map, vm_pointer_t *addr, } int -shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, +shm_mmap(struct file *fp, vm_map_t map, vm_pointer_t *addr, vm_offset_t max_addr, vm_size_t objsize, vm_prot_t prot, vm_prot_t cap_maxprot, int flags, vm_ooffset_t foff, struct thread *td) @@ -1748,7 +1748,8 @@ int shm_map(struct file *fp, size_t size, off_t offset, void **memp) { struct shmfd *shmfd; - vm_offset_t kva, ofs; + vm_pointer_t kva; + vm_offset_t ofs; vm_object_t obj; int rv; @@ -2045,10 +2046,13 @@ sys_shm_open2(struct thread *td, struct shm_open2_args *uap) } // CHERI CHANGES START // { -// "updated": 20191022, +// "updated": 20200706, // "target_type": "kernel", // "changes": [ // "user_capabilities" +// ], +// "changes_purecap": [ +// "pointer_as_integer" // ] // } // CHERI CHANGES END