HardenedBSD/src 0789268etc/mtree BSD.lib32.dist BSD.usr.dist

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2etc/mtree/BSD.lib32.dist
+2-2etc/mtree/BSD.usr.dist
+4-42 files

HardenedBSD/src babb41asys/dev/nvme nvme.h

nvme: Minor style nit

Sponsored by:           Netflix
DeltaFile
+1-2sys/dev/nvme/nvme.h
+1-21 files

HardenedBSD/src 7b44ab1share/misc bsd-family-tree

bsd-family-tree: add FreeBSD 15.0
DeltaFile
+4-1share/misc/bsd-family-tree
+4-11 files

HardenedBSD/src 1ecf010lib/libuvmem Makefile Symbol.map, share/mk src.libnames.mk

libuvmem: usermode port of vmem(9)

The quantum cache is disabled, there is no uma.

Intent is to use this for resource allocation in bhyve(8), for start.
Addition of -luvmem to bhyve linking was done to test changes to share/mk.

Reviewed by:    bnovkov, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D27220
DeltaFile
+137-14sys/kern/subr_vmem.c
+15-8sys/sys/vmem.h
+17-0lib/libuvmem/Makefile
+15-0lib/libuvmem/Symbol.map
+5-0share/mk/src.libnames.mk
+1-1usr.sbin/bhyve/Makefile
+190-233 files not shown
+194-239 files

HardenedBSD/src 7295aealib/libuvmem libuvmem.3 Makefile

libuvmem: provide man page mostly as a pointer to vmem(9)

Reviewed by:    bnovkov, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D27220
DeltaFile
+71-0lib/libuvmem/libuvmem.3
+2-0lib/libuvmem/Makefile
+73-02 files

HardenedBSD/src 202292esys/kern subr_vmem.c

kern/subr_vmem.c: convert explicit vmem_list_lock use to macros

Reviewed by:    bnovkov, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D27220
DeltaFile
+9-6sys/kern/subr_vmem.c
+9-61 files

HardenedBSD/src 305e33dsys/kern subr_vmem.c

kern/subr_vmem.c: remove unused VMEM_TRYLOCK() macro

Reviewed by:    bnovkov, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D27220
DeltaFile
+0-1sys/kern/subr_vmem.c
+0-11 files

HardenedBSD/src c6fe17aetc/mtree BSD.lib32.dist BSD.usr.dist

mtree: Keep mtree files indented with spaces

The mtree tool indents directory entries with 4 spaces.

Reviewed by:    imp
Fixes:          9cab9fde5eda ("virtual_oss: Port to base")
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53979

(cherry picked from commit 3d91a746380e81c2089d8beaae28438867ae6dbf)
DeltaFile
+2-2etc/mtree/BSD.lib32.dist
+2-2etc/mtree/BSD.usr.dist
+4-42 files

HardenedBSD/src 791c531share/man/man4 ufintek.4, sys/dev/usb/serial ufintek.c

Fintek F81232 USB to serial driver

Driver for Feature Integration Technology Inc. (aka Fintek)
F81232 USB to serial driver.

Reviewed by:    thj,adrian,UB
Approved by:    adrian
Differential Revision:  https://reviews.freebsd.org/D53893
DeltaFile
+759-0sys/dev/usb/serial/ufintek.c
+118-0share/man/man4/ufintek.4
+37-0sys/modules/ufintek/Makefile
+914-03 files

HardenedBSD/src 2986658cddl/contrib/opensolaris/tools/ctf/cvt barrier.c, sys/dev/evdev input.h input-event-codes.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+44-29sys/dev/evdev/input.h
+35-0tests/sys/netpfil/pf/table.sh
+27-1sys/dev/evdev/input-event-codes.h
+3-23cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c
+2-19usr.sbin/moused/msconvd/msconvd.8
+16-1sys/dev/evdev/evdev.c
+127-7313 files not shown
+175-9519 files

HardenedBSD/src 639e651sys/netpfil/pf if_pfsync.c

pfsync: fix incorrect unlock during destroy

During pfsync_clone_destroy() we clean up pending packets. This
may involve calling pfsync_undefer() or callout_drain(). We may not
hold the bucket lock during callout_drain(), but must hold it during
pfsync_undefer().

We incorrectly always released the lock, leading to assertion failures
during cleanup if there were pending deferred packets.

MFC after:      1 week
Sponsored by:   Orange Business Services
DeltaFile
+2-2sys/netpfil/pf/if_pfsync.c
+2-21 files

HardenedBSD/src 7a283c4sbin/pfctl pfctl.c, tests/sys/netpfil/pf table.sh

pfctl: restore '-Tload -f pf.conf' functionality

Allow only tables to be loaded from a file, rather than everything (i.e.
including options, rules).

Add a test case for this.

