HardenedBSD/src d2434f9sys/netinet in_pcb.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+4-0sys/netinet/in_pcb.c
+4-01 files

HardenedBSD/src 756c14csys/netinet in_pcb.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+4-0sys/netinet/in_pcb.c
+4-01 files

HardenedBSD/src 0568667lib/libulog ulog_login.c, libexec/tftpd tftpd.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+212-140libexec/tftpd/tests/functional.c
+18-12libexec/tftpd/tftpd.c
+15-3sys/arm64/include/vmparam.h
+2-7sys/arm64/arm64/efirt_machdep.c
+4-3sys/arm64/arm64/minidump_machdep.c
+3-3lib/libulog/ulog_login.c
+254-1684 files not shown
+259-17310 files

HardenedBSD/src 10a88e8lib/libulog ulog_login.c

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
DeltaFile
+3-3lib/libulog/ulog_login.c
+3-31 files

HardenedBSD/src 3f59eb3lib/libulog ulog_login.c

libulog: Make sure ut_line, ut_user, ut_host are terminated.

MFC after:      3 days
Reviewed by:    bapt
Differential Revision:  https://reviews.freebsd.org/D45004

(cherry picked from commit c28253ecde333c9908b7160664805acc3a92e2b0)
DeltaFile
+3-3lib/libulog/ulog_login.c
+3-31 files

HardenedBSD/src 2bdfc29lib/libulog ulog_login.c

libulog: Make sure ut_line, ut_user, ut_host are terminated.

MFC after:      3 days
Reviewed by:    bapt
Differential Revision:  https://reviews.freebsd.org/D45004

(cherry picked from commit c28253ecde333c9908b7160664805acc3a92e2b0)
DeltaFile
+3-3lib/libulog/ulog_login.c
+3-31 files

HardenedBSD/src 986ccedlibexec/tftpd tftpd.c tftp-utils.c, libexec/tftpd/tests functional.c

tftpd: Use `size_t` where appropriate.

* Limit the use of `ssize_t` to only where it's needed.
* Correct one case of `int` being used for a length.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D44954

(cherry picked from commit 1ed44fcc44b2c04db330663589541608135402f4)

tftpd: Clean up the tests.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D44955


    [38 lines not shown]
DeltaFile
+212-140libexec/tftpd/tests/functional.c
+18-12libexec/tftpd/tftpd.c
+2-2libexec/tftpd/tftp-utils.c
+1-1libexec/tftpd/tftp-utils.h
+233-1554 files

HardenedBSD/src c3a3b23sys/arm64/arm64 efirt_machdep.c minidump_machdep.c, sys/arm64/include vmparam.h

arm64: Check DMAP address is valid in PHYS_IN_DMAP

When checking if a physical address is in the DMAP region we assume
all physical addresses between DMAP_MIN_PHYSADDR and DMAP_MAX_PHYSADDR
are able to be accesses through the DMAP. It may be the case that
there is device memory in this range that shouldn't be accessed through
the DMAP mappings.

Add a check to PHYS_IN_DMAP that the translated virtual address is a
valid kernel address. To support code that already checks the address
is valid add PHYS_IN_DMAP_RANGE.

PR:             278233
Reviewed by:    alc, markj
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D44677

(cherry picked from commit 9d40492efa467095340cf3dca5860880aa441472)
DeltaFile
+15-3sys/arm64/include/vmparam.h
+2-7sys/arm64/arm64/efirt_machdep.c
+4-3sys/arm64/arm64/minidump_machdep.c
+1-1sys/arm64/arm64/machdep.c
+22-144 files

HardenedBSD/src 93b11felibexec/rc/rc.d nuageinit

nuageinit: start the script after zfs

It prevents the home directory for the new users to be hidden
by late mount of the home directory

(cherry picked from commit b6a4776008519bb4a1d5abfe63c46d5f009ce102)
DeltaFile
+1-1libexec/rc/rc.d/nuageinit
+1-11 files

HardenedBSD/src cdac82fsys/rpc clnt_vc.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+8-2sys/rpc/clnt_vc.c
+8-21 files

HardenedBSD/src 2b86979sys/rpc clnt_vc.c

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
DeltaFile
+8-2sys/rpc/clnt_vc.c
+8-21 files

HardenedBSD/src f8575d4sys/rpc clnt_vc.c

krpc: Ref cnt the client structures for TLS upcalls

A crash occurred during testing, where the client structures had
already been free'd when the upcall thread tried to lock them.

This patch acquires a reference count on both of the structures
and these are released when the upcall is done, so that the
structures cannot be free'd prematurely.  This happened because
the testing is done over a very slow vpn.

Found during a IETF bakeathon testing event this week.

(cherry picked from commit 4ba444de708bada46a88ecac17b2f6c1dc912234)
DeltaFile
+8-2sys/rpc/clnt_vc.c
+8-21 files

