HardenedBSD/src 2ee4aa9sbin/init ttys, sys/conf options

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+39-3sys/dev/uart/uart_dev_ns8250.c
+14-14sbin/init/ttys
+4-0sys/conf/options
+1-1sys/sys/buf.h
+1-0sys/net/if_vlan.c
+59-185 files

HardenedBSD/src 35d7753sbin/init ttys, sys/conf options

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+39-3sys/dev/uart/uart_dev_ns8250.c
+14-14sbin/init/ttys
+4-0sys/conf/options
+1-1sys/sys/buf.h
+1-0sys/net/if_vlan.c
+59-185 files

HardenedBSD/src af26c2asys/kern kern_syscalls.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+8-2sys/kern/kern_syscalls.c
+8-21 files

HardenedBSD/src d2dea8bsys/conf options, sys/dev/uart uart_dev_ns8250.c

arm: Add EARLY_PRINTF for ns8250 on arm/aarch64 platforms.

Reviewed  by:   adrian (previous version)
MFC after:      3 weeks
DeltaFile
+39-3sys/dev/uart/uart_dev_ns8250.c
+4-0sys/conf/options
+43-32 files

HardenedBSD/src dfcd04csys/net if_vlan.c

net/if_vlan.c: do not leak vlan sx slock in vlan_clone_dump_nl()

Reported by:    pho
Reviewed by:    markj
Fixes:  d4062b9f16e46f039f2b5b40dd35592b5dabf00c
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential revision:  https://reviews.freebsd.org/D55447
DeltaFile
+1-0sys/net/if_vlan.c
+1-01 files

HardenedBSD/src 10f22bdsys/kern kern_syscalls.c

kern_syscall_deregister: document syscall 0 no-op logic

Document syscall #0 being handled specially in
`kern_syscall_deregister(..)`: it's a reserved syscall and not
dynamically registered, and hence does not need to be deregistered in
the function.

Co-authored-by: ngie@
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D54326

(cherry picked from commit f384784289dba13b90138a89d3df3a8ea063aff9)
DeltaFile
+8-2sys/kern/kern_syscalls.c
+8-21 files

HardenedBSD/src 6d15e0esbin/init ttys

ttys: Correct comment about required statuses

The status field also accepts onifconsole and onifexists,
so it looks crusty saying that it only accepts on and off.

Reviewed by:    imp
Closes:         https://github.com/freebsd/freebsd-src/pull/2042
DeltaFile
+3-3sbin/init/ttys
+3-31 files

HardenedBSD/src 0a492ebsbin/init ttys

ttys: Align comment whitespace and wrapping

This doesn't lengthen or shorten any configuration,
only comments, so merging the configuration will be safe.

Reviewed by:    imp
Closes:         https://github.com/freebsd/freebsd-src/pull/2042
DeltaFile
+11-11sbin/init/ttys
+11-111 files

HardenedBSD/src eaeb356sys/sys buf.h

buf: Relax an assertion in BUF_UNLOCK

The BUF_UNLOCK macro asserts that B_REMFREE is not set, as it is up to
the lock owner to complete the dequeue from the free list before
releasing the lock.  However, if the thread has acquired the lock
multiple times, then releasing the recursive lock should be ok.  Modify
the assertion to reflect this.

This was triggered by an out-of-tree filesystem.

Reviewed by:    kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55418
DeltaFile
+1-1sys/sys/buf.h
+1-11 files

HardenedBSD/src fe2a24ccontrib/diff ChangeLog, contrib/diff/doc diff.7 diff.texi

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-6,287contrib/diff/doc/diff.7
+0-4,653contrib/diff/doc/diff.texi
+0-3,878contrib/diff/ChangeLog
+0-1,743contrib/diff/src/diff3.c
+0-1,357contrib/diff/src/diff.c
+0-1,330contrib/diff/lib/strftime.c
+0-19,24894 files not shown
+461-32,711100 files

