Browse Source

HBSD: Resolve merge conflicts

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
remotes/github/hardened/12-stable/master
Shawn Webb 3 months ago
parent
commit
dca9417bfd
2 changed files with 1 additions and 47 deletions
  1. +0
    -43
      lib/libc/sys/procctl.2
  2. +1
    -4
      sys/arm64/arm64/elf_machdep.c

+ 0
- 43
lib/libc/sys/procctl.2 View File

@@ -72,49 +72,6 @@ The control request to perform is specified by the
argument.
The following commands are supported:
.Bl -tag -width PROC_TRAPCAP_STATUS
<<<<<<< HEAD
=======
.It Dv PROC_ASLR_CTL
Controls the Address Space Layout Randomization (ASLR) in the program
images created
by
.Xr execve 2
in the specified process or its descendants that did not changed
the control nor modified it by other means.
The
.Fa data
parameter must point to the integer variable holding one of the following
values:
.Bl -tag -width PROC_ASLR_FORCE_DISABLE
.It Dv PROC_ASLR_FORCE_ENABLE
Request that ASLR is enabled after execution, even if it is disabled
system-wide.
The image flag and set-uid might prevent ASLR enablement still.
.It Dv PROC_ASLR_FORCE_DISABLE
Request that ASLR is disabled after execution.
Same notes as for
.Dv PROC_ASLR_FORCE_ENABLE
apply.
.It Dv PROC_ASLR_NOFORCE
Use system-wide configured policy for ASLR.
.El
.It Dv PROC_ASLR_STATUS
Returns the current status of ASLR enablement for the target process.
The
.Fa data
parameter must point to the integer variable, where one of the
following values is written:
.Bl -tag -width PROC_ASLR_FORCE_DISABLE
.It Dv PROC_ASLR_FORCE_ENABLE
.It Dv PROC_ASLR_FORCE_DISABLE
.It Dv PROC_ASLR_NOFORCE
.El
.Pp
If the currently executed image in the process itself has ASLR enabled,
the
.Dv PROC_ASLR_ACTIVE
flag is or-ed with the value listed above.
>>>>>>> origin/freebsd/12-stable/master
.It Dv PROC_SPROTECT
Set process protection state.
This is used to mark a process as protected from being killed if the system


+ 1
- 4
sys/arm64/arm64/elf_machdep.c View File

@@ -93,11 +93,8 @@ static struct sysentvec elf64_freebsd_sysvec = {
.sv_schedtail = NULL,
.sv_thread_detach = NULL,
.sv_trap = NULL,
<<<<<<< HEAD
.sv_pax_aslr_init = pax_aslr_init_vmspace,
=======
.sv_hwcap = &elf_hwcap,
>>>>>>> origin/freebsd/12-stable/master
.sv_pax_aslr_init = pax_aslr_init_vmspace,
};
INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec);



Loading…
Cancel
Save