HardenedBSD/src cc7957dlib/libc/gen posix_spawn.c, share/man/man5 src.conf.5

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-13share/man/man5/src.conf.5
+0-9sys/kern/imgact_elf.c
+1-5lib/libc/gen/posix_spawn.c
+0-5share/mk/src.libnames.mk
+0-5share/mk/src.opts.mk
+0-3sys/kern/kern_fork.c
+2-406 files

HardenedBSD/src 54473b9sys/dev/e1000 if_em.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1sys/dev/e1000/if_em.c
+1-11 files

HardenedBSD/src e63ee5fsys/dev/e1000 if_em.c

e1000: Fix setting the promiscuous mode

The variable reg_rctl stores the value read from reg E1000_RCTL. It
may contain bits E1000_RCTL_VFE and E1000_RCTL_CFIEN which control
VLAN hardware filter feature. The promiscuous mode implies all tagged
or untagged packets should be accepted, so the VLAN hardware filter
feature should be disabled when enabling the promiscuous mode.
Calling em_if_vlan_filter_disable() did the task, but later writing
the value of reg_rctl back to the reg E1000_RCTL may restore the
feature.

Move the calling of em_if_vlan_filter_disable() after writing the reg
to fix that.

PR:             292759
Reviewed by:    kbowling
Tested by:      vova at zote.me
Fixes:          2796f7cab107 e1000: Fix up HW vlan ops
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54973
DeltaFile
+1-1sys/dev/e1000/if_em.c
+1-11 files

HardenedBSD/src 5501ebblib/libc/string bcmp.3, release/scripts pkgbase-stage.lua

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+107-75sys/dev/hwpmc/hwpmc_amd.c
+29-30sys/dev/hwpmc/hwpmc_amd.h
+9-1lib/libc/string/bcmp.3
+8-0sys/dev/ichiic/ig4_pci.c
+3-0release/scripts/pkgbase-stage.lua
+156-1065 files

HardenedBSD/src 6d37c3dlib/libc/string bcmp.3

bcmp(3): update manpage to following the Posix Standard

Reviewed by: glebius
Approved by: glebius (mentor)
Differential Revision: https://reviews.freebsd.org/D52980
DeltaFile
+9-1lib/libc/string/bcmp.3
+9-11 files

HardenedBSD/src 4ddc6e9crypto/openssl FREEBSD-upgrade.md FREEBSD-upgrade, lib/libc/gen posix_spawn.c

Merge remote-tracking branch 'origin/freebsd/15-stable/main' into hardened/15-stable/main

