FreeBSD/src ba9aaedsys/dev/ciss cissvar.h ciss.c

Revert "ciss: Add max physical target"

This reverts commit 45645518ea19ccb4761aee3a525aab2f323d37d4.

Although this changed looks like it should just be a harmless change to
bookkeeping, it turns out that it changes the termination condition of
the initial device scan, resulting in it never finishing. This causes
the boot to hang forever coming up. Since I don't have good access to
hardware, I'm reverting until the exact details can be sorted out.

Reported by: Edward Scroop
Sponsored by: Netflix
MFC After: 1 week
DeltaFile
+1-10sys/dev/ciss/ciss.c
+0-1sys/dev/ciss/cissvar.h
+1-112 files

FreeBSD/src eb0290fusr.sbin/ypserv/common yplib_host.h yplib_host.c

ypserv: Add SPDX-License-Identifier tags

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation

(cherry picked from commit ac8189e6de8fb5de31d5b662f1d406f27285ac74)
DeltaFile
+2-0usr.sbin/ypserv/common/yplib_host.h
+2-0usr.sbin/ypserv/common/yplib_host.c
+4-02 files

FreeBSD/src de3fa71sbin/conscontrol conscontrol.8, share/man/man4 smb.4 ahd.4

Correct Identifer typo in SPDX tags

(cherry picked from commit 07d29f9c177e731e4497bedf5fde09176c90b444)
DeltaFile
+1-1usr.sbin/kbdcontrol/kbdcontrol.1
+1-1usr.sbin/devinfo/devinfo.8
+1-1usr.bin/man/manpath.1
+1-1share/man/man4/smb.4
+1-1share/man/man4/ahd.4
+1-1sbin/conscontrol/conscontrol.8
+6-66 files

FreeBSD/src 7a4607eusr.sbin/yppush yppush_extern.h

yppush: Add SPDX-License-Identifier tag

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation

(cherry picked from commit d6bec77ad8f80438f10bb3fe7a8bc8e9265e2858)
DeltaFile
+2-0usr.sbin/yppush/yppush_extern.h
+2-01 files

FreeBSD/src f91e124usr.sbin/virtual_oss/virtual_bt_speaker bt_speaker.c, usr.sbin/virtual_oss/virtual_equalizer equalizer.c

virtual_oss: Add SPDX-License-Identifier tags

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation

(cherry picked from commit 6d5a428056b52c7ce47b01d6af8aaaff6feecfdd)
DeltaFile
+2-0usr.sbin/virtual_oss/virtual_oss/ctl.c
+2-0usr.sbin/virtual_oss/virtual_oss/compressor.c
+2-0usr.sbin/virtual_oss/virtual_oss/backend.h
+2-0usr.sbin/virtual_oss/virtual_oss/audio_delay.c
+2-0usr.sbin/virtual_oss/virtual_equalizer/equalizer.c
+2-0usr.sbin/virtual_oss/virtual_bt_speaker/bt_speaker.c
+12-010 files not shown
+32-016 files

FreeBSD/src d5de38ebin/sync sync.c

sync: Add SPDX-License-Identifier tags

Reviewed by: immp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55216

(cherry picked from commit 0486b5243f094160fd782c1dc15f28392072b259)
DeltaFile
+2-0bin/sync/sync.c
+2-01 files

FreeBSD/src c8e1d0abin/setfacl util.c setfacl.h

setfacl: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55212

(cherry picked from commit 575e89cb1786a00387e9c1391055263068c4e0ae)
DeltaFile
+2-0bin/setfacl/util.c
+2-0bin/setfacl/setfacl.h
+2-0bin/setfacl/setfacl.c
+2-0bin/setfacl/remove.c
+2-0bin/setfacl/merge.c
+2-0bin/setfacl/mask.c
+12-01 files not shown
+14-07 files

FreeBSD/src 95f82dfbin/stty print.c modes.c

stty: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55217

(cherry picked from commit 743a7f954c2720fa318e9e1f7ca1c549977560f9)
DeltaFile
+2-0bin/stty/print.c
+2-0bin/stty/modes.c
+2-0bin/stty/key.c
+2-0bin/stty/gfmt.c
+2-0bin/stty/extern.h
+2-0bin/stty/cchar.c
+12-03 files not shown
+18-09 files

FreeBSD/src 5c81b93usr.bin/resizewin resizewin.c

resizewin: Add SPDX-License-Identifier tags

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation

(cherry picked from commit c33076859fa319396beb10470ad4101f1c3c5571)
DeltaFile
+2-0usr.bin/resizewin/resizewin.c
+2-01 files

FreeBSD/src 8d2aee9bin/sh exec.c eval.h

sh: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55213

(cherry picked from commit 632c73b4bfd48b89b7c2318079fd50835b8b5016)
DeltaFile
+2-0bin/sh/exec.c
+2-0bin/sh/eval.h
+2-0bin/sh/eval.c
+2-0bin/sh/error.h
+2-0bin/sh/error.c
+2-0bin/sh/cd.h
+12-016 files not shown
+44-022 files