HardenedBSD/src 6d44f1asys/dev/iicbus/gpio tca64xx.c, sys/dev/iicbus/rtc hym8563.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+213-25sys/dev/iicbus/rtc/hym8563.c
+60-18sys/dev/pci/pci_dw.c
+39-27sys/dev/rge/if_rge.c
+14-13sys/dev/iicbus/gpio/tca64xx.c
+12-12sys/netinet/tcp_subr.c
+12-5sys/dev/regulator/regulator_fixed.c
+350-1008 files not shown
+369-10914 files

HardenedBSD/src f8e6045sys/dev/asmc asmc.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1-1sys/dev/asmc/asmc.c
+1-11 files

HardenedBSD/src 1459b69sys/dev/asmc asmc.c

asmc: unbreak build: add missing curly brace

Fixes:  d76bb14e022 ("chore: asmc: additional style(9) cleanup")
(cherry picked from commit 9ccdf3f36e014f0060ea192ffed91a7679003355)
DeltaFile
+1-1sys/dev/asmc/asmc.c
+1-11 files

HardenedBSD/src acbf749sys/dev/rge if_rge.c

rge: log silicon revision during attach

The initial import from OpenBSD contained chip revision printf() calls
commented out, as OpenBSD's bare printf() style does not translate to
FreeBSD's device_printf() idiom. The result is that users cannot
distinguish RTL8125 from RTL8125B, RTL8125D_1, RTL8125D_2 etc. via
dmesg alone, even though all variants show as '<RTL8125>' from the PCI
probe string.

Add proper device_printf() calls including the raw hwrev value,
consistent with how re(4) reports chip revisions.

Signed-off-by: Christos Longros <chris.longros at gmail.com>

Reviewed by:    zlei, imp, adrian
Differential Revision:  https://reviews.freebsd.org/D55402
DeltaFile
+7-7sys/dev/rge/if_rge.c
+7-71 files

HardenedBSD/src d1947d0sys/dev/rge if_rge.c

rge: correctly free busdma memory / zero things out only if allocated

* Only free busdma memory that was allocated
* Don't free tx/rx rings until their buffers have also been freed

PR:     kern/293307

Reviewed by:    zlei
Differential Revision:  https://reviews.freebsd.org/D55420
DeltaFile
+18-15sys/dev/rge/if_rge.c
+18-151 files

HardenedBSD/src d5ca521sys/dev/rge if_rge.c

rge: fix callout setup/teardown; handle invalid ethernet address

* Do the callout init early; since some of the teardown path expects
  the callout to be valid

* Handle an invalid ethernet address by generating a local one.

PR:     kern/293307

Reviewed by:    zlei
Differential Revision:  https://reviews.freebsd.org/D55419
DeltaFile
+14-5sys/dev/rge/if_rge.c
+14-51 files

HardenedBSD/src dc9a7b1sys/conf files

HYM8563: Add HYM563 RTC driver to common config.

MFC after:      3 weeks
DeltaFile
+1-0sys/conf/files
+1-01 files

HardenedBSD/src 9de4313sys/dev/regulator regulator_fixed.c

regulator_fixed: add support for 'gpios' property

This is a newer version of the "gpio" property.

MFC after:      3 weeks
DeltaFile
+12-5sys/dev/regulator/regulator_fixed.c
+12-51 files

HardenedBSD/src 6b77d34sys/dev/iicbus/rtc hym8563.c

HYM8563: Add support for clock output.

The RTC contains a configurable clock output.

MFC after:      3 weeks
DeltaFile
+213-25sys/dev/iicbus/rtc/hym8563.c
+213-251 files

HardenedBSD/src 2ade720sys/dev/iicbus/gpio tca64xx.c

TCA64xx: Convert mutex to SX lock.

I2C devices are permitted to sleep during transfers.

MFC after:      3 weeks
DeltaFile
+14-13sys/dev/iicbus/gpio/tca64xx.c
+14-131 files

HardenedBSD/src 67fc0ffsys/modules/dtb/rockchip Makefile

dtb: generate .DTB for some RK3588 based boards.