HardenedBSD/src f6b902asys/rpc clnt_vc.c

krpc: Ref cnt the client structures for TLS upcalls

A crash occurred during testing, where the client structures had
already been free'd when the upcall thread tried to lock them.

This patch acquires a reference count on both of the structures
and these are released when the upcall is done, so that the
structures cannot be free'd prematurely.  This happened because
the testing is done over a very slow vpn.

Found during a IETF bakeathon testing event this week.

(cherry picked from commit 4ba444de708bada46a88ecac17b2f6c1dc912234)
DeltaFile
+8-2sys/rpc/clnt_vc.c
+8-21 files

HardenedBSD/src cb3af7eshare/examples/bhyve vmrun.sh, sys/x86/x86 vmware_guestrpc.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,888-0usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c
+31-1,807usr.sbin/bhyvectl/bhyvectl.c
+337-0sys/x86/x86/vmware_guestrpc.c
+81-52share/examples/bhyve/vmrun.sh
+82-0usr.sbin/bhyvectl/aarch64/bhyvectl_machdep.c
+53-0usr.sbin/bhyvectl/bhyvectl.h
+2,472-1,85922 files not shown
+2,624-1,94128 files

HardenedBSD/src 2f5fb2elib/libgcc_s Symbol.map, release Makefile.mirrors

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+337-0sys/x86/x86/vmware_guestrpc.c
+37-0sys/x86/include/vmware_guestrpc.h
+13-9lib/libgcc_s/Symbol.map
+1-14tools/build/beinstall.sh
+3-12share/man/man8/beinstall.8
+14-0release/Makefile.mirrors
+405-356 files not shown
+422-4012 files

HardenedBSD/src 542456a. ObsoleteFiles.inc, etc/mtree BSD.usr.dist

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+487-130share/man/man7/hier.7
+3-0ObsoleteFiles.inc
+0-2etc/mtree/BSD.usr.dist
+1-1share/man/man9/ieee80211_vap.9
+491-1334 files

HardenedBSD/src b07689dshare/man/man8 beinstall.8, tools/build beinstall.sh

beinstall: retire mergemaster support

Mergemaster has been deprecated for some time, and will be retired.

Reviewed by:    kevans
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D41799
DeltaFile
+3-12share/man/man8/beinstall.8
+1-14tools/build/beinstall.sh
+4-262 files

HardenedBSD/src 98c8caalib/libgcc_s Symbol.map

libgcc_s: 80-bit long double function are x86-only

Don't try to expose them on other architectures.

Reviewed by:    arichardson
Differential Revision:  https://reviews.freebsd.org/D45028
DeltaFile
+13-9lib/libgcc_s/Symbol.map
+13-91 files

HardenedBSD/src ecaab0fsys/x86/acpica madt.c, sys/x86/conf NOTES

guestrpc module to handle VMware backdoor port GuestRPC functionality

Convert existing FreeBSD vmware_hvcall function to take a channel
and parameter arguments.

Added vmware_guestrpc_cmd() to send GuestRPC commands to the VMware
hypervisor. The sbuf argument is used for both the command to send
and to store the data to return to the caller.

The following KPIs can be used to get and set FreeBSD-specific guest
information in key/value pairs:
 * vmware_guestrpc_set_guestinfo
   - set a value into the guestinfo.fbsd.<keyword> key
 * vmware_guestrpc_get_guestinfo
   - get the value stored in the guestinfo.fbsd.<keyword> key

Add VMware devices to x86 NOTES

Reviewed by:    jhb

    [2 lines not shown]
DeltaFile
+337-0sys/x86/x86/vmware_guestrpc.c
+37-0sys/x86/include/vmware_guestrpc.h
+6-2sys/x86/include/vmware.h
+5-0sys/x86/conf/NOTES
+2-1sys/x86/x86/identcpu.c
+2-1sys/x86/acpica/madt.c
+389-42 files not shown
+391-58 files

HardenedBSD/src 63b7478share/man/man7 hier.7

hier.7: polish entry to system manual

Entries reworded to improve grammar or add keywords:
- document description: substitute layout for index for first-glance
- /etc/freebsd/update.conf
- /usr/share/vi/

Entries that have been wordshuffled for brevity or consistency:
- /{bin,libexec,nonexistent,sbin,tmp}/
- /boot/dtb/overlays/
- /boot/{defaults,efi,kernel,lua}/
- /usr/libexec/
- /var/{db,games,lib,log/{bsdisks.log,spool/,tmp/}}
- /usr/share/sysroot/VERSION/MACHINE.MACHINE_ARCH/ (unfold a little)
- /usr/local/share/doc/freebsd/ (unfold a little)

Entries that have macro or linking adjustments:
- /{boot,boot/efi,dev,etc,home,sbin,usr/bin}/ (overview or intro pages)
- /media/ (bsdisks is from ports, but afaik pulled by every desktop)

    [23 lines not shown]