FreeBSD/src 3e522f2bin/sleep sleep.c

sleep: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55215

(cherry picked from commit f4eccc3add7b91532396970913792fa264fc5430)
DeltaFile
+2-0bin/sleep/sleep.c
+2-01 files

FreeBSD/src 48a89d2bin/pwait pwait.c

pwait: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55211

(cherry picked from commit 0a1fd13e73200756b61d06c949622b4f6bba7dad)
DeltaFile
+2-0bin/pwait/pwait.c
+2-01 files

FreeBSD/src e20dfacbin/kenv kenv.c

kenv: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55210

(cherry picked from commit 5705d171dacc69bcdbfc17849a9dc898249dae2e)
DeltaFile
+2-0bin/kenv/kenv.c
+2-01 files

FreeBSD/src f5c5358bin/getfacl getfacl.c

getfacl: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55209

(cherry picked from commit 6e8bb77b4c23837d95ba9fb50b41b948c21cbdc3)
DeltaFile
+2-0bin/getfacl/getfacl.c
+2-01 files

FreeBSD/src bc362fdsbin/ifconfig sfp.c ifstf.c

ifconfig: Add SPDX-License-Identifier tags

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55272

(cherry picked from commit d685228989020f7bceebdaf6ea79be09305d2954)
DeltaFile
+2-0sbin/ifconfig/sfp.c
+2-0sbin/ifconfig/ifstf.c
+2-0sbin/ifconfig/ifipsec.c
+6-03 files

FreeBSD/src b541d1cusr.bin/etdump output_text.c output_shell.c

etdump: Add SPDX-License-Identifier tags

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation

(cherry picked from commit 2d1c5f43a2a5a4d3021530c7048e72f39b2ab8d0)
DeltaFile
+2-0usr.bin/etdump/output_text.c
+2-0usr.bin/etdump/output_shell.c
+2-0usr.bin/etdump/etdump.h
+2-0usr.bin/etdump/etdump.c
+8-04 files

FreeBSD/src 0447e27sbin/devmatch devmatch.c

devmatch: Add SPDX-License-Identifier tag

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55271

(cherry picked from commit 835813c88ab6e44590c2d47e2d66fe153cf9dfc5)
DeltaFile
+2-0sbin/devmatch/devmatch.c
+2-01 files

FreeBSD/src 01e9035bin/csh iconv_stub.h iconv_stub.c

csh: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55206

(cherry picked from commit 10a8680b4e9a728a20825d1c8425487bc1a43700)
DeltaFile
+2-0bin/csh/iconv_stub.h
+2-0bin/csh/iconv_stub.c
+4-02 files

FreeBSD/src efcc0ddbin/ed undo.c sub.c

ed: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55208

(cherry picked from commit 9eeab27c56db507f88c3334172e62357c092707e)
DeltaFile
+2-0bin/ed/undo.c
+2-0bin/ed/sub.c
+2-0bin/ed/re.c
+2-0bin/ed/main.c
+2-0bin/ed/io.c
+2-0bin/ed/glbl.c
+12-02 files not shown
+16-08 files

FreeBSD/src d2cac45bin/date vary.h vary.c

date: Add SPDX-License-Identifier tags

Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55207

(cherry picked from commit 62269b2f23859a20bc6a68ca64648217c421c616)
DeltaFile
+2-0bin/date/vary.h
+2-0bin/date/vary.c
+4-02 files

FreeBSD/src 86b8502usr.bin/beep beep.c

beep: Add SPDX-License-Identifier tag

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation

(cherry picked from commit 7e313584ab1075195ab735c1452375cf2388b162)
DeltaFile
+2-0usr.bin/beep/beep.c
+2-01 files

FreeBSD/src 4cbb609usr.bin/diff diff.h

diff: Add SPDX-License-Identifier tag

Reviewed by: emaste
Sponsored by: The FreeBSD Foundation

(cherry picked from commit 878cee8d9b9b4c7c5530b0960306c04b1b691325)
DeltaFile
+2-0usr.bin/diff/diff.h
+2-01 files

FreeBSD/src fb81f8esys/conf files.riscv

riscv/vmm: allow vmm to be built in kernel

Fixes:          ed85203fb7a0 ("vmm: Deduplicate VM and vCPU state management code")
Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D58697

(cherry picked from commit 5afb49180c2a5de83c106f7c07e5548622e3abad)
DeltaFile
+1-0sys/conf/files.riscv
+1-01 files

FreeBSD/src f2c9960lib/libc/tests/secure generate-fortify-tests.lua fortify_uio_test.c

tests/libc: Fix fortify_source uio tests

Some of the preadv() and readv() tests were not initializing the iovecs
they pass to the system call.  When the system call is expected to fail,
that's fine since the FORTIFY_SOURCE checks cause the process to be
aborted.  However, in the rest of the test cases, the (p)readv() call
could cause spurious test failures, e.g., when an uninitialized iov
entry points to the current stack frame and the canary gets overwritten.

