HardenedBSD/src 065e0f3usr.sbin/freebsd-update freebsd-update.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+8-8usr.sbin/freebsd-update/freebsd-update.sh
+8-81 files

HardenedBSD/src d653ecausr.sbin/freebsd-update freebsd-update.sh

freebsd-update: Add some diagnositic information for a failure case

Users report freebsd-update failing with "The update metadata index is
correctly signed, but failed an integrity check."  Add a hint at which
of the cases is failing to help track down the issue.

PR:             264205
Reviewed by:    dch
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52222

(cherry picked from commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7)
DeltaFile
+8-8usr.sbin/freebsd-update/freebsd-update.sh
+8-81 files

HardenedBSD/src 7831e55bin/sh jobs.c, bin/sh/tests/execution bg14.0 Makefile

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+45-7sys/dev/dpaa2/dpaa2_ni.c
+7-3sys/net/iflib.c
+9-0bin/sh/tests/execution/bg14.0
+5-1bin/sh/jobs.c
+2-1release/scripts/pkg-stage.sh
+1-0bin/sh/tests/execution/Makefile
+69-126 files

HardenedBSD/src c4c356ebin/sh jobs.c, bin/sh/tests/execution bg14.0 Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+45-7sys/dev/dpaa2/dpaa2_ni.c
+7-3sys/net/iflib.c
+9-0bin/sh/tests/execution/bg14.0
+5-1bin/sh/jobs.c
+2-1release/scripts/pkg-stage.sh
+1-0bin/sh/tests/execution/Makefile
+69-126 files

HardenedBSD/src 9ea6ee3release/scripts pkg-stage.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-1release/scripts/pkg-stage.sh
+2-11 files

HardenedBSD/src 896dc30sys/net iflib.c

iflib: fix iflib_simple_transmit() when interface is down

Use the same check as iflib_if_transmit() to detect when the
interface is down and return the proper error code, and also
free the mbuf.

This fixes an mbuf leak when a member of a lagg is brought
down (and probably many other scenarios).

Sponsored by: Netflix
DeltaFile
+7-3sys/net/iflib.c
+7-31 files

HardenedBSD/src a731cb9sys/dev/dpaa2 dpaa2_ni.c

dpaa2: Setup interface caps on attach

39d4094173f9 ("epair: add support for checksum offloading") revealed
that HW checksum offloading is not enabled when the dpaa2_ni driver
is attached despite being declared and enabled on the dpni interface.

I modified dpaa2_ni_setup_if_caps to take into account both IPv4 and
IPv6 checksum offloading capabilities and added a call to re-configure
interface capabilities on attach to fix it.

Reviewed by:    bz
Fixes:          39d4094173f9 ("epair: add support for checksum offloading")
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D53436
DeltaFile
+45-7sys/dev/dpaa2/dpaa2_ni.c
+45-71 files

HardenedBSD/src f44ac8cbin/sh jobs.c, bin/sh/tests/execution bg14.0 Makefile

sh: Fix job pointer invalidation with trapsasync

Calling dotrap() can do almost anything, including reallocating the
jobtab array. Convert the job pointer to an index before calling
dotrap() and then restore a proper job pointer afterwards.

PR:             290330
Reported by:    bdrewery
Reviewed by:    bdrewery
Differential Revision:  https://reviews.freebsd.org/D53793
DeltaFile
+9-0bin/sh/tests/execution/bg14.0
+5-1bin/sh/jobs.c
+1-0bin/sh/tests/execution/Makefile
+15-13 files

HardenedBSD/src 142df24release/scripts pkg-stage.sh

release: Remove KDE from dvd1.iso

Prior to this commit, we were shipping 2155 MB of packages (from the
ports tree, not counting pkgbase) on dvd1.iso.  Due to the amount of
space required by shipping pkgbase packages *and* distribution sets
on the DVD images, we only have 1696 MB available if we want to fit
into the 4.7 GB limit for DVDs.  Many users have indicated that this
is indeed important.