DeltaFile
+123-84share/man/man7/hier.7
+123-841 files

HardenedBSD/src a7a6873. ObsoleteFiles.inc, etc/mtree BSD.usr.dist

BSD.usr.dist: remove empty /usr/libdata/gcc directory

I am unsure of its exact historical usage, but, we no longer ship GCC
with FreeBSD, and it should have been removed.

Reviewed by:    imp, emaste
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D44440

(cherry picked from commit cc1268a926772900a08c61fd791bb66df1e6c30c)
DeltaFile
+1-3share/man/man7/hier.7
+3-0ObsoleteFiles.inc
+0-2etc/mtree/BSD.usr.dist
+4-53 files

HardenedBSD/src 3d50905share/man/man7 hier.7

hier.7: various improvements

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/831

(cherry picked from commit 03ee09148950c9ea99987bfee8a769473079745b)
(cherry picked from commit 94dedfdfa96baef02e4ad661512a267ae5647d7b)
(cherry picked from commit a5b07274fcaf71fc9c14947a75fbe0a13d381a79)
(cherry picked from commit f19875b66bf403ed5c57f82bbe2a3f42475d0a06)
DeltaFile
+417-97share/man/man7/hier.7
+417-971 files

HardenedBSD/src 1d921beshare/man/man9 ieee80211_vap.9

ieee80211_vap(9): fix the title

MFC after:      3 days

(cherry picked from commit c5989febcc00be41e05b4b714bbfc6ea1359abaf)
DeltaFile
+1-1share/man/man9/ieee80211_vap.9
+1-11 files

HardenedBSD/src 3c93b5eshare/examples/bhyve vmrun.sh

HBSD: Resolve merge conflict

Reduce diff against vmrun.sh by reverting it back to FreeBSD's version
entirely.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+9-39share/examples/bhyve/vmrun.sh
+9-391 files

HardenedBSD/src adf8b80share/examples/bhyve vmrun.sh, sys/sys sdt.h

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        share/examples/bhyve/vmrun.sh (unresolved)
DeltaFile
+1,888-0usr.sbin/bhyvectl/amd64/bhyvectl_machdep.c
+31-1,807usr.sbin/bhyvectl/bhyvectl.c
+83-24share/examples/bhyve/vmrun.sh
+82-0usr.sbin/bhyvectl/aarch64/bhyvectl_machdep.c
+53-0usr.sbin/bhyvectl/bhyvectl.h
+21-16sys/sys/sdt.h
+2,158-1,84710 files not shown
+2,204-1,87316 files

HardenedBSD/src f4b0809release Makefile.mirrors

release: Stage non-UFS images in vm-images-stage

When the VM image building code was updated to support building
non-UFS images, the vm-images-stage target was not updated to
install those newly built images to the FTP site.  As a result, we
have been sending weekly snapshot announcements since August claiming
that ZFS VM images are available when they are not in fact present
anywhere publicly accessible.

Fixes:  32ae9a6b3937 "release: Build UFS and ZFS VM images"
Reported by:    Michael Dexter
MFC after:      5 days
DeltaFile
+14-0release/Makefile.mirrors
+14-01 files

HardenedBSD/src 793556eshare/examples/modules Makefile

Fix up a mistake in the CFLAGS added.  Pointed out by jrtc.
DeltaFile
+1-1share/examples/modules/Makefile
+1-11 files

HardenedBSD/src e60ca52share/examples/modules Makefile

Out of tree modules should be built with DTrace by default.
DeltaFile
+2-0share/examples/modules/Makefile
+2-01 files

HardenedBSD/src c100fe0share/examples Makefile

examples: Install bhyve files on arm64

Sponsored by:   Innovate UK
DeltaFile
+1-1share/examples/Makefile
+1-11 files

HardenedBSD/src e10b9d6usr.sbin/bhyve uart_backend.c uart_pl011.c

bhyve: Move lock of uart frontend to uart backend

Currently, lock of uart in bhyve is placed in frontend. There are some
problems about it:

1. If every frontend should has a lock, why not move it inside backend
   as they all have same uart_softc.
2. If backend needs to modify the information of uart after initialize,
   it will be impossible as backend cannot use lock. For example, if we
   want implement a telnet support for uart in backend, It should wait
   for connection when initialize. After some remote process connect it,
   it needs to modify rfd and wfd in backend.

So I decide to move it to backend.

Reviewed by:    corvink, jhb, markj
Differential Revision:  https://reviews.freebsd.org/D44947
DeltaFile
+21-1usr.sbin/bhyve/uart_backend.c
+6-10usr.sbin/bhyve/uart_pl011.c
+6-9usr.sbin/bhyve/uart_emul.c
+2-1usr.sbin/bhyve/uart_backend.h
+35-214 files