HardenedBSD/ports beaa04enet/proxychains Makefile, ports-mgmt/pkg distinfo Makefile

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+3-9ports-mgmt/pkg/distinfo
+0-4net/proxychains/Makefile
+1-1ports-mgmt/pkg/Makefile
+4-143 files

HardenedBSD/ports 1f07b5edatabases/cassandra4/files/maven build.xml, devel/uv distinfo Makefile.crates

Merge remote-tracking branch 'origin/freebsd/main' into hardenedbsd/main

Conflicts:
        net/proxychains/Makefile (unresolved)
        ports-mgmt/pkg/distinfo (unresolved)
DeltaFile
+1,425-424www/firefox/files/patch-libwebrtc-generated
+477-439devel/uv/distinfo
+511-255databases/cassandra4/files/maven/build.xml
+235-319sysutils/tailspin/distinfo
+237-218devel/uv/Makefile.crates
+116-158sysutils/tailspin/Makefile.crates
+3,001-1,813902 files not shown
+9,132-6,131908 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/ports b96a271www/firefox/files patch-libwebrtc-generated patch-pipewire_init

www/firefox: update to 150.0 (rc1)

Release Notes (soon):
  https://www.firefox.com/en-US/firefox/150.0/releasenotes/
DeltaFile
+1,425-424www/firefox/files/patch-libwebrtc-generated
+59-44www/firefox/files/patch-pipewire_init
+35-0www/firefox/files/patch-ipc_glue_ForkServer.cpp
+19-13www/firefox/files/patch-python_sites_mach.txt
+19-0www/firefox/files/patch-xpcom_base_nsMemoryInfoDumper.cpp
+17-0www/firefox/files/patch-python_sites_build.txt
+1,574-4812 files not shown
+1,579-4868 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/ports 95e126bdatabases/cassandra4/files/maven build.xml build-bench.xml

databases/cassandra4: Update to 4.1.11

Announcement:
https://lists.apache.org/thread/5l092w410n91jxp0bhl0phkr6j87qpxj

Changes:
https://github.com/apache/cassandra/blob/cassandra-4.1.11/CHANGES.txt

Release Notes:
https://github.com/apache/cassandra/blob/cassandra-4.1.11/NEWS.txt

PR:     286364
DeltaFile
+511-255databases/cassandra4/files/maven/build.xml
+137-0databases/cassandra4/files/maven/build-bench.xml
+115-0databases/cassandra4/files/maven/checkstyle.xml
+66-33databases/cassandra4/files/maven/build-owasp.xml
+55-38databases/cassandra4/files/maven/build-rat.xml
+76-0databases/cassandra4/files/maven/dependency-check-suppressions.xml
+960-32623 files not shown
+1,348-50729 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/ports 49fa297ports-mgmt/pkg distinfo

ports-mgmt/pkg: better with distinfo
DeltaFile
+3-3ports-mgmt/pkg/distinfo
+3-31 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/ports 11a1518devel/p5-Log-Dispatch-File-Rolling Makefile, devel/p5-Log-Dispatch-File-Rolling/files patch-lib_Log_Dispatch_File_Rolling.pm

devel/p5-Log-Dispatch-File-Rolling: patch for perl 5.40

The attached patch fixes this message:

Attempt to call undefined import method with arguments ("2.37")
via package "Log::Dispatch::File" (Perhaps you forgot to load the
package?) at /usr/local/lib/perl5/site_perl/Log/Dispatch/File/Rolling.pm line 8.

PR:             288790
Approved by:    maintainer timeout (8 months)
DeltaFile
+10-1devel/p5-Log-Dispatch-File-Rolling/files/patch-lib_Log_Dispatch_File_Rolling.pm
+1-1devel/p5-Log-Dispatch-File-Rolling/Makefile
+11-22 files

HardenedBSD/ports b199a8dports-mgmt/pkg pkg-plist Makefile

ports-mgmt/pkg: update to 2.7.4

- repo: do not delete repositories in overrides, simply disable them
- query: fix %y/%Y
- Declare CheriBSD and CheriABI OS and ABI
DeltaFile
+2-2ports-mgmt/pkg/pkg-plist
+1-1ports-mgmt/pkg/Makefile
+3-32 files

HardenedBSD/ports 12dc3fctextproc/py-zensical distinfo Makefile

textproc/py-zensical: Update to 0.0.33