It is practically impossible to hit this target without removing KDE;
while KDE and its dependencies narrowly fit (1550 MB), we exceed the
limit as soon as we include either of freebsd-doc-all or gnome.  While
we would pick KDE over GNOME (surveys regularly indicate that KDE is
the more widely used of the two), we believe that documentation is the
most important thing to include.

Since removing KDE leaves a bit of extra space, add editors/emacs and
editors/vim.  This takes the 15.0 amd64 dvd1.iso up to 4.689 GB. [1]


    [5 lines not shown]
DeltaFile
+2-1release/scripts/pkg-stage.sh
+2-11 files

HardenedBSD/src 6cc6bebrelease/scripts pkg-stage.sh

release: Remove KDE from dvd1.iso

Prior to this commit, we were shipping 2155 MB of packages (from the
ports tree, not counting pkgbase) on dvd1.iso.  Due to the amount of
space required by shipping pkgbase packages *and* distribution sets
on the DVD images, we only have 1696 MB available if we want to fit
into the 4.7 GB limit for DVDs.  Many users have indicated that this
is indeed important.

It is practically impossible to hit this target without removing KDE;
while KDE and its dependencies narrowly fit (1550 MB), we exceed the
limit as soon as we include either of freebsd-doc-all or gnome.  While
we would pick KDE over GNOME (surveys regularly indicate that KDE is
the more widely used of the two), we believe that documentation is the
most important thing to include.

Since removing KDE leaves a bit of extra space, add editors/emacs and
editors/vim.  This takes the 15.0 amd64 dvd1.iso up to 4.689 GB. [1]


    [3 lines not shown]
DeltaFile
+2-1release/scripts/pkg-stage.sh
+2-11 files

HardenedBSD/src c3fcd3fcontrib/libarchive/libarchive archive_read_support_filter_lz4.c, contrib/libarchive/libarchive/test test_compat_lz4_skippable_frames_B4.tar.lz4.uu

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+6,739-0contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu
+86-540usr.sbin/bhyve/net_backend_slirp.c
+570-0usr.sbin/bhyve/slirp/slirp-helper.c
+0-365usr.sbin/bhyve/libslirp.h
+365-0usr.sbin/bhyve/slirp/libslirp.h
+70-14contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
+7,830-91944 files not shown
+8,182-98650 files

HardenedBSD/src 3cb36dbcontrib/libarchive/libarchive archive_read_support_filter_lz4.c, contrib/libarchive/libarchive/test test_compat_lz4_skippable_frames_B4.tar.lz4.uu

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+6,739-0contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu
+86-540usr.sbin/bhyve/net_backend_slirp.c
+570-0usr.sbin/bhyve/slirp/slirp-helper.c
+0-365usr.sbin/bhyve/libslirp.h
+365-0usr.sbin/bhyve/slirp/libslirp.h
+70-14contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
+7,830-91944 files not shown
+8,182-98650 files

HardenedBSD/src 6561a21. UPDATING, sys/dev/iicbus iichid.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+10-0UPDATING
+8-1sys/kern/vfs_inotify.c
+6-1sys/dev/iicbus/iichid.c
+24-23 files

HardenedBSD/src fa546e9. UPDATING

UPDATING: Document FreeBSD-base pkg .conf shuffle

Reminded by:    yasu
MFC after:      3 days

(cherry picked from commit 6ccdd2fc2328dd81b9c645fba025d01052a3c1a1)
DeltaFile
+10-0UPDATING
+10-01 files

HardenedBSD/src d61be9dsys/dev/iicbus iichid.c

iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros.

Our recent changes to iichid.c has caused us to attempt to read a
full REPORT instead, and at least one keyboard hangs solid when we
do that.

This patch changes us to be spec-compliant.

Differential Revision: https://reviews.freebsd.org/D53803
MFC after: 1 day
Approved by: re(ccperciva)

(cherry picked from commit 5d53462af1d0e892da77b52b701b337119b2f5d7)
DeltaFile
+6-1sys/dev/iicbus/iichid.c
+6-11 files

