HardenedBSD/src 23b2b35sys/netinet6 nd6_rtr.c nd6.h, sys/powerpc/booke pmap.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+336-1sys/netinet6/nd6_rtr.c
+13-13sys/powerpc/include/tlb.h
+18-6sys/powerpc/mpc85xx/platform_mpc85xx.c
+17-6sys/powerpc/booke/pmap.c
+15-2usr.sbin/rtadvd/rtadvd.c
+13-1sys/netinet6/nd6.h
+412-2913 files not shown
+444-3419 files

HardenedBSD/src 1abf532sys/netinet6 nd6_rtr.c nd6.h, sys/powerpc/booke pmap.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+336-1sys/netinet6/nd6_rtr.c
+13-13sys/powerpc/include/tlb.h
+18-6sys/powerpc/mpc85xx/platform_mpc85xx.c
+17-6sys/powerpc/booke/pmap.c
+15-2usr.sbin/rtadvd/rtadvd.c
+13-1sys/netinet6/nd6.h
+412-2913 files not shown
+444-3419 files

HardenedBSD/src 19887b9sbin/ifconfig Makefile

ifconfig: Do not build geneve with WITHOUT_NETLINK_SUPPORT

geneve(4) is netlink-only, therefore, don't build it with
WITHOUT_NETLINK_SUPPORT=1 set.

Reported by:    kp
Fixes:          688e289ee904 ("ifconfig: Add support for geneve (netlink)")
Differential Revision: https://reviews.freebsd.org/D55184
DeltaFile
+1-1sbin/ifconfig/Makefile
+1-11 files

HardenedBSD/src a249ddfsys/powerpc/powerpc intr_machdep.c

powerpc/intr setup: Don't check intr name for IPI

Since whether or not the irq is an IPI is passed into
powerpc_setup_intr_int(), use this as the check for IPI instead of
checking the name string.
DeltaFile
+1-1sys/powerpc/powerpc/intr_machdep.c
+1-11 files

HardenedBSD/src 603a29bsys/powerpc/mpc85xx platform_mpc85xx.c

mpc85xx: Support timebase sync on T-series devices

Freescale T-series QorIQ devices use a different register to twiddle the
timebase enable.
DeltaFile
+18-6sys/powerpc/mpc85xx/platform_mpc85xx.c
+18-61 files

HardenedBSD/src 1fc50a4sys/powerpc/booke pmap.c, sys/powerpc/include tlb.h spr.h

powerpc/pmap: Add support for page sizes found on E6500

E6500 cores (MMUv2) support all powers-of-2 page sizes from 4k to 1TB,
not just powers of 4.  By using the other page sizes (8k, 32k, etc) we
can save on TLB1 space, saving up to ~1/3 of used TLB1 entries.
DeltaFile
+13-13sys/powerpc/include/tlb.h
+17-6sys/powerpc/booke/pmap.c
+5-0sys/powerpc/include/spr.h
+35-193 files

HardenedBSD/src 2fc5810sys/dev/etherswitch/e6000sw e6000sw.c

e6000/fdt: Ignore disabled switch ports

Instead of trying to parse a bogus node, just skip it if marked
disabled.
DeltaFile
+2-0sys/dev/etherswitch/e6000sw/e6000sw.c
+2-01 files

HardenedBSD/src 680e6e3sys/dev/etherswitch/e6000sw e6000sw.c e6000swreg.h

etherswitch: Add minimal support for mv88e6170 switch
DeltaFile
+4-0sys/dev/etherswitch/e6000sw/e6000sw.c
+1-0sys/dev/etherswitch/e6000sw/e6000swreg.h
+5-02 files

HardenedBSD/src 6a3e222usr.bin/yacc config.h

yacc: Fix SYSTEM_NAME

This usually gets bumped by re@ when the version number changes in
sys/conf/newvers.sh, but apparently we forgot for the past two major
versions.
DeltaFile
+1-1usr.bin/yacc/config.h
+1-11 files

HardenedBSD/src 0dac997sys/kern kern_descrip.c

file: Fix a format string assertion