Conflicts:
        lib/libc/gen/posix_spawn.c (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.libnames.mk (unresolved)
        share/mk/src.opts.mk (unresolved)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/kern/imgact_elf.c (unresolved)
        sys/kern/kern_fork.c (unresolved)
DeltaFile
+278-127sys/kern/kern_exit.c
+202-0crypto/openssl/FREEBSD-upgrade.md
+0-122crypto/openssl/FREEBSD-upgrade
+88-21lib/libc/gen/posix_spawn.c
+101-0lib/libsys/i386/pdrfork_thread.S
+71-26sys/kern/kern_fork.c
+740-296179 files not shown
+1,935-735185 files

HardenedBSD/src 49d75d9release/scripts pkgbase-stage.lua

pkgbase-stage.lua: Add '*-jail-dbg' variant to dvd1

- Add *-jail-dbg variant to dvd1 to match the non-jail variant;
- Remove assertion introduced in the previous commit for consistency with existing code.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1991
DeltaFile
+2-2release/scripts/pkgbase-stage.lua
+2-21 files

HardenedBSD/src 638fb31release/scripts pkgbase-stage.lua

pkgbase-stage.lua: Add *-jail metapackages to the offline repo

Having *-jail metapackage variants on the installation media allows convenient offline jail creation.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1991
DeltaFile
+3-0release/scripts/pkgbase-stage.lua
+3-01 files

HardenedBSD/src 4d8e4b6lib/libc/gen posix_spawnattr_getprocdescp_np.3 posix_spawn.3

libc: document posix_spawnattr_{get,set}procdescp_np(3)

(cherry picked from commit 77c5f29453ed3dbb4ba1a372329ab32ec27c998d)
DeltaFile
+94-0lib/libc/gen/posix_spawnattr_getprocdescp_np.3
+2-0lib/libc/gen/posix_spawn.3
+2-0lib/libc/gen/Makefile.inc
+98-03 files

HardenedBSD/src c5fc8e4lib/libsys/amd64 pdrfork_thread.S Symbol.sys.map, lib/libsys/i386 pdrfork_thread.S Symbol.sys.map

libsys: add pdrfork_thread() on x86

(cherry picked from commit 74a2bf1b7a7ff0c872499cb94df24713f61c872c)
DeltaFile
+101-0lib/libsys/i386/pdrfork_thread.S
+83-0lib/libsys/amd64/pdrfork_thread.S
+4-0lib/libsys/amd64/Symbol.sys.map
+4-0lib/libsys/i386/Symbol.sys.map
+2-1lib/libsys/amd64/Makefile.sys
+1-1lib/libsys/i386/Makefile.sys
+195-21 files not shown
+196-27 files

HardenedBSD/src 4aead2acontrib/openbsm/etc audit_event, contrib/openbsm/sys/bsm audit_kevents.h

Add pdrfork to OpenBSM

PR:             292739

(cherry picked from commit 6253212608b4f513b1e298f11a630d9d0596560d)
DeltaFile
+1-0contrib/openbsm/sys/bsm/audit_kevents.h
+1-0contrib/openbsm/etc/audit_event
+2-02 files

HardenedBSD/src 70c5553lib/libc/gen posix_spawn.c

posix_spawn: use rfork_thread on all arches

(cherry picked from commit 4daf2d3e7db53a113108f9a02ceaf5051d416184)
DeltaFile
+18-21lib/libc/gen/posix_spawn.c
+18-211 files

HardenedBSD/src 124f70elib/libsys rfork_thread_gen.c pdrfork_thread_gen.c, lib/libsys/amd64 Symbol.sys.map

libsys, libc: provide rfork_thread() and pdrfork_thread() on all arches

(cherry picked from commit c1be185e3fb9afd6743683a8f5a43b9c364ab529)
DeltaFile
+40-0lib/libsys/rfork_thread_gen.c
+34-0lib/libsys/pdrfork_thread_gen.c
+0-5lib/libsys/i386/Symbol.sys.map
+0-5lib/libsys/amd64/Symbol.sys.map
+2-0lib/libsys/riscv/Makefile.sys
+2-0lib/libsys/arm/Makefile.sys
+78-104 files not shown
+86-1010 files

HardenedBSD/src f7bcd63lib/libc/gen posix_spawnattr_getexecfd_np.3

posix_spawnattr_getexecfd_np.3: add closing .Fc

(cherry picked from commit 2a5b083c1f7e0a4518bd944241af1d1102997c4d)
DeltaFile
+1-0lib/libc/gen/posix_spawnattr_getexecfd_np.3
+1-01 files

HardenedBSD/src f68ddd0include spawn.h, lib/libc/gen posix_spawn.c Symbol.map

libc: add posix_spawnattr_{get,set}procdescp_np

(cherry picked from commit 080d8ed7dd29ba537ce4cca286ed3369aca61ef5)
DeltaFile
+49-5lib/libc/gen/posix_spawn.c
+4-0include/spawn.h
+2-0lib/libc/gen/Symbol.map
+55-53 files

HardenedBSD/src ad6a63blib/libc/gen posix_spawnattr_getexecfd_np.3 posix_spawn.3

libc: document posix_spawnattr_getexecfd_np(3)

(cherry picked from commit 58580dc0c694b107ba7ba1b14dc8ee8f306e53f6)
DeltaFile
+86-0lib/libc/gen/posix_spawnattr_getexecfd_np.3
+2-0lib/libc/gen/posix_spawn.3
+2-0lib/libc/gen/Makefile.inc
+90-03 files

HardenedBSD/src 5b61a13lib/libc/gen exterr_cat_filenames.h

Regen for the fork and exit/wait exterror category addition
DeltaFile
+2-0lib/libc/gen/exterr_cat_filenames.h
+2-01 files

HardenedBSD/src d4d2033sys/kern kern_exit.c sys_procdesc.c

procdesc: postpone freeing the zombie' pid until procdesc is freed

(cherry picked from commit 09984871d8caff9263b955a94bb9fb5354af1b4c)
DeltaFile
+2-2sys/kern/kern_exit.c
+4-0sys/kern/sys_procdesc.c
+6-22 files

HardenedBSD/src 892a09elib/libsys _libsys.h, sys/compat/freebsd32 freebsd32_systrace_args.c freebsd32_proto.h

Regen sysents for addition of pdrfork and pdwait
DeltaFile
+68-0sys/kern/systrace_args.c
+68-0sys/compat/freebsd32/freebsd32_systrace_args.c
+16-0sys/sys/sysproto.h
+9-0sys/compat/freebsd32/freebsd32_proto.h
+3-1sys/compat/freebsd32/freebsd32_syscall.h
+4-0lib/libsys/_libsys.h
+168-17 files not shown
+190-313 files

HardenedBSD/src ab3f893sys/kern subr_capability.c, sys/sys caprights.h

sys: Add cap_pdwait_rights

(cherry picked from commit aa72df78d799b06552dc3d4d8926e0199ae4faba)
DeltaFile
+1-0sys/sys/caprights.h
+1-0sys/kern/subr_capability.c
+2-02 files

HardenedBSD/src 6b9e7e9include spawn.h, lib/libc/gen posix_spawn.c Symbol.map

libc: add posix_spawnattr_{get,set}execfd_np(3)

(cherry picked from commit 3f0aea09689f6c10740de78011469355208a19a5)
DeltaFile
+21-1lib/libc/gen/posix_spawn.c
+7-0include/spawn.h
+5-0lib/libc/gen/Symbol.map
+33-13 files

HardenedBSD/src 85a4344sys/kern kern_exit.c

kern/kern_exit.c: extract wait6_check_alive() helper

(cherry picked from commit 7fe33d58a82680fcb75de7deea5a071998830b35)
DeltaFile
+59-37sys/kern/kern_exit.c
+59-371 files

HardenedBSD/src 6820fe9lib/libc/include libc_private.h, lib/libc/sys pdwait.c Symbol.map

lib/libsys, lib/libc: export pdwait

(cherry picked from commit 2d555ec85a716e016be587b2a1606ca69267f870)
DeltaFile
+20-0lib/libc/sys/pdwait.c
+15-0lib/libthr/thread/thr_syscalls.c
+4-0sys/sys/procdesc.h
+4-0lib/libc/sys/Symbol.map
+1-0lib/libsys/interposing_table.c
+1-0lib/libc/include/libc_private.h
+45-01 files not shown
+46-07 files

HardenedBSD/src 79f19b0sys/security/audit audit_bsm.c

audit: handle AUE_PDWAIT

(cherry picked from commit a560abedfb4f9626d5193c235822fbf7b1e7b390)
DeltaFile
+10-0sys/security/audit/audit_bsm.c
+10-01 files

HardenedBSD/src 6b89954share/man/man4 rights.4

rights.4: document CAP_PDWAIT

(cherry picked from commit ec8e8fa6014addf90f00a9b945570ff0cd18d768)
DeltaFile
+3-0share/man/man4/rights.4
+3-01 files

HardenedBSD/src 780b7f9lib/libsys pdfork.2 Makefile.sys

Document pdrfork(2) and pdwait(2)

(cherry picked from commit f7b56887cc0725fbe15730dbe062a092d0955058)
DeltaFile
+81-8lib/libsys/pdfork.2
+4-2lib/libsys/Makefile.sys
+1-0lib/libsys/rfork.2
+1-0lib/libsys/wait.2
+87-104 files

HardenedBSD/src 758de64sys/compat/freebsd32 freebsd32_misc.c, sys/kern kern_exit.c syscalls.master

Add pdwait(2)

(cherry picked from commit 4d707825bf62ee73a32b615846eff9c4a9bda538)
DeltaFile
+105-0sys/kern/kern_exit.c
+31-0sys/compat/freebsd32/freebsd32_misc.c
+10-0sys/kern/syscalls.master
+4-0sys/kern/sys_procdesc.c
+2-0sys/sys/syscallsubr.h
+152-05 files

HardenedBSD/src 2e5b89csys/kern kern_exit.c

kern/kern_exit.c: extract some helpers from proc_to_reap()

(cherry picked from commit 2b67cfa39d8367a021d165681a1e7f54c6020470)
DeltaFile
+66-50sys/kern/kern_exit.c
+66-501 files

HardenedBSD/src 4ae6f37sys/kern kern_fork.c syscalls.master

sys: add pdrfork(2)

(cherry picked from commit 5c2ee618d5ec21f110c4da40e9f17833b2ab8b76)
DeltaFile
+42-0sys/kern/kern_fork.c
+10-0sys/kern/syscalls.master
+52-02 files

HardenedBSD/src 304d02fsys/kern kern_fork.c, sys/sys exterr_cat.h

kern/kern_fork.c: define the exterror category for fork

(cherry picked from commit 7211cd2cce746972af2d60d4b5bf0c087f016731)
DeltaFile
+18-17sys/kern/kern_fork.c
+1-0sys/sys/exterr_cat.h
+19-172 files