PR:             291318
MFC after:      1 week
Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+35-0tests/sys/netpfil/pf/table.sh
+2-1sbin/pfctl/pfctl.c
+37-12 files

HardenedBSD/src d6f1acfsys/netpfil/pf pf.c

pf: use correct sized variables in pf_change_icmp()

We're updating 16-bits checksums here, so should use a 16-bit integer,
not a 32-bit one.
No functional change.

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+2-2sys/netpfil/pf/pf.c
+2-21 files

HardenedBSD/src dc6f609usr.sbin/moused/msconvd msconvd.8

msconvd(8): Drop mentions of Bus/InPort mouse support in manual page

mse(4) was removed long ago.

MFC after:      1 month
DeltaFile
+2-19usr.sbin/moused/msconvd/msconvd.8
+2-191 files

HardenedBSD/src 732b4aacddl/contrib/opensolaris/tools/ctf/cvt barrier.c barrier.h

ctfmerge: fix segfault when building on macOS

The barrier code was using semaphores which have been deprecated in
macOS and not working at all, causing a race condition. Since macOS
does not have pthread_barrier_*(), this change uses a condition
variable instead.

PR:             290958
Reported by:    wosch
MFC after:      2 weeks
Reviewed by:    imp, markj
Differential Revision:  https://reviews.freebsd.org/D54018
DeltaFile
+3-23cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c
+2-7cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h
+5-302 files

HardenedBSD/src b6cad33share/man/man4 hgame.4 ps4dshock.4, sys/dev/hid ps4dshock.c hgame.c

hid: Make game controllers accessible to members of the game group

Their events have to be accessible by unprivileged users via e.g. libsdl.

MFC after:      1 month
DeltaFile
+8-1sys/dev/hid/ps4dshock.c
+4-3share/man/man4/hgame.4
+6-1sys/dev/hid/hgame.c
+4-1share/man/man4/ps4dshock.4
+4-1share/man/man4/xb360gp.4
+26-75 files

HardenedBSD/src 8d9a5d4sys/dev/evdev input.h input-event-codes.h

evdev: Sync event codes with Linux kernel 6.18

MFC after:      1 month
DeltaFile
+44-29sys/dev/evdev/input.h
+27-1sys/dev/evdev/input-event-codes.h
+71-302 files

HardenedBSD/src e3201cesys/dev/atkbdc psm.c

psm: Fix three finger tap on elantech v4 touchpads

Fix an issue where a three finger tap would generate additional events
when fingers moved slightly during the tap.

Signed-off-by:  Robert Wahlberg <freebsd at robertwahlberg.se>
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1792
Reviewed by:    wulf
MFC after:      1 month
DeltaFile
+7-0sys/dev/atkbdc/psm.c
+7-01 files

HardenedBSD/src ecccc9dsys/dev/evdev evdev.c cdev.c

evdev: Allow setting of character device ownership and access mode

by device driver. That is required as game pad and joystick events have
to be accessible by ordinary users.

MFC after:      1 month
DeltaFile
+16-1sys/dev/evdev/evdev.c
+3-3sys/dev/evdev/cdev.c
+3-0sys/dev/evdev/evdev_private.h
+1-0sys/dev/evdev/evdev.h
+23-44 files

HardenedBSD/src aaa3e10cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/arrays tst.uregsarray.d, cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid tst.br.s

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-338cddl/contrib/opensolaris/lib/libdtrace/sparc/dt_isadep.c
+0-132cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/usdt/tst.tailcall.ksh
+0-120cddl/contrib/opensolaris/lib/libdtrace/sparc/regs.d
+0-87cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/tst.trapstat.ksh
+0-85cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/arrays/tst.uregsarray.d
+0-81cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.s
+0-84349 files not shown
+82-1,75855 files

HardenedBSD/src 1eb64d2sys/kern uipc_mqueue.c uipc_usrreq.c, sys/netgraph ng_device.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+192-40sys/netgraph/ng_device.c
+28-31sys/kern/uipc_mqueue.c
+23-4sys/kern/uipc_usrreq.c
+18-1usr.sbin/bhyve/bhyve.8
+18-1usr.sbin/bhyve/net_backends.c
+12-0sys/kern/sys_socket.c
+291-7711 files not shown
+314-9417 files

HardenedBSD/src 882821bsys/kern kern_kexec.c

kexec: Change shutdown handler priority

The kexec shutdown handler should run after everything else, but before
the other platform shutdown handlers.  With (SHUTDOWN_PRI_DEFAULT - 150)
priority it would run before anything else, including all the device
shutdown handlers.  Change to (SHUTDOWN_PRI_LAST - 150) where it
belongs.

Sponsored by:   Hewlett Packard Enterprise
DeltaFile
+1-1sys/kern/kern_kexec.c
+1-11 files

HardenedBSD/src 626cf6cusr.sbin/bhyve net_backends.c bhyve.8