Approved by:    kai
Changelog:      https://github.com/zensical/zensical/releases/tag/v0.0.33
Differential Revision:  https://reviews.freebsd.org/D56418
DeltaFile
+3-3textproc/py-zensical/distinfo
+3-3textproc/py-zensical/Makefile
+6-62 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

HardenedBSD/src 9280919share/man/man4 hwpmc.4

hwpmc.4: correct stale default values and update diagnostics

The default values documented for kern.hwpmc.logbuffersize (4KB) and
kern.hwpmc.nbuffers_pcpu (64) have been incorrect since 2981a3420cb1
(2018), which updated the compiled defaults but did not update the
man page.

- Correct logbuffersize default from 4KB to 256KB, add 16MB maximum
- Correct nbuffers_pcpu default from 64 to 32, document 32MB per-CPU
  product limit with kern.hwpmc.logbuffersize
- Update DIAGNOSTICS section to reflect current warning messages

Reviewed by:    mhorne
MFC after:      1 week
Sponsored by:   NLINK (nlink.com.br)
Differential Revision:  https://reviews.freebsd.org/D56050

(cherry picked from commit 2318ea10a3afb66c51078483f74c1a622811a619)
DeltaFile
+19-6share/man/man4/hwpmc.4
+19-61 files

HardenedBSD/src 290a7adsys/dev/hwpmc hwpmc_logging.c, sys/sys pmc.h

hwpmc: improve diagnostic messages for invalid tunables

Replace printf() with log(LOG_WARNING, ...) in pmclog_initialize()
so that tunable validation failures are visible in dmesg and
/var/log/messages rather than only on the early console.

Also improve the messages to report both the invalid value and the
default it resets to, making it easier for users to understand why
their tunable was ignored.

While here, adjust some whitespacing/style.

Reviewed by:    Ali Mashtizadeh <ali at mashtizadeh.com>, mhorne
MFC after:      1 week
Sponsored by:   NLINK (nlink.com.br)
Differential Revision:  https://reviews.freebsd.org/D56029

(cherry picked from commit b3a18736ec2fc2bd097995dedd8d09e79bcb2056)
DeltaFile
+26-9sys/dev/hwpmc/hwpmc_logging.c
+2-0sys/sys/pmc.h
+28-92 files

HardenedBSD/src f72a161sys/dev/hwpmc hwpmc_mod.c

hwpmc: Use rdtsc instead of rdtscp for timestamps

No need for a barrier here, we are inside an NMI handler and executing a
number of serializing instructions with stronger semantics. Reducing
this overhead will increase our maximum safe sampling rate.

Tested by:      Paulo Fragoso <paulo at nlink.com.br>
Reviewed by:    mhorne
MFC after:      1 week
Sponsored by:   Netflix
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2076

(cherry picked from commit 39515d8b623a2be39d0c42a537fd9a17c417ff6e)
DeltaFile
+3-5sys/dev/hwpmc/hwpmc_mod.c
+3-51 files

HardenedBSD/src 88c2e97. ObsoleteFiles.inc

ObsoleteFiles.inc: remove stale allwinner pages

These were moved out of man/man4/arm into man/man4. Add entries to catch
the stale copies.

Fixes:  15c79c6fa608 ("man4: move allwinner pages and logic to a standard place")

(cherry picked from commit 1c9ca4cf71841d5f6cee070143b9e29d541e4124)
DeltaFile
+9-0ObsoleteFiles.inc
+9-01 files

HardenedBSD/src 21a8bd0. ObsoleteFiles.inc

ObsoleteFiles.inc: correct entry for zpfind.9.gz

It needs the .gz suffix.

Fixes:  2ace05b65a2c9 ("pfind(9): follow-up fixes and improvements")

(cherry picked from commit 9c800a103c03dd4a32f1f6ac8f409fe38f304848)
DeltaFile
+1-1ObsoleteFiles.inc
+1-11 files

HardenedBSD/src 43f87c1usr.sbin/jail Makefile

usr.sbin/jail/Makefile: remove riscv linker workaround

It links fine with newer binutils 2.44 (and GCC 15), so the workaround
can be dropped.

Reviewed by:    emaste
PR:             242109
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55083

(cherry picked from commit 39148cbead211163f7e5a203d7c88ece5c3e30e0)
DeltaFile
+0-7usr.sbin/jail/Makefile
+0-71 files