HardenedBSD/src 869908busr.bin/less lesspipe.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1usr.bin/less/lesspipe.sh
+1-11 files

HardenedBSD/src 653a013usr.bin/less lesspipe.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1usr.bin/less/lesspipe.sh
+1-11 files

HardenedBSD/src 0ef5177secure/lib/libcrypto/man/man3 Makefile, share/man/man4 multicast.4

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+22-4share/man/man4/multicast.4
+0-1secure/lib/libcrypto/man/man3/Makefile
+22-52 files

HardenedBSD/src 49ab036share/man/man4 multicast.4

multicast.4: Fix disabling multicast forwarding

Reviewed by: markj, glebius
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D55266

(cherry picked from commit f2c2e5b0bf9def01b10651b9802fa38d07d9d265)
DeltaFile
+22-4share/man/man4/multicast.4
+22-41 files

HardenedBSD/src b0476eesecure/lib/libcrypto/man/man3 Makefile

OpenSSL: install EVP_CIPHER_CTX_get_app_data.3 once

A separate EVP_CIPHER_CTX_get_app_data.3 was added in the OpenSSL 3.5.5
import, but the link to EVP_EncryptInit.3 was still being installed
which stomped on the file and created inconsistent entries in the METALOG.

Reviewed by:    emaste
Found by:       package_check script in Cirrus-CI
Fixes:          1731fc70f734 ("OpenSSL: update vendor sources to match 3.5.5 content")
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D55332

(cherry picked from commit c4130a8a84e1ce0fc9c05d2b48f83e66ade302aa)
DeltaFile
+0-1secure/lib/libcrypto/man/man3/Makefile
+0-11 files

HardenedBSD/src dae848eshare/misc committers-ports.dot, sys/dev/acpi_support acpi_panasonic.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+36-0sys/dev/acpi_support/acpi_panasonic.c
+4-0share/misc/committers-ports.dot
+40-02 files

HardenedBSD/src 4b799aashare/misc committers-ports.dot, sys/dev/acpi_support acpi_panasonic.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+36-0sys/dev/acpi_support/acpi_panasonic.c
+4-0share/misc/committers-ports.dot
+40-02 files

HardenedBSD/src f602d62sys/dev/vt vt_core.c, sys/teken teken.c teken.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+80-57tools/test/hwpmc/pmctest.py
+6-0sys/dev/vt/vt_core.c
+4-0sys/teken/teken.c
+2-0sys/teken/teken.h
+92-574 files

HardenedBSD/src b4305c9usr.bin/less lesspipe.sh

lesspipe: Allow zstd to operate on a symlink

By default zstd refuses to operate on symlinks, so for example
`zless /var/crash/vmcore.last.zst` failed to view the uncompressed core
file.  Add -f to the zstd command line to allow operation on symlinks.

Reviewed by:    delphij
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55101
DeltaFile
+1-1usr.bin/less/lesspipe.sh
+1-11 files

HardenedBSD/src 16822dasys/dev/acpi_support acpi_panasonic.c

acpi_panasonic: Clear wireless RF_KILL on boot and resume

On Panasonic FZ-Y1 and similar models, the EC latches RF_KILL on
shutdown and suspend when battery is at certain level, causing wireless
to boot with hard block.

Call WLSW.SHRF during attach and resume to clear the block.

Tested on Panasonic FZ-Y1 with Intel Wireless 7265.

Reviewed by:    adrian, obiwac
Approved by:    adrian, obiwac
Differential Revision:  https://reviews.freebsd.org/D55265
DeltaFile
+36-0sys/dev/acpi_support/acpi_panasonic.c
+36-01 files

HardenedBSD/src 477ab96share/misc committers-ports.dot

Add records about new ports committer (nxjoseph)

Update Mentor and Mentee Information to follow step
5 of the Committers Guide.

Reviewed by:    osa, vvd (mentors)
Approved by:    osa (mentor)
Differential Revision:  https://reviews.freebsd.org/D55457
DeltaFile
+4-0share/misc/committers-ports.dot
+4-01 files

HardenedBSD/src 3ca02a7sys/dev/vt vt_core.c, sys/teken teken.c teken.h

vt: Fix handling of backtab

PR: 292463
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2002

(cherry picked from commit 5fec99caff3ac4f476bb88078ebf85fbecf6afb3)
DeltaFile
+6-0sys/dev/vt/vt_core.c
+4-0sys/teken/teken.c
+2-0sys/teken/teken.h
+12-03 files

HardenedBSD/src 4a9a270tools/test/hwpmc pmctest.py

Split counting from sampling.

(cherry picked from commit 77153a491e3b31475f5faddb21271a0a8e0d4a9b)
DeltaFile
+21-4tools/test/hwpmc/pmctest.py
+21-41 files

HardenedBSD/src 2b00065tools/test/hwpmc pmctest.py

Extend the script to collect gprof data

While we're at it, switch to simple waiting from communicate() calls.

(cherry picked from commit e2bedc7d69926426a710d035df51e0a0812d38b1)
DeltaFile
+27-4tools/test/hwpmc/pmctest.py
+27-41 files

HardenedBSD/src 4db1b93tools/test/hwpmc pmctest.py

Correct the data collection arguments.  Add proper tempdirs.