bhyve: add support for ng_device network backend

Signed-off-by: Quentin Thébault <quentin.thebault at defenso.fr>

Reviewed by:    markj
MFC after:      1 month
Sponsored by:   Defenso
Differential Revision:  https://reviews.freebsd.org/D52542
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1880

(cherry picked from commit 1aad95345237424918e5f6b18464df4dbc2aa1d8)
DeltaFile
+18-1usr.sbin/bhyve/net_backends.c
+18-1usr.sbin/bhyve/bhyve.8
+36-22 files

HardenedBSD/src f817011sys/netgraph ng_device.c

ng_device.c: improve compliance with style(9)

Signed-off-by: Quentin Thébault <quentin.thebault at defenso.fr>
Reviewed by: imp, jhb
Pull Request: https://github.com/freebsd/freebsd-src/pull/1827

(cherry picked from commit bcdbeaeffccb65574ac06001888840d9a15f4edf)
DeltaFile
+34-29sys/netgraph/ng_device.c
+34-291 files

HardenedBSD/src 57e4e7dsys/netgraph ng_device.c

ng_device: enable setting the device to non-blocking mode

Return success when FIONBIO or FIOASYNC ioctl are received in order to support
being set to non-blocking through fcntl(2). We return an error on FIOASYNC with
non-zero data argument since we do not support O_ASYNC.

Signed-off-by: Quentin Thébault <quentin.thebault at defenso.fr>
Reviewed by: imp, jhb
Pull Request: https://github.com/freebsd/freebsd-src/pull/1827

(cherry picked from commit 9fadaee7ecce02ab11cfbb18ea63b9bf1fb11bfc)
DeltaFile
+34-7sys/netgraph/ng_device.c
+34-71 files

HardenedBSD/src 0db8e36krb5/util/ss Makefile

krb5: Use sh to run mk_cmds

Otherwise etcupdate apparently can fail if its private object directory
under /var/db is in a filesystem mounted noexec.  We shouldn't be
building this target at all, but for now, just apply this workaround.

PR:             291043
Reviewed by:    ivy, cy, des
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53861

(cherry picked from commit 673924122470463dfb9089e12b1b4496783a77b8)
DeltaFile
+1-1krb5/util/ss/Makefile
+1-11 files

HardenedBSD/src f15e549sys/kern uipc_mqueue.c uipc_usrreq.c, sys/sys protosw.h mqueue.h

file: Add a fdclose method

Consider a program that creates a unix socket pair, transmits both
sockets from one to the other using an SCM_RIGHTS message, and then
closes both sockets without externalizing the message.  unp_gc() is
supposed to handle cleanup, but it is only triggered by uipc_detach(),
which runs when a unix socket is destroyed.  Because the two sockets are
internalized, their refcounts are positive, so uipc_detach() isn't
called.

As a result, a userspace program can create an unbounded amount of
garbage without triggering reclaim.  Let's trigger garbage collection
whenever a unix socket is close()d.  To implement this, add new a
fdclose file op and protocol op, and implement them accordingly.  Since
mqueuefs has a hack to hook into the file close path, convert it to use
the new op as well.

Now, userspace can't create garbage without triggering reclamation.


    [5 lines not shown]
DeltaFile
+28-31sys/kern/uipc_mqueue.c
+23-4sys/kern/uipc_usrreq.c
+12-0sys/kern/sys_socket.c
+2-6sys/kern/kern_descrip.c
+5-2sys/sys/protosw.h
+0-5sys/sys/mqueue.h
+70-482 files not shown
+74-498 files

HardenedBSD/src e1834bcsys/netgraph ng_device.c

ng_device: add kqueue support

Signed-off-by: Quentin Thébault <quentin.thebault at defenso.fr>

Sponsored by:   Defenso
Reviewed by:    markj
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D52541
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1880

(cherry picked from commit a505b80b2f038409300cd05e2ea95822942404e2)
DeltaFile
+123-3sys/netgraph/ng_device.c
+123-31 files

HardenedBSD/src c782957sys/kern kern_jaildesc.c

jail: Make jaildesc_ops const

No functional change intended.

MFC after:      1 week

(cherry picked from commit e22cc773f1a926fed3558c51bf0dd7890af26a2b)
DeltaFile
+1-1sys/kern/kern_jaildesc.c
+1-11 files

HardenedBSD/src 3bba28csys/tools/gdb pcpu.py freebsd.py

gdb: Fix some PEP 8 violations

Silence some warnings in my editor.  No functional change intended.

MFC after:      1 week

(cherry picked from commit 32605b159f3fea3a5d4710055681650f3de9ea68)
DeltaFile
+3-0sys/tools/gdb/pcpu.py
+3-0sys/tools/gdb/freebsd.py
+2-1sys/tools/gdb/vnet.py
+2-0sys/tools/gdb/acttrace.py
+10-14 files