BSD Commit Log Search

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>

Merge branch 'freebsd/current/main' into hardened/current/master

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

Merge branch 'freebsd/current/main' into hardened/current/master

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

Reviewed by: glebius
Approved by: glebius (mentor)
Differential Revision: https://reviews.freebsd.org/D52980

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)

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

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

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

(cherry picked from commit 77c5f29453ed3dbb4ba1a372329ab32ec27c998d)

libsys: add pdrfork_thread() on x86

(cherry picked from commit 74a2bf1b7a7ff0c872499cb94df24713f61c872c)

Add pdrfork to OpenBSM

PR:             292739

(cherry picked from commit 6253212608b4f513b1e298f11a630d9d0596560d)

posix_spawn: use rfork_thread on all arches

(cherry picked from commit 4daf2d3e7db53a113108f9a02ceaf5051d416184)

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

(cherry picked from commit c1be185e3fb9afd6743683a8f5a43b9c364ab529)

posix_spawnattr_getexecfd_np.3: add closing .Fc

(cherry picked from commit 2a5b083c1f7e0a4518bd944241af1d1102997c4d)

libc: add posix_spawnattr_{get,set}procdescp_np

(cherry picked from commit 080d8ed7dd29ba537ce4cca286ed3369aca61ef5)

libc: document posix_spawnattr_getexecfd_np(3)

(cherry picked from commit 58580dc0c694b107ba7ba1b14dc8ee8f306e53f6)

Regen for the fork and exit/wait exterror category addition

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

(cherry picked from commit 09984871d8caff9263b955a94bb9fb5354af1b4c)

Regen sysents for addition of pdrfork and pdwait

sys: Add cap_pdwait_rights

(cherry picked from commit aa72df78d799b06552dc3d4d8926e0199ae4faba)

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

(cherry picked from commit 3f0aea09689f6c10740de78011469355208a19a5)

kern/kern_exit.c: extract wait6_check_alive() helper

(cherry picked from commit 7fe33d58a82680fcb75de7deea5a071998830b35)

lib/libsys, lib/libc: export pdwait

(cherry picked from commit 2d555ec85a716e016be587b2a1606ca69267f870)

audit: handle AUE_PDWAIT

(cherry picked from commit a560abedfb4f9626d5193c235822fbf7b1e7b390)

rights.4: document CAP_PDWAIT

(cherry picked from commit ec8e8fa6014addf90f00a9b945570ff0cd18d768)

Document pdrfork(2) and pdwait(2)

(cherry picked from commit f7b56887cc0725fbe15730dbe062a092d0955058)

Add pdwait(2)

(cherry picked from commit 4d707825bf62ee73a32b615846eff9c4a9bda538)

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

(cherry picked from commit 2b67cfa39d8367a021d165681a1e7f54c6020470)

sys: add pdrfork(2)

(cherry picked from commit 5c2ee618d5ec21f110c4da40e9f17833b2ab8b76)

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

(cherry picked from commit 7211cd2cce746972af2d60d4b5bf0c087f016731)