Reported by:    Jenkins
Fixes:          e75b324c93a1 ("kern_descrip.c: Clarify allocation and freeing of fd map in fdgrowtable()")
DeltaFile
+1-1sys/kern/kern_descrip.c
+1-11 files

HardenedBSD/src bebc1a5sys/netinet in_mcast.c

in_mcast: Fix a lock leak in inp_set_source_filters()

MFC after:      3 days
Reported by:    Claude Opus 4.6
DeltaFile
+1-0sys/netinet/in_mcast.c
+1-01 files

HardenedBSD/src d88a159sys/kern uipc_socket.c

so_splice: Fix the KTLS check for the sink socket in so_splice()

Reviewed by:    gallatin
Reported by:    Claude Sonnet 4.6
Fixes:          1000cc4a0d39 ("so_splice: Disallow splicing with KTLS-enabled sockets")
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56385
DeltaFile
+1-1sys/kern/uipc_socket.c
+1-11 files

HardenedBSD/src 4dc6522usr.sbin/rtadvd rtadvd.c config.c

rtadvd(8): Set route info lifetime to 0 during shutdown

RFC 4191 section 3.1: if the received route's lifetime
is zero, the route is removed from the Routing Table if present.
Also, do not tell route information option is unknown.

PR:             263982
Reviewed by:    markj
Differential Revision: https://reviews.freebsd.org/D55448
DeltaFile
+15-2usr.sbin/rtadvd/rtadvd.c
+3-0usr.sbin/rtadvd/config.c
+18-22 files

HardenedBSD/src c8d2580sys/net/route nhop_ctl.c, sys/netinet icmp6.h

nd6: Add support for route information (RFC 4191)

Implement RFC 4191 by handling received Router Adverisement (RA)
packets with route information option.
For default routes, use the route information's lifetime and
preference to overwrite the RA's lifetime/preference.
Also install and update more-specific route prefixes with the
option's lifetime and expire them when their lifetime elapses.

PR:             263982
Reviewed by:    markj
Tested by:      Marek Zarychta <zarychtam at plan-b.pwste.edu.pl>
Relnotes:       yes
Differential Revision: https://reviews.freebsd.org/D55449
DeltaFile
+336-1sys/netinet6/nd6_rtr.c
+13-1sys/netinet6/nd6.h
+8-0sys/netinet6/nd6.c
+2-0sys/netinet/icmp6.h
+1-0sys/net/route/nhop_ctl.c
+360-25 files

HardenedBSD/src a3d7505lib/libsys/x86 pkru.3, sbin/devd snd.conf

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+56-1share/man/man5/rc.conf.5
+50-0sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+22-0sys/arm64/arm64/trap.c
+10-10lib/libsys/x86/pkru.3
+6-8sbin/devd/snd.conf
+8-4share/man/man9/OF_getprop.9
+152-2316 files not shown
+199-4622 files

HardenedBSD/src 0c2dae6lib/libsys/x86 pkru.3, sbin/devd snd.conf

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+56-1share/man/man5/rc.conf.5
+50-0sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+22-0sys/arm64/arm64/trap.c
+10-10lib/libsys/x86/pkru.3
+6-8sbin/devd/snd.conf
+8-4share/man/man9/OF_getprop.9
+152-2316 files not shown
+199-4622 files

HardenedBSD/src 37ee9a9lib/libpmc libpmc_pmu_util.c, sys/arm/broadcom/bcm2835 raspberrypi_virtgpio.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+347-0sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
+52-0sys/x86/x86/local_apic.c
+31-6sys/x86/x86/io_apic.c
+26-9sys/dev/hwpmc/hwpmc_logging.c
+35-0sys/x86/include/bhyve.h
+13-12lib/libpmc/libpmc_pmu_util.c
+504-2726 files not shown
+620-7432 files

HardenedBSD/src 48a05f8stand/libofw openfirm.c openfirm.h, stand/powerpc/ofw ofwfdt.c

stand/libofw: make OF_hasprop() part of the library

Currently it is only needed by powerpc ofwfdt.c, and defined statically
there. Make it available as part of libofw, mirroring what we have in
the kernel.

