diff options
| author | Doug Moore <dougm@FreeBSD.org> | 2019-08-25 07:06:51 +0000 |
|---|---|---|
| committer | Doug Moore <dougm@FreeBSD.org> | 2019-08-25 07:06:51 +0000 |
| commit | 83ea714f4fca050f863279a5e6e4266d09dcaa93 (patch) | |
| tree | 5bb60e4306df2fdfce7a005df3c3bfafe65fb6bb /sys/security | |
| parent | 33d46a3cef6cee872b502f6ee6c7dbac66f7222b (diff) | |
| download | src-83ea714f4fca050f863279a5e6e4266d09dcaa93.tar.gz src-83ea714f4fca050f863279a5e6e4266d09dcaa93.zip | |
vm_map_simplify_entry considers merging an entry with its two
neighbors, and is used in a way so that if entries a and b cannot be
merged, we consider them twice, first not-merging a with its successor
b, and then not-merging b with its predecessor a. This change replaces
vm_map_simplify_entry with vm_map_try_merge_entries, which compares
two adjacent entries only, and uses it to avoid duplicated
merge-checks.
Tested by: pho
Reviewed by: alc
Approved by: markj (implicit)
Differential Revision: https://reviews.freebsd.org/D20814
Notes
Notes:
svn path=/head/; revision=351476
Diffstat (limited to 'sys/security')
| -rw-r--r-- | sys/security/mac/mac_process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index b0a880707c55..cc2389ac3433 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -363,7 +363,7 @@ mac_proc_vm_revoke_recurse(struct thread *td, struct ucred *cred, } pmap_protect(map->pmap, vme->start, vme->end, vme->protection & ~revokeperms); - vm_map_simplify_entry(map, vme); + vm_map_try_merge_entries(map, vme->prev, vme); } } vm_map_unlock(map); |