diff options
| author | alc <alc@FreeBSD.org> | 2012-02-19 00:28:49 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2012-02-19 00:28:49 +0000 |
| commit | d95361325278aa7213cc76aa3ea58d04f13bf305 (patch) | |
| tree | 03026e72cb4540389aff792d468d354830abba32 /sys/kern/sysv_shm.c | |
| parent | 8a17073eef5380f10f392940e6a68bf897224c13 (diff) | |
| download | FreeBSD-src-d95361325278aa7213cc76aa3ea58d04f13bf305.zip FreeBSD-src-d95361325278aa7213cc76aa3ea58d04f13bf305.tar.gz | |
Close a race due to dropping of the map lock between creating a map entry
for a shared mapping and marking the entry for inheritance.
Reviewed by: kib
X-MFC after: r231526
Diffstat (limited to 'sys/kern/sysv_shm.c')
| -rw-r--r-- | sys/kern/sysv_shm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index c717c0d..5c35514 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -413,14 +413,12 @@ kern_shmat(td, shmid, shmaddr, shmflg) vm_object_reference(shmseg->object); rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->object, 0, &attach_va, size, (flags & MAP_FIXED) ? VMFS_NO_SPACE : - VMFS_ANY_SPACE, prot, prot, 0); + VMFS_ANY_SPACE, prot, prot, MAP_INHERIT_SHARE); if (rv != KERN_SUCCESS) { vm_object_deallocate(shmseg->object); error = ENOMEM; goto done2; } - vm_map_inherit(&p->p_vmspace->vm_map, - attach_va, attach_va + size, VM_INHERIT_SHARE); shmmap_s->va = attach_va; shmmap_s->shmid = shmid; |