Two small tweaks are made to the implementation:
  1. Return type is changed to bool
  2. Return 'true' when OF_getproplen() == 0. This matches the expected
     semantics of the kernel version, described in OF_hasprop(9).

Reviewed by:    manu, imp, adrian
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D56429
DeltaFile
+7-0stand/libofw/openfirm.c
+0-6stand/powerpc/ofw/ofwfdt.c
+1-0stand/libofw/openfirm.h
+8-63 files

HardenedBSD/src fa77feclib/libsys/x86 pkru.3

pkru.3: Note that the kernel may not respect PKRU protections

There are cases where the kernel will be able to access memory covered
by a PKRU key which nomially prohibits accesses.  I believe regular
copyin()/copyout() are subject to the contents of PKRU, but memory
accesses via uiomove_fromphys() will not be.  This can arise when
performing fault I/O, for instance.  I didn't test, but I suspect AIO is
another case.

Update the man page to acknowledge this.

Reviewed by:    alc, kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56416
DeltaFile
+10-7lib/libsys/x86/pkru.3
+10-71 files

HardenedBSD/src fe6bf73lib/libsys/x86 pkru.3

pkru.3: Remove a qualifier

Now that i386 kernels are deprecated, we don't really need to mention
this limitation.  It's also a bit dated since PKRU is supported with
5-level paging as well.

Reviewed by:    alc, kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56415
DeltaFile
+0-3lib/libsys/x86/pkru.3
+0-31 files

HardenedBSD/src ce33f96sys/dev/mlx5/mlx5_en mlx5_en_main.c

mlx5e: Ensure rx timestamps are monotonically increasing

The clock calibration routine currently can result in rx timestamps
jumping backwards, which can confuse the TCP stack.
Ensure they are monotonically increasing by estimating what
we'd calculate as the next timestamp and clamp the calibration
so new timestamps are no earlier in time.

Reviewed by: kib, nickbanks_netflix.com
Tested by: nickbanks_netflix.com
Differential Revision: https://reviews.freebsd.org/D56427
Sponsored by: Netflix
DeltaFile
+50-0sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+50-01 files

HardenedBSD/src ce6b497sys/arm/broadcom/bcm2835 raspberrypi_virtgpio.c

raspberry_virtgpio: fix OF_hasprop() usage

The function returns a bool. This driver was merged recently (by me) and
I missed this instance.

While here, adjust the ofw_bus_status_okay() call similarly. This
function still returns an int, but this usage is more widely used in our
drivers.

No functional change intended.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Fixes:          b60cd486a652 ("ofw: bool-ify OF_hasprop()")
DeltaFile
+2-2sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
+2-21 files

HardenedBSD/src 47b0ac1share/man/man9 OF_getprop.9

OF_getprop.9: update OF_hasprop() signature

The return type has been converted to a bool.

Reported by:    manu
Sponsored by:   The FreeBSD Foundation
Fixes:          b60cd486a652 ("ofw: bool-ify OF_hasprop()")
DeltaFile
+8-4share/man/man9/OF_getprop.9
+8-41 files

HardenedBSD/src 90fc383sys/amd64/amd64 pmap.c, sys/arm/arm pmap-v6.c

pmap: Do not use PMAP_LOCK_INIT with kernel_pmap

The kernel_pmap lock is a bit special: it does not need the DUPOK flag,
and it really belongs to a different lock class.  If it belongs to the
same class as regular pmap locks, then witness may report warnings when
performing UMA allocations under a regular pmap lock, if the allocation
triggers a pmap_growkernel() call.

Replace instances of PMAP_LOCK_INIT(kernel_pmap) with inline mtx_init()
calls to silence some witness warnings for harmless behaviour I see with
some uncommitted test programs.

Reviewed by:    alc, kib
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D56185