(cherry picked from commit e018fedef0a6389240322da9fa4b9fa9971f6e59)
DeltaFile
+6-3tools/test/hwpmc/pmctest.py
+6-31 files

HardenedBSD/src 076e753tools/test/hwpmc pmctest.py

Start adding an exercise mode for programs under test.

In exercise mode we collect data for every available counter on a
program and keep all of that in a directory in /tmp.

(cherry picked from commit 4a1b69ade6b5e8665dfb4d0cb683854705192a68)
DeltaFile
+24-9tools/test/hwpmc/pmctest.py
+24-91 files

HardenedBSD/src d967f92tools/test/hwpmc pmctest.py

Convert fully to Python 3.  Remove licence text, only keep SPDX.

Update to use argparse rather than OptionParser (now deprecated).

(cherry picked from commit eb1c0d74cbb99f329767b3d565ae57a3ec032bee)
DeltaFile
+19-54tools/test/hwpmc/pmctest.py
+19-541 files

HardenedBSD/src ee81c7fbin/sh sh.1, libexec/rc debug.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+4-0bin/sh/sh.1
+2-1libexec/rc/rc.d/virtual_oss
+1-1libexec/rc/debug.sh
+1-1sys/sys/_offsetof.h
+8-34 files

HardenedBSD/src 1585388bin/sh sh.1, libexec/rc debug.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+4-0bin/sh/sh.1
+2-1libexec/rc/rc.d/virtual_oss
+1-1libexec/rc/debug.sh
+1-1sys/sys/_offsetof.h
+8-34 files

HardenedBSD/src 06b4665libexec/rc/rc.d virtual_oss

virtual_oss: use hw.snd.default_unit by default

Reviewed by:    christos
MFC after:      1 week
Signed-off-by:  Quentin Thébault <quentin.thebault at defenso.fr>
Sponsored by:   Defenso
PR:             293130
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2043
DeltaFile
+2-1libexec/rc/rc.d/virtual_oss
+2-11 files

HardenedBSD/src 0076f6dsys/sys _offsetof.h

sys/_offsetof.h: pacify GCC 12's macro redefinition check

GCC 12 has a strict definition of identity (all characters including
whitespace must be identical) when comparing "redefined" macros. Make
our definition exactly match the stddef.h that comes with GCC to fix
test-includes of netlink/netlink_snl.h.  (Note: later versions of GCC
are a bit more flexible and don't have this problem.)

Reported by:    des
Sponsored by:   DARPA, AFRL
Fixes:          2adc3f0db187 ("stddef.h: centralize definition of offsetof()")
DeltaFile
+1-1sys/sys/_offsetof.h
+1-11 files

HardenedBSD/src ab835b3libexec/rc debug.sh

debug.sh: Fix a typo

MFC after:              3 days
Reviewed by:            emaste, guest-seuros, sjg, ziaee
Differential Revision:  https://reviews.freebsd.org/D55416
DeltaFile
+1-1libexec/rc/debug.sh
+1-11 files

HardenedBSD/src 9a20515bin/sh sh.1

sh.1: Add .sh_history and .shrc to FILES

MFC after:              3 days
Reviewed by:            bapt (previous), jilles, tembun at bk.ru
Differential Revision:  https://reviews.freebsd.org/D55295
DeltaFile
+4-0bin/sh/sh.1
+4-01 files

HardenedBSD/src fbb618ausr.sbin/traceroute as.c traceroute.c, usr.sbin/traceroute6 traceroute6.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+20-4usr.sbin/traceroute/as.c
+21-2usr.sbin/traceroute6/traceroute6.c
+19-2usr.sbin/traceroute/traceroute.c
+1-1usr.sbin/traceroute/as.h
+61-94 files

HardenedBSD/src db80ff6usr.sbin/traceroute as.c traceroute.c, usr.sbin/traceroute6 traceroute6.c

traceroute: MFC: graceful recover after networking errors with as_server

Currently, the traceroute[6] utility does not check
for possible networking errors while talking to as_server
in case of "traceroute -a". Meantime, there is a common case
when trace is long and it has many non-responding hops
(shown as '* * *'), so as_server aborts our connection,
hence no AS numbers shown for the rest of trace.

Somewhat artifical way to reproduce the problem:

traceroute to 57.144.244.1 (57.144.244.1), 80 hops max, 48 byte packets
 5  [AS174] be2950.ccr42.fra05.atlas.cogentco.com (154.54.72.42)  74.277 ms  9.605 ms  9.599 ms
 6  [AS174] 149.11.228.19 (149.11.228.19)  9.506 ms  9.466 ms  9.420 ms
 7  [AS33182] po172.asw02.fra5.tfbnw.net (129.134.108.146)  9.725 ms  9.874 ms  9.696 ms
 8  [AS32934] psw04.fra5.tfbnw.net (157.240.59.85)  8.718 ms  8.691 ms  8.618 ms
 9  * * *
10  [AS0] edge-star-mini-shv-01-fra5.facebook.com (57.144.244.1)  9.747 ms  9.815 ms  9.699 ms


    [10 lines not shown]
DeltaFile
+20-4usr.sbin/traceroute/as.c
+21-2usr.sbin/traceroute6/traceroute6.c
+19-2usr.sbin/traceroute/traceroute.c
+1-1usr.sbin/traceroute/as.h
+61-94 files

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