HardenedBSD/src 1f6e3absys/kern vfs_inotify.c

inotify: Work around the vput() bug directly

For 15.0, apply a minimal fix which at least ensures that inotify can't
trigger the latent race described in commit 99cb3dca4773 ("vnode: Rework
vput() to avoid holding the vnode lock after decrementing").

Reviewed by:    olce, kib
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53774

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

HardenedBSD/src 0e62ebdusr.sbin/bhyve net_backend_slirp.c libslirp.h, usr.sbin/bhyve/slirp slirp-helper.c libslirp.h

bhyve: Move the slirp backend out into a separate process

The previous implementation implemented hostfwd rules which would allow
the host to connect to the guest via a NATed TCP connection.  libslirp
also permits NAT in the other direction, but this was prevented by
bhyve's capsicum sandbox.

To make the slirp backend more useful, split the backend out into a
separate process which does not enter capability mode if outbound
connections are permitted (enabled by setting the new "open" keyword).
The process communicates with the bhyve network frontend (typically a
virtio network interface) using a unix SOCK_SEQPACKET socket pair.  If
the bhyve process exits, the helper will automatically exit.

Aside from this restructuring, there is not much actual change.  Many
slirp parameters are still hard-coded for now, though this may change.
The "restricted" feature is toggled by the new "open" keyword; in
particular, the backend is restricted by default for compatibility with
15.0 and 14.3.

    [9 lines not shown]
DeltaFile
+86-540usr.sbin/bhyve/net_backend_slirp.c
+570-0usr.sbin/bhyve/slirp/slirp-helper.c
+0-365usr.sbin/bhyve/libslirp.h
+365-0usr.sbin/bhyve/slirp/libslirp.h
+11-0usr.sbin/bhyve/slirp/Makefile
+10-1usr.sbin/bhyve/bhyve.8
+1,042-9061 files not shown
+1,044-9067 files

HardenedBSD/src e22cc77sys/kern kern_jaildesc.c

jail: Make jaildesc_ops const

No functional change intended.

MFC after:      1 week
DeltaFile
+1-1sys/kern/kern_jaildesc.c
+1-11 files

HardenedBSD/src 843a4adusr.sbin/ypldap ldapclient.c

ypldap(8): Fix a typo in a debug message

- s/unexpect/unexpected/

MFC after:      5 days
DeltaFile
+1-1usr.sbin/ypldap/ldapclient.c
+1-11 files

HardenedBSD/src 66d4a37usr.sbin/lpr/lpr lpr.1

lpr(1): Fix a typo in a debug message

- s/unexpect/unexpected/

MFC after:      5 days
DeltaFile
+1-1usr.sbin/lpr/lpr/lpr.1
+1-11 files

HardenedBSD/src 73a026dlibexec/nuageinit nuageinit

nuageinit: Fix a typo in an error message

- s/outout/output/

MFC after:      3 days
DeltaFile
+1-1libexec/nuageinit/nuageinit
+1-11 files

HardenedBSD/src 16d8aecusr.sbin/cxgbetool tcbinfot7.c

cxgbetool(8): Fix a typo in the stats description

- s/addres/address/

MFC after:      3 days
DeltaFile
+1-1usr.sbin/cxgbetool/tcbinfot7.c
+1-11 files

HardenedBSD/src 58b86e4libexec/flua/libfreebsd/kenv freebsd.kenv.3lua, libexec/flua/libfreebsd/sys/linker freebsd.sys.linker.3lua

libexec/lua: Fix two typos in the manual pages

- s/environnement/environment/
- s/interger/integer/

MFC after:      3 days
DeltaFile
+1-1libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua
+1-1libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua
+2-22 files

HardenedBSD/src 6f14b60stand/lua config.lua.8 loader.lua.8

stand/lua: Fix two typos in the manual pages

- s/Additionnaly/Additionally/
- s/commmand/command/

MFC after:      3 days
DeltaFile
+1-1stand/lua/config.lua.8
+1-1stand/lua/loader.lua.8
+2-22 files

HardenedBSD/src 64bbcffusr.sbin/moused/moused moused.conf.5 moused.8

moused(8): Fix a couple of typos in the manual pages

- s/compatibiliy/compatibility/
- s/rewriten/rewritten/
- s/derrived/derived/
- s/suppported/supported/
- s/Horisontal/Horizontal/
- s/thesholds/thresholds/

MFC after:      3 days
DeltaFile
+5-5usr.sbin/moused/moused/moused.conf.5
+2-2usr.sbin/moused/moused/moused.8
+7-72 files

HardenedBSD/src 9334fa3lib/libc/stdlib exit.3

exit.3: Fix a typo in the manual page

- s/avaliable/available/

MFC after:      3 days
DeltaFile
+1-1lib/libc/stdlib/exit.3
+1-11 files

HardenedBSD/src d76ea20lib/libc/db/mpool mpool.c

mpool(3): Fix a typo in statistical message

- s/cacheing/caching/

MFC after:      5 days
DeltaFile
+1-1lib/libc/db/mpool/mpool.c
+1-11 files

HardenedBSD/src 32605b1sys/tools/gdb freebsd.py pcpu.py

gdb: Fix some PEP 8 violations

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

MFC after:      1 week
DeltaFile
+3-0sys/tools/gdb/freebsd.py
+3-0sys/tools/gdb/pcpu.py
+2-1sys/tools/gdb/vnet.py
+2-0sys/tools/gdb/acttrace.py
+10-14 files

HardenedBSD/src 007679acontrib/libarchive/libarchive archive_read_support_filter_lz4.c archive_read_support_filter_zstd.c, contrib/libarchive/libarchive/test test_compat_lz4_skippable_frames_B4.tar.lz4.uu test_read_format_7zip_issue2765.c

libarchive: merge from vendor branch

libarchive 3.8.3

Important bugfixes:
 #2753 lib: Create temporary files in the target directory
 #2768 lha: Fix for an out-of-bounds buffer overrun when using
       p[H_LEVEL_OFFSET]
 #2769 7-zip: Fix a buffer overrun when reading truncated 7zip headers
 #2771 lz4 and zstd: Support both lz4 and zstd data with leading
       skippable frames

Obtained from:  libarchive
Vendor commit:  1368b08875351df8aa268237b882c8f4ceb0882d
MFC after:      1 week
DeltaFile
+6,739-0contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu
+70-14contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
+55-12contrib/libarchive/libarchive/archive_read_support_filter_zstd.c
+51-0contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.c
+38-0contrib/libarchive/libarchive/test/test_archive_string.c
+34-0contrib/libarchive/libarchive/module.modulemap
+6,987-2620 files not shown
+7,110-6126 files

HardenedBSD/src f1aa8e6libarchive archive_read_support_filter_lz4.c archive_read_support_filter_zstd.c, libarchive/test test_compat_lz4_skippable_frames_B4.tar.lz4.uu test_read_format_7zip_issue2765.c

Update vendor/libarchive to 3.8.3

Important bugfixes:
     #2753 lib: Create temporary files in the target directory
     #2768 lha: Fix for an out-of-bounds buffer overrun when using
           p[H_LEVEL_OFFSET]
     #2769 7-zip: Fix a buffer overrun when reading truncated 7zip headers
     #2771 lz4 and zstd: Support both lz4 and zstd data with leading
           skippable frames

Obtained from:  libarchive
Vendor commit:  1368b08875351df8aa268237b882c8f4ceb0882d
DeltaFile
+6,739-0libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu
+70-14libarchive/archive_read_support_filter_lz4.c
+55-12libarchive/archive_read_support_filter_zstd.c
+51-0libarchive/test/test_read_format_7zip_issue2765.c
+38-0libarchive/test/test_archive_string.c
+34-0libarchive/module.modulemap
+6,987-2627 files not shown
+7,126-6933 files