Modify the tests to explicitly initialize iov entries to avoid this.
The "iov" variants don't have this problem, so leave them alone.

Reviewed by:    kevans
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58289

(cherry picked from commit 1719b754a9ec88fcf0f5f4b001b1b5d5d6db5819)
DeltaFile
+80-20lib/libc/tests/secure/fortify_uio_test.c
+18-9lib/libc/tests/secure/generate-fortify-tests.lua
+98-292 files

FreeBSD/src 873ba78sys/dev/gve gve_adminq.c

gve: Implement AQ batching for queue creation and destruction

Currently, the FreeBSD driver configures and destroys queues
sequentially by issuing individual Admin Queue (AQ) commands.

During queue teardown (e.g., interface reset), disabling queues
one by one leaves the device in a partially configured state.
Because the device does not yet know that the driver is in the
process of fully unconfiguring all queues, this intermediate
state can trigger transient error logs (such as when queue 0 is
disabled while other queues are still active).

Modify the driver to use Admin Queue batching for both the
creation and destruction of TX and RX queues. Commands are now
queued and kicked together, ensuring the queue configuration changes
are applied atomically and preventing transient errors from being logged.

Signed-off-by: Sujithra Periasamy <sujithra at google.com>


    [6 lines not shown]
DeltaFile
+37-10sys/dev/gve/gve_adminq.c
+37-101 files

FreeBSD/src 730e18asys/netinet6 raw_ip6.c

rawip: Fix handling of checksums in rip6_input()

A v6 raw socket may ask the kernel to validate the checksum of an
inbound packet.  If it does, and the validation fails, we discard the
packet, but this isn't really right: other raw sockets may wish to
receive a copy of the packet anyway.

Rework checksum handling to address this problem, and use a flag to
avoid computing the checksum more than once for a given packet.

Fixes:          de2d47842e880281 ("SMR protection for inpcbs")
Reviewed by:    pouria, glebius
Reported by:    Yunzhi Ke
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58559

(cherry picked from commit 196874ce2e97e3e6425493b1d501e716b356bc36)
DeltaFile
+15-11sys/netinet6/raw_ip6.c
+15-111 files

FreeBSD/src 582e013usr.sbin/bhyve tpm_intf_crb.c

bhyve: tpm: Avoid printing a message when clearing the cancel bit

Some drivers do this routinely, e.g., FreeBSD's tpm20 does this every
time it sends a command in tpmcrb_transmit().  This causes the console
to fill up with messages.  Instead, only print a warning if the cancel
bit is set to one.

Reviewed by:    corvink
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D52425

(cherry picked from commit 1c1a3646a1c86624e67a42636894fd1685386cf1)
DeltaFile
+11-4usr.sbin/bhyve/tpm_intf_crb.c
+11-41 files

FreeBSD/src 6e59c4esys/kern subr_epoch.c

epoch: Fix epoch_drain_callbacks()

This function is supposed to wait until all pending callbacks have been
executed.  This is useful in some contexts where we tear down some
context (like a VNET jail and its associated UMA zones) synchronously,
and we want to make sure that all pending asynchronous callbacks (which
may free objects to said UMA zones) have run first.

The implementation schedules a callback on each CPU and waits for them
all to run.  This assumes that, on a given CPU, callbacks are executed
in the order that they are pushed.  This assumption depends on the
implementation of epoch_call_task() and ck_epoch_poll_deferred(), and it
is not true in general.

Callbacks are pushed onto a per-CPU stack in LIFO order.
ck_epoch_poll_deferred() first pulls out the callbacks from epoch - 2,
which are always safe to execute, and in so doing reorders them such
that the oldest callback as at the top of the stack, so in this case,
epoch_call_task() will execute them in order.  However,

    [24 lines not shown]
DeltaFile
+30-20sys/kern/subr_epoch.c
+30-201 files

FreeBSD/src 7e6d8a8sys/kern kern_fork.c

proc: Copy the p_reapsubtree field explicitly during fork

p_reapsubtree lives in the p_startcopy/p_endcopy block of struct proc,
which is copied during fork without any synchronization.  However, the
field is not stable except when the proctree lock is held, and indeed
may change if p1's reaper exits or explicitly releases its reaper
status.  This state change can race with fork() and leave the child with
an incorrect p_reapsubtree field.

Close the race: explicitly copy the field under the proctree lock during
fork.

Reported by:    syzkaller
Reviewed by:    kib
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58482

(cherry picked from commit 8616b7dc3850758eb39a5b63f41f56c05403380b)
DeltaFile
+7-0sys/kern/kern_fork.c
+7-01 files

FreeBSD/src 9c13f8ccontrib/lib9p/example Makefile server.c

lib9p: fix compilation errors in example server

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

(cherry picked from commit e6b038456b2b740b7bc41accc36fa85839e79cc3)
DeltaFile
+2-2contrib/lib9p/example/server.c
+1-1contrib/lib9p/example/Makefile
+3-32 files