MFC after:      3 weeks
DeltaFile
+4-1sys/modules/dtb/rockchip/Makefile
+4-11 files

HardenedBSD/src 4840558sys/dev/ofw ofw_cpu.c

OFW: Improve OFW_CPU.

Accept the assigned clock on the CPU node.
Don't report a missing "clock-frequency" property if the CPU node has
a "clocks" property.

MFC after:      3 weeks
DeltaFile
+10-1sys/dev/ofw/ofw_cpu.c
+10-11 files

HardenedBSD/src 92c66dcsys/dev/pci pci_dw.c pci_dw.h

pci_dw: improve pci_dw

Add support for 64-bit ranges.
Process 'bus-range' property.
Add some debug prints.

MFC after:      3 weeks
DeltaFile
+60-18sys/dev/pci/pci_dw.c
+3-0sys/dev/pci/pci_dw.h
+63-182 files

HardenedBSD/src f40ed48sys/dev/fdt simple_mfd.c

fdt,simple_mfd: Map memory as shareable.

It may be submapped in child drivers.

MFC after:      3 weeks
DeltaFile
+1-1sys/dev/fdt/simple_mfd.c
+1-11 files

HardenedBSD/src c984c75sys/netinet tcp_subr.c

tcp: cleanup

No functional change intended.

Reviewed by:            pouria, rrs, Timo Völker
MFC after:              1 week
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D55415
DeltaFile
+12-12sys/netinet/tcp_subr.c
+12-121 files

HardenedBSD/src 7755a40sys/fs/fuse fuse_ipc.c fuse_ipc.h

fusefs: remove the obsolete rename_lock

This lock was included in the original GSoC submission.  Its purpose
seems to have been to prevent concurrent FUSE_RENAME operations for the
current mountpoint, as well as to synchronize FUSE_RENAME with
fuse_vnode_setparent.  But it's obsolete, now that ef6ea91593e added
mnt_renamelock .

MFC after:      2 weeks
Sponsored by:   ConnectWise
Reviewed by:    kib
Differential Revision: https://reviews.freebsd.org/D55231
DeltaFile
+0-2sys/fs/fuse/fuse_ipc.c
+0-2sys/fs/fuse/fuse_ipc.h
+0-2sys/fs/fuse/fuse_vnops.c
+0-63 files

HardenedBSD/src 2e768efshare/mk src.opts.mk

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-3share/mk/src.opts.mk
+0-31 files

HardenedBSD/src 31ec024contrib/diff ChangeLog, contrib/diff/doc diff.7 diff.texi

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

Conflicts:
        share/mk/src.opts.mk (unresolved)
DeltaFile
+0-6,287contrib/diff/doc/diff.7
+0-4,653contrib/diff/doc/diff.texi
+0-3,878contrib/diff/ChangeLog
+0-1,743contrib/diff/src/diff3.c
+0-1,357contrib/diff/src/diff.c
+0-1,330contrib/diff/lib/strftime.c
+0-19,24881 files not shown
+95-32,60287 files

HardenedBSD/src fd4ff8cstand/libsa/geli geliboot_crypto.c, sys/arm/broadcom/bcm2835 bcm2835_bsc.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1-1stand/libsa/geli/geliboot_crypto.c
+1-1sys/arm/broadcom/bcm2835/bcm2835_bsc.c
+1-1sys/dev/mlx4/mlx4_core/mlx4_main.c
+1-1sys/dev/qlnx/qlnxe/ecore_cxt.c
+1-1sys/fs/nfsserver/nfs_nfsdstate.c
+1-1sys/kern/imgact_elf.c
+6-61 files not shown
+7-67 files

HardenedBSD/src 1d4fdd5sys/fs/nfsserver nfs_nfsdstate.c

nfsserver: Fix a typo in a source code comment

- s/preceeded/preceded/

(cherry picked from commit afe666a8db82c42fe0b8d55d3142c9d305d1bc28)
DeltaFile
+1-1sys/fs/nfsserver/nfs_nfsdstate.c
+1-11 files