(cherry picked from commit c6a1c1260f02e44b7f44b1e3735ce5dbd785544d)
DeltaFile
+1-1sys/amd64/amd64/pmap.c
+1-1sys/arm/arm/pmap-v6.c
+1-1sys/arm64/arm64/pmap.c
+1-1sys/i386/i386/pmap.c
+1-1sys/powerpc/aim/mmu_oea.c
+1-1sys/powerpc/aim/mmu_oea64.c
+6-63 files not shown
+9-99 files

HardenedBSD/src 1379cdesys/kern imgact_elf.c

imgact_elf: Unconditionally initialize a variable in a note handler

In the sb == NULL case, we are computing the size of the note using a
dummy sbuf drain handler which counts bytes and discards the contents of
the buffer, so the fact that "structsize" is uninitialized doesn't
matter.  But, the compiler may complain about this, so we might as well
just initialize it unconditionally to silence the warning, as other
handlers already do.

PR:             292811
MFC after:      1 week

(cherry picked from commit 8a68c2509c00ae0dbeab64064bb600cfac787a73)
DeltaFile
+1-1sys/kern/imgact_elf.c
+1-11 files

HardenedBSD/src 3f68410sys/compat/freebsd32 freebsd32_misc.c

freebsd32: Fix freebsd11_nstat copyout condition

freebsd11_freebsd32_nstat() invoked copyout(2) when
freebsd11_cvtnstat32() failed and skipped copyout on success. This is
backwards.

Fix this to match freebsd11_freebsd32_nlstat() and freebsd11_nstat(),
and only copy the nstat32 result to userspace when conversion succeeds.

Signed-off-by:  Weixie Cui <cuiweixie at gmail.com>
Reviewed by:    mhorne
MFC after:      1 week
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2109

(cherry picked from commit c6224994ac70b4f71ef9e11903bb2e50ed2b1bfe)
DeltaFile
+1-1sys/compat/freebsd32/freebsd32_misc.c
+1-11 files

HardenedBSD/src fb10574sys/arm/broadcom/bcm2835 raspberrypi_virtgpio.c bcm2835_firmware.h, sys/conf files.arm64

bcm2835_virtgpio: Add driver for virtual GPIO controller on some RPi models

This driver enables bcm2835-virtgpio GPIO controller found on RPi3B and
some CM boards. On which, the ACT (green) LED is connected to this
controller. It is essential for FreeBSD to have this driver to control
this LED.

It will be exposed via gpioled(4).

Reviewed by:    mhorne
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D51456

(cherry picked from commit 84c68dbb59df81d5371f0d1eea888d30561d428d)
DeltaFile
+347-0sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
+12-0sys/arm/broadcom/bcm2835/bcm2835_firmware.h
+1-0sys/conf/files.arm64
+360-03 files

HardenedBSD/src 0a5c457lib/libsys mq_open.2

mq_open(2): document sysctl limit EINVAL and ENFILE conditions

Document two missing error conditions for mq_open(2):

- EINVAL: returned when mq_maxmsg exceeds kern.mqueue.maxmsg or
  mq_msgsize exceeds kern.mqueue.maxmsgsize.
- ENFILE: add kern.mqueue.maxmq sysctl name to the existing entry.

PR:             243209
Reviewed by:    mhorne
MFC after:      1 week
Signed-off-by:  Kit Dallege <xaum.io at gmail.com>
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2098

(cherry picked from commit 3e9f4fd6fc50300d052d5619d82a14d3488483d5)
DeltaFile
+22-1lib/libsys/mq_open.2
+22-11 files

HardenedBSD/src 00e0253share/man/man9 malloc.9

malloc.9: adjust flag table indentation

The current indentation is shorter than all but one of these flags. This
renders much more nicely.

MFC after:      3 days

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

HardenedBSD/src 14b1824sys/conf files.arm64

conf: Mark vchiq as depending on fdt

Fix an ACPI only kernel by only building the vchiq files when FDT is
enabled.

Fixes:  745c4aa5e8f0 ("Make BRCM2837 port conform FreeBSD/ARM64 guidelines")
Sponsored by:   Arm Ltd

(cherry picked from commit 7446569bbcb42c08c650a5e1015f544f13066d7f)
DeltaFile
+9-9sys/conf/files.arm64
+9-91 files