Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +86 | -165 | contrib/bmake/job.c |
| +236 | -0 | sys/arm64/rockchip/rk_grf_gpio.c |
| +52 | -52 | usr.bin/bmake/Makefile |
| +43 | -19 | sys/ufs/ffs/ffs_subr.c |
| +27 | -21 | libexec/rtld-elf/rtld.c |
| +44 | -0 | share/man/man4/man4.aarch64/rk_grf_gpio.4 |
| +488 | -257 | 48 files not shown |
| +828 | -399 | 54 files |
Merge branch 'freebsd/current/main' into hardened/current/master
| Delta | File | |
|---|---|---|
| +27 | -21 | libexec/rtld-elf/rtld.c |
| +1 | -0 | .git-blame-ignore-revs |
| +28 | -21 | 2 files |
rtld: fix several style(9) bugs Sponsored by: The FreeBSD Foundation
| Delta | File | |
|---|---|---|
| +27 | -21 | libexec/rtld-elf/rtld.c |
| +27 | -21 | 1 files |
Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +2 | -2 | libexec/rtld-elf/rtld.c |
| +2 | -1 | sys/security/audit/audit.c |
| +1 | -1 | share/man/man4/tty.4 |
| +5 | -4 | 3 files |
rtld: clear any holes in the struct utrace_rtld passed to kernel logger PR: 284563 (cherry picked from commit e917958c36670131ab42e8f2c849b708a3216e37)
| Delta | File | |
|---|---|---|
| +2 | -2 | libexec/rtld-elf/rtld.c |
| +2 | -2 | 1 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +55 | -81 | sys/netlink/netlink_domain.c |
| +41 | -60 | sys/riscv/vmm/vmm_sbi.c |
| +49 | -49 | usr.bin/netstat/main.c |
| +74 | -13 | sys/riscv/vmm/vmm_aplic.c |
| +36 | -39 | usr.sbin/bhyve/riscv/vmexit.c |
| +41 | -31 | sys/netlink/netlink_generic.c |
| +296 | -273 | 26 files not shown |
| +489 | -440 | 32 files |
Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master
Conflicts:
sys/kern/vfs_syscalls.c (unresolved)
| Delta | File | |
|---|---|---|
| +55 | -81 | sys/netlink/netlink_domain.c |
| +41 | -60 | sys/riscv/vmm/vmm_sbi.c |
| +49 | -49 | usr.bin/netstat/main.c |
| +74 | -13 | sys/riscv/vmm/vmm_aplic.c |
| +36 | -39 | usr.sbin/bhyve/riscv/vmexit.c |
| +41 | -31 | sys/netlink/netlink_generic.c |
| +296 | -273 | 26 files not shown |
| +492 | -439 | 32 files |
rtld: clear any holes in the struct utrace_rtld passed to kernel logger This should avoid an (almost) false positive from Valgrind, by filling the padding on LP64. PR: 284563 Reported by: Paul Floyd <pjfloyd at wanadoo.fr> Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48854
| Delta | File | |
|---|---|---|
| +2 | -2 | libexec/rtld-elf/rtld.c |
| +2 | -2 | 1 files |
Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +25 | -4 | sys/kern/kern_sysctl.c |
| +2 | -1 | sys/compat/freebsd32/freebsd32.h |
| +2 | -1 | sys/sys/stat.h |
| +1 | -1 | libexec/rtld-elf/rtld.c |
| +0 | -2 | libexec/rtld-elf/amd64/reloc.c |
| +0 | -2 | libexec/rtld-elf/i386/reloc.c |
| +30 | -11 | 7 files not shown |
| +39 | -11 | 13 files |
rtld-elf/rtld.c: fix typo in comment (cherry picked from commit dd1d72961b8d343b29480b74afcfe4292fd166af)
| Delta | File | |
|---|---|---|
| +1 | -1 | libexec/rtld-elf/rtld.c |
| +1 | -1 | 1 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +5,487 | -2,363 | contrib/spleen/spleen-32x64.bdf |
| +2,899 | -2,834 | libexec/rtld-elf/rtld.c |
| +3,009 | -1,293 | contrib/spleen/spleen-16x32.bdf |
| +2,930 | -0 | sys/dev/usb/net/if_umb.c |
| +1,754 | -742 | contrib/spleen/spleen-8x16.bdf |
| +2,362 | -6 | contrib/spleen/spleen-12x24.bdf |
| +18,441 | -7,238 | 61 files not shown |
| +24,037 | -8,251 | 67 files |
HBSD: Resolve merge conflicts FreeBSD updated the style of the files contained in this commit. This commit updates our changes to match that style. No functional change intended. Signed-off-by: Shawn Webb <shawn.webb at hardenedbsd.org>
| Delta | File | |
|---|---|---|
| +51 | -379 | libexec/rtld-elf/rtld.c |
| +2 | -23 | libexec/rtld-elf/map_object.c |
| +53 | -402 | 2 files |
Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master
Conflicts:
libexec/rtld-elf/map_object.c (unresolved)
libexec/rtld-elf/rtld.c (unresolved)
| Delta | File | |
|---|---|---|
| +5,487 | -2,363 | contrib/spleen/spleen-32x64.bdf |
| +2,899 | -2,506 | libexec/rtld-elf/rtld.c |
| +3,009 | -1,293 | contrib/spleen/spleen-16x32.bdf |
| +2,930 | -0 | sys/dev/usb/net/if_umb.c |
| +1,754 | -742 | contrib/spleen/spleen-8x16.bdf |
| +2,362 | -6 | contrib/spleen/spleen-12x24.bdf |
| +18,441 | -6,910 | 48 files not shown |
| +23,799 | -7,717 | 54 files |
rtld obj_remap_relro(): unindent the loop body Discussed with: emaste, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D48509
| Delta | File | |
|---|---|---|
| +10 | -12 | libexec/rtld-elf/rtld.c |
| +10 | -12 | 1 files |
rtld-elf/rtld.c: apply clang-format Discussed with: emaste, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D48509
| Delta | File | |
|---|---|---|
| +2,847 | -2,775 | libexec/rtld-elf/rtld.c |
| +2,847 | -2,775 | 1 files |
rtld-elf/rtld.c: fix typo in comment Discussed with: emaste, imp Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D48509
| Delta | File | |
|---|---|---|
| +1 | -1 | libexec/rtld-elf/rtld.c |
| +1 | -1 | 1 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +0 | -1,592 | sys/dev/altera/atse/if_atse.c |
| +481 | -447 | contrib/mandoc/roff.c |
| +0 | -882 | sys/dev/altera/softdma/softdma.c |
| +0 | -648 | sys/dev/beri/virtio/network/if_vtbe.c |
| +0 | -637 | sys/dev/altera/msgdma/msgdma.c |
| +0 | -561 | sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c |
| +481 | -4,767 | 543 files not shown |
| +5,353 | -16,240 | 549 files |
Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master
Conflicts:
sys/dev/beri/virtio/virtio.c (deleted)
| Delta | File | |
|---|---|---|
| +0 | -1,592 | sys/dev/altera/atse/if_atse.c |
| +481 | -447 | contrib/mandoc/roff.c |
| +0 | -882 | sys/dev/altera/softdma/softdma.c |
| +0 | -648 | sys/dev/beri/virtio/network/if_vtbe.c |
| +0 | -637 | sys/dev/altera/msgdma/msgdma.c |
| +0 | -561 | sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c |
| +481 | -4,767 | 448 files not shown |
| +4,283 | -15,733 | 454 files |
rtld: Support multiple PT_GNU_RELRO program headers Iterate over all the program headers in obj_remap_relro and remove the relro fields from Obj_Entry. Skip the call to obj_enforce_relro() in relocate_object() for the rtld object as well as the main program object. obj_enforce_relro() is called later when it safe to reference globals such as page_size. Reviewed by: kib Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D47884
| Delta | File | |
|---|---|---|
| +20 | -17 | libexec/rtld-elf/rtld.c |
| +0 | -12 | libexec/rtld-elf/map_object.c |
| +0 | -3 | libexec/rtld-elf/rtld.h |
| +20 | -32 | 3 files |
Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +0 | -7 | libexec/rtld-elf/rtld.c |
| +0 | -7 | 1 files |
rtld: drop RTLD_INIT_PAGESIZES_EARLY (cherry picked from commit 5bc24fd7a21ffd98fe978b4eb09a383c09edbe37)
| Delta | File | |
|---|---|---|
| +0 | -7 | libexec/rtld-elf/rtld.c |
| +0 | -7 | 1 files |
Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +38 | -6 | sys/dev/e1000/if_em.c |
| +22 | -4 | lib/libc/gen/dlfcn.c |
| +24 | -0 | libexec/rtld-elf/rtld.c |
| +3 | -2 | sys/dev/e1000/e1000_phy.c |
| +4 | -0 | lib/libdl/Symbol.map |
| +1 | -0 | libexec/rtld-elf/Symbol.map |
| +92 | -12 | 1 files not shown |
| +93 | -12 | 7 files |
rtld: implement _dl_iterate_phdr_locked Some sanitizers need to be able to use dl_iterate_phdr() after stopping the rest of the process, but it's very hard to do so reliably as a non-participant in the main logic of the program. Introduce _dl_iterate_phdr_locked to bypass the locking that's normally required for dl_iterate_phdr() and slap some scary warning on it. It will remain undocumented and probably shouldn't be used for anything else. Reviewed by: kib (cherry picked from commit 1426fd6cff0603f0ee275b99f2ba35dc36f3d0c2)
| Delta | File | |
|---|---|---|
| +20 | -4 | lib/libc/gen/dlfcn.c |
| +24 | -0 | libexec/rtld-elf/rtld.c |
| +1 | -0 | lib/libc/gen/Symbol.map |
| +1 | -0 | libexec/rtld-elf/Symbol.map |
| +46 | -4 | 4 files |
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
| Delta | File | |
|---|---|---|
| +101 | -100 | sys/netinet/tcp_hostcache.c |
| +131 | -20 | usr.sbin/daemon/daemon.c |
| +73 | -73 | contrib/llvm-project/clang/include/clang/Basic/BuiltinsLoongArchLASX.def |
| +66 | -66 | contrib/llvm-project/clang/include/clang/Basic/BuiltinsLoongArchLSX.def |
| +103 | -29 | sys/vm/vm_page.c |
| +65 | -61 | sys/dev/hwpmc/hwpmc_logging.c |
| +539 | -349 | 134 files not shown |
| +2,051 | -971 | 140 files |
Merge branch 'freebsd/current/main' into hardened/current/master
| Delta | File | |
|---|---|---|
| +101 | -100 | sys/netinet/tcp_hostcache.c |
| +131 | -20 | usr.sbin/daemon/daemon.c |
| +73 | -73 | contrib/llvm-project/clang/include/clang/Basic/BuiltinsLoongArchLASX.def |
| +103 | -29 | sys/vm/vm_page.c |
| +66 | -66 | contrib/llvm-project/clang/include/clang/Basic/BuiltinsLoongArchLSX.def |
| +65 | -61 | sys/dev/hwpmc/hwpmc_logging.c |
| +539 | -349 | 134 files not shown |
| +2,051 | -971 | 140 files |
rtld: drop RTLD_INIT_PAGESIZES_EARLY No arch defines it after ia64 decomissioning. Discussed with: jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week
| Delta | File | |
|---|---|---|
| +0 | -7 | libexec/rtld-elf/rtld.c |
| +0 | -7 | 1 files |
Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
targets/pseudo/bootstrap-tools/Makefile (unresolved)
| Delta | File | |
|---|---|---|
| +1,062 | -0 | sys/dev/clk/allwinner/ccu_d1.c |
| +0 | -859 | sys/contrib/openzfs/module/unicode/uconv.c |
| +172 | -110 | sys/contrib/openzfs/tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c |
| +280 | -0 | lib/libthr/tests/atfork_test.c |
| +217 | -0 | tools/tools/git/mfc-candidates.lua |
| +138 | -73 | share/man/man4/run.4 |
| +1,869 | -1,042 | 282 files not shown |
| +4,808 | -3,288 | 288 files |
Merge branch 'freebsd/current/main' into hardened/current/master
| Delta | File | |
|---|---|---|
| +280 | -0 | lib/libthr/tests/atfork_test.c |
| +22 | -4 | lib/libc/gen/dlfcn.c |
| +24 | -0 | libexec/rtld-elf/rtld.c |
| +12 | -8 | lib/libthr/thread/thr_fork.c |
| +11 | -0 | lib/libc/gen/_pthread_stubs.c |
| +1 | -5 | bin/ps/ps.c |
| +350 | -17 | 9 files not shown |
| +371 | -22 | 15 files |
rtld: implement _dl_iterate_phdr_locked Some sanitizers need to be able to use dl_iterate_phdr() after stopping the rest of the process, but it's very hard to do so reliably as a non-participant in the main logic of the program. Introduce _dl_iterate_phdr_locked to bypass the locking that's normally required for dl_iterate_phdr() and slap some scary warning on it. It will remain undocumented and probably shouldn't be used for anything else. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47558
| Delta | File | |
|---|---|---|
| +24 | -0 | libexec/rtld-elf/rtld.c |
| +20 | -4 | lib/libc/gen/dlfcn.c |
| +1 | -0 | libexec/rtld-elf/Symbol.map |
| +1 | -0 | lib/libc/gen/Symbol.map |
| +46 | -4 | 4 files |
Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
| Delta | File | |
|---|---|---|
| +106 | -0 | lib/libc/gen/rtld_get_var.3 |
| +45 | -27 | bin/ps/ps.1 |
| +60 | -11 | libexec/rtld-elf/rtld.c |
| +4 | -18 | sys/kern/vfs_subr.c |
| +17 | -0 | lib/libc/gen/dlfcn.c |
| +13 | -2 | share/man/man9/style.9 |
| +245 | -58 | 7 files not shown |
| +276 | -62 | 13 files |