The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=9402bb44f137eec9c844210ee8436bfee58ac165

commit 9402bb44f137eec9c844210ee8436bfee58ac165
Author:     Konstantin Belousov <[email protected]>
AuthorDate: 2021-01-12 06:09:59 +0000
Commit:     Konstantin Belousov <[email protected]>
CommitDate: 2021-01-12 06:09:59 +0000

    vmspace_fork: preserve wx settings in the child vm map after fork
    
    Noted by:       markj
    Sponsored by:   The FreeBSD Foundation
---
 sys/vm/vm_map.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index bea776480391..9746d07713d3 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -4303,7 +4303,8 @@ vmspace_fork(struct vmspace *vm1, vm_ooffset_t 
*fork_charge)
        }
 
        new_map->anon_loc = old_map->anon_loc;
-       new_map->flags |= old_map->flags & (MAP_ASLR | MAP_ASLR_IGNSTART);
+       new_map->flags |= old_map->flags & (MAP_ASLR | MAP_ASLR_IGNSTART |
+           MAP_WXORX);
 
        VM_MAP_ENTRY_FOREACH(old_entry, old_map) {
                if ((old_entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to