AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-29 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

hurd mmap: Reduce the requested max vmprot

Browse Source 
When the memory object is read-only, the kernel would be right in
refusing max vmprot containing VM_PROT_WRITE.

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Sergey Bugaev 2021-08-11 18:34:53 +02:00 committed by Samuel Thibault
parent 08fc6df294
commit 5a5358b749
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sysdeps/mach/hurd/mmap.c
View File

@ -34,7 +34,7 @@ void *
__mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
{ {
error_t err; error_t err;
vm_prot_t vmprot; vm_prot_t vmprot, max_vmprot;
memory_object_t memobj; memory_object_t memobj;
vm_address_t mapaddr; vm_address_t mapaddr;
boolean_t copy; boolean_t copy;
@ -62,6 +62,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
case MAP_ANON: case MAP_ANON:
memobj = MACH_PORT_NULL; memobj = MACH_PORT_NULL;
max_vmprot = VM_PROT_ALL;
break; break;
case MAP_FILE: case MAP_FILE:
@ -84,16 +85,23 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
anonymous or not when selecting addresses. */ anonymous or not when selecting addresses. */
case PROT_NONE: case PROT_NONE:
case PROT_READ: case PROT_READ:
max_vmprot = VM_PROT_READ|VM_PROT_EXECUTE;
if (wobj == robj)
max_vmprot |= VM_PROT_WRITE;
memobj = robj; memobj = robj;
if (wobj != MACH_PORT_NULL) if (wobj != MACH_PORT_NULL)
__mach_port_deallocate (__mach_task_self (), wobj); __mach_port_deallocate (__mach_task_self (), wobj);
break; break;
case PROT_WRITE: case PROT_WRITE:
max_vmprot = VM_PROT_WRITE;
if (robj == wobj)
max_vmprot |= VM_PROT_READ|VM_PROT_EXECUTE;
memobj = wobj; memobj = wobj;
if (robj != MACH_PORT_NULL) if (robj != MACH_PORT_NULL)
__mach_port_deallocate (__mach_task_self (), robj); __mach_port_deallocate (__mach_task_self (), robj);
break; break;
case PROT_READ|PROT_WRITE: case PROT_READ|PROT_WRITE:
max_vmprot = VM_PROT_ALL;
if (robj == wobj) if (robj == wobj)
{ {
memobj = wobj; memobj = wobj;
@ -122,11 +130,14 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
/* XXX handle MAP_INHERIT */ /* XXX handle MAP_INHERIT */
if (copy)
max_vmprot = VM_PROT_ALL;
err = __vm_map (__mach_task_self (), err = __vm_map (__mach_task_self (),
&mapaddr, (vm_size_t) len, (vm_address_t) 0, &mapaddr, (vm_size_t) len, (vm_address_t) 0,
mapaddr == 0, mapaddr == 0,
memobj, (vm_offset_t) offset, memobj, (vm_offset_t) offset,
copy, vmprot, VM_PROT_ALL, copy, vmprot, max_vmprot,
copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE);
if (flags & MAP_FIXED) if (flags & MAP_FIXED)
@ -140,7 +151,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
err = __vm_map (__mach_task_self (), err = __vm_map (__mach_task_self (),
&mapaddr, (vm_size_t) len, (vm_address_t) 0, &mapaddr, (vm_size_t) len, (vm_address_t) 0,
0, memobj, (vm_offset_t) offset, 0, memobj, (vm_offset_t) offset,
copy, vmprot, VM_PROT_ALL, copy, vmprot, max_vmprot,
copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE);
} }
} }
@ -150,13 +161,16 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
err = __vm_map (__mach_task_self (), err = __vm_map (__mach_task_self (),
&mapaddr, (vm_size_t) len, (vm_address_t) 0, &mapaddr, (vm_size_t) len, (vm_address_t) 0,
1, memobj, (vm_offset_t) offset, 1, memobj, (vm_offset_t) offset,
copy, vmprot, VM_PROT_ALL, copy, vmprot, max_vmprot,
copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE); copy ? VM_INHERIT_COPY : VM_INHERIT_SHARE);
} }
if (memobj != MACH_PORT_NULL) if (memobj != MACH_PORT_NULL)
__mach_port_deallocate (__mach_task_self (), memobj); __mach_port_deallocate (__mach_task_self (), memobj);
if (err == KERN_PROTECTION_FAILURE)
err = EACCES;
if (err) if (err)
return (void *) (long int) __hurd_fail (err); return (void *) (long int) __hurd_fail (err);