HardenedBSD/src 9efc746share/man/man4 mgb.4 muge.4, sys/dev/sound/pcm channel.c vchan.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+22-48sys/dev/sound/pcm/channel.c
+0-18sys/dev/sound/pcm/vchan.c
+0-5sys/dev/sound/pcm/vchan.h
+1-1share/man/man4/mgb.4
+1-1sys/sys/_types.h
+1-1share/man/man4/muge.4
+25-741 files not shown
+26-747 files

HardenedBSD/src 73f2f76share/man/man4 mgb.4 muge.4, sys/dev/sound/pcm channel.c vchan.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+22-48sys/dev/sound/pcm/channel.c
+0-18sys/dev/sound/pcm/vchan.c
+0-5sys/dev/sound/pcm/vchan.h
+1-1sys/sys/_types.h
+1-1share/man/man4/mgb.4
+1-1share/man/man4/muge.4
+25-741 files not shown
+26-747 files

HardenedBSD/src 65818e5sbin/fdisk fdisk.8, sys/modules/dummynet Makefile

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+0-849sys/netpfil/ipfw/ip_dn_glue.c
+27-69sys/netpfil/ipfw/ip_dummynet.c
+1-9sys/netpfil/ipfw/ip_dn_private.h
+2-2sbin/fdisk/fdisk.8
+0-4sys/netinet/raw_ip.c
+1-2sys/modules/dummynet/Makefile
+31-9352 files not shown
+32-9378 files

HardenedBSD/src 28db2f9sys/dev/sound/midi midi.c, sys/dev/sound/pcm sound.h mixer.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+14-123sys/dev/sound/midi/midi.c
+0-103sys/dev/sound/pcm/sound.h
+5-48sys/dev/sound/pcm/mixer.c
+13-35sys/dev/sound/pcm/dsp.c
+5-13sys/fs/cuse/cuse.c
+0-4sys/dev/sound/pcm/mixer.h
+37-3261 files not shown
+37-3297 files

HardenedBSD/src a4aa7dfshare/man/man4 mgb.4 muge.4

mgb.4, muge.4: Use standard HARDWARE introduction

Release notes are generated using this text.

I used "interfaces" not "adapters" in these pages as the listed devices
are the controller ICs, not end-user projects.

Reviewed by:    ziaee
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53846
DeltaFile
+1-1share/man/man4/mgb.4
+1-1share/man/man4/muge.4
+2-22 files

HardenedBSD/src 39cad84sys/sys _types.h

max_align_t: apply alignof to 'long double' for long double alignment

Reviewed by;    markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D53826
DeltaFile
+1-1sys/sys/_types.h
+1-11 files

HardenedBSD/src 57865e5sys/conf files, sys/modules/dummynet Makefile

ipfw: Retire obsolete compat code

The current IPFW version 3 dates to 2010 (commit cc4d3c30ea28, "Bring in
the most recent version of ipfw and dummynet, developed").

The compat code for FreeBSD 8 and earlier has a number of issues and is
no longer needed, so remove it.

Reported by:    Ilja Van Sprundel <ivansprundel at ioactive.com>
Reviewed by:    ae, glebius
Relnotes:       Yes
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53343

(cherry picked from commit c59aab9a5b3970b3ccec744f759e6cb87e938dbe)
(cherry picked from commit 9657c50cdd7741404d99881fdd9243175086ede1)
DeltaFile
+0-849sys/netpfil/ipfw/ip_dn_glue.c
+27-69sys/netpfil/ipfw/ip_dummynet.c
+1-9sys/netpfil/ipfw/ip_dn_private.h
+0-4sys/netinet/raw_ip.c
+1-2sys/modules/dummynet/Makefile
+0-1sys/conf/files
+29-9346 files

HardenedBSD/src f673619sbin/fdisk fdisk.8 fdisk.c

fdisk: Bump removal to FreeBSD 16.0

Removal did not happen prior to 15.0.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit f817f6e7f4a8dc507f3e1b1603dfd2d81093e3bd)
(cherry picked from commit 739750ae7c63c653025ad84cac6ba7cb6756dcf8)
(cherry picked from commit 2be4c64a0d27a9136cc05c9bdf7a45162339aa69)
DeltaFile
+2-2sbin/fdisk/fdisk.8
+1-1sbin/fdisk/fdisk.c
+3-32 files

HardenedBSD/src 3612ef6sys/dev/sound/pcm vchan.c vchan.h

sound: Remove vchan_passthrough() and hw.snd.passthrough_verbose

Unused and confusing.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+0-18sys/dev/sound/pcm/vchan.c
+0-5sys/dev/sound/pcm/vchan.h
+0-232 files

HardenedBSD/src 253b98fsys/dev/sound/pcm channel.c

sound: Fix KASSERT panics in chn_read() and chn_write()

INVARIANTS kernels may trigger a KASSERT panic from sndbuf_acquire(),
when fuzzing write(2) using stress2, because of a race in chn_write().

In the case of chn_write(), what sndbuf_acquire() does is extend the
ready-to-read area of the buffer by a specified amount of bytes. The
KASSERT in question makes sure the number of bytes we want to extend the
ready area by, is less than or equal to the number of free bytes in the
buffer. This makes sense, because we cannot extend the ready area to
something larger than what is available (i.e., free) in the first place.

What chn_write() currently does for every write is; calculate the
appropriate write size, let's say X, unlock the channel, uiomove() X
bytes to the channel's buffer, lock the channel, and call
sndbuf_acquire() to extend the ready area by X bytes. The problem with
this approach, however, is the following.

Suppose an empty channel buffer with a length of 1024 bytes, and 2

    [43 lines not shown]
DeltaFile
+22-48sys/dev/sound/pcm/channel.c
+22-481 files

HardenedBSD/src 032fbdasys/dev/nvme nvme.h

nvme: Include <sys/systm.h> explicitly for memmove

Reported by:    andrew, rpokala
Fixes:          8d2a50bb3805 ("nvme: Abstract out function to obtain a disk ident string from cdata")
Sponsored by:   Chelsio Communications
DeltaFile
+1-0sys/dev/nvme/nvme.h
+1-01 files

HardenedBSD/src 9cafea4. ObsoleteFiles.inc

ObsoleteFiles.inc: Fix up incorrect merge

This is a direct commit to stable/15.

Reported by:    des
Fixes:  838c8027f9d8 ("libexec/kgdb: Add new modules and install them together with debug info")
DeltaFile
+0-3ObsoleteFiles.inc
+0-31 files

HardenedBSD/src 47bdb81sys/dev/sound/pcm dsp.c

sound: Do not use double pointer in dsp_io_ops()

No reason to do so.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D53734

(cherry picked from commit fa7bc983076661e85107970e39de66a1e54d87d1)
DeltaFile
+13-13sys/dev/sound/pcm/dsp.c
+13-131 files

HardenedBSD/src 538df10sys/dev/sound/pcm sound.h

sound: Retire SND_DIAGNOSTIC PCM locking macros

Disabled by default, but also redundant, since most of the errors they
catch will be caught anyway by WITNESS and the locking subsystem.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D53735

(cherry picked from commit b19e61f223a1982cce103b9716568391a071892a)
DeltaFile
+0-103sys/dev/sound/pcm/sound.h
+0-1031 files

HardenedBSD/src a6601bbsys/dev/sound/pcm mixer.c

sound: Move mixer->modify_counter to more appropriate place

No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 15d77c1fdcb1c7f022a21892dcb78990986f1a3c)
DeltaFile
+5-5sys/dev/sound/pcm/mixer.c
+5-51 files

HardenedBSD/src d26b3c9sys/fs/cuse cuse.c

cuse: Fix cdevpriv bugs in cuse_client_open()

If devfs_set_cdevpriv() fails, we will panic when we enter the
cuse_client_free() callback, for a number of reasons:

- pcc->server is not yet assigned, so we'll use a NULL pointer.
- pcc has not yet been added to the pcs->hcli TAILQ, but we'll try to
  remove it.
- pccmd->sx and pccmd->cv are not yet initializated, but we'll try to
  destroy them.

Even if we'd get past all these somehow, we'd still get two errors in
the devfs_set_cdevpriv() failure block:

- We'll unref the server twice, once in cuse_client_free(), and again in
  cuse_client_open().
- A double-free panic, since we'd be trying to free(pcc), which has
  already been freed in cuse_client_free().


    [9 lines not shown]
DeltaFile
+5-13sys/fs/cuse/cuse.c
+5-131 files

HardenedBSD/src ccb095bsys/dev/sound/pcm dsp.c

sound: Remove unnecessary uio checks in dsp_io_ops()

uiomove_faultflag() takes care of that already.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D53733

(cherry picked from commit 6b5431941c10b6fdf164ad9d3dfa4b4f1b2edc22)
DeltaFile
+0-7sys/dev/sound/pcm/dsp.c
+0-71 files

HardenedBSD/src 3c1061asys/dev/sound/pcm dsp.c

sound: Retire OLDPCM_IOCTL

It is defined by default, and there is no reason to have a switch for
it. While here, also get rid of some unnecessary comments and ioctl
definitions.

No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 1fe7bfd6c70160c064237eac104e7d9c71390c4f)
DeltaFile
+0-15sys/dev/sound/pcm/dsp.c
+0-151 files

HardenedBSD/src cc931f5sys/dev/sound/pcm mixer.c mixer.h

sound: Retire unused mixer functions

No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit b55adf9b261b91ddd3c7293720bbbbfb4ffe7066)
DeltaFile
+0-43sys/dev/sound/pcm/mixer.c
+0-4sys/dev/sound/pcm/mixer.h
+0-472 files

HardenedBSD/src 80873ecsys/dev/sound/midi midi.c

sound: Remove dead midi code

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit e4b31985b54b626b2bbf486a82dd789f3dd381db)
DeltaFile
+14-123sys/dev/sound/midi/midi.c
+14-1231 files

HardenedBSD/src d7343a3. Makefile.inc1, sys/x86/conf NOTES

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+1-1tools/build/Makefile
+1-1Makefile.inc1
+1-0sys/x86/conf/NOTES
+3-23 files

HardenedBSD/src 7df51e1. Makefile.inc1, share/man/man4 iwx.4

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+14-11share/man/man4/iwx.4
+4-0sys/conf/files
+1-1tools/build/Makefile
+1-1Makefile.inc1
+2-0sys/x86/conf/NOTES
+22-135 files

HardenedBSD/src b4a6b62sys/x86/conf NOTES

NOTES: Add iwm

(cherry picked from commit b1039bbe185bbadea24207b600f4bea065a2dbee)
DeltaFile
+1-0sys/x86/conf/NOTES
+1-01 files

HardenedBSD/src fcca6e1. Makefile.inc1, tools/build Makefile

Use install instead of cp to copy bootstrap tools

We need to preserve modification times on bootstrap tools, but `cp -p`
also tries to preserve flags, which fails if OBJROOT is on NFS.  A -N
option was added to cp for this purpose, but trying to use that would
break cross-building on hosts that don't have that option.  The best
remaining option is `install -p`, which we already assume is present.

PR:             275030
Reviewed by:    imp, emaste
Differential Revision:  https://reviews.freebsd.org/D53751

(cherry picked from commit f3cf4c0af5af6ce95065a615f998117ec1cd63aa)
DeltaFile
+1-1Makefile.inc1
+1-1tools/build/Makefile
+2-22 files

HardenedBSD/src b94750fshare/man/man4 iwx.4

iwx.4: Fix SYNOPSIS

PR:             290812
MFC after:      3 days
Fixes:          27c41b28b1d7 (iwx.4: Initial manual page)
Reported by:    Dimitry Lukhtionov <dimitryluhtionov at gmail.com>

(cherry picked from commit b0c1ead2b9be0f6aa5a715d849b9ca7af093b513)
DeltaFile
+1-2share/man/man4/iwx.4
+1-21 files

HardenedBSD/src ee3c518sys/x86/conf NOTES

NOTES: Add iwm and iwx

Reviewed by:    imp, jhb
Differential Revision:  https://reviews.freebsd.org/D53759

(cherry picked from commit b1039bbe185bbadea24207b600f4bea065a2dbee)
DeltaFile
+2-0sys/x86/conf/NOTES
+2-01 files

HardenedBSD/src 40a76b0share/man/man4 iwx.4

iwx.4: Follow the established style

Fixes:          b0c1ead2b9be ("iwx.4: Fix SYNOPSIS")
Reviewed by:    ziaee
Differential Revision:  https://reviews.freebsd.org/D53760

(cherry picked from commit ebb0b4822699eb614d5e9418c0a1bf6b30718699)
DeltaFile
+13-9share/man/man4/iwx.4
+13-91 files

HardenedBSD/src c676437. Makefile.inc1, tools/build Makefile

Use install instead of cp to copy bootstrap tools

We need to preserve modification times on bootstrap tools, but `cp -p`
also tries to preserve flags, which fails if OBJROOT is on NFS.  A -N
option was added to cp for this purpose, but trying to use that would
break cross-building on hosts that don't have that option.  The best
remaining option is `install -p`, which we already assume is present.

PR:             275030
Reviewed by:    imp, emaste
Differential Revision:  https://reviews.freebsd.org/D53751

(cherry picked from commit f3cf4c0af5af6ce95065a615f998117ec1cd63aa)
DeltaFile
+1-1Makefile.inc1
+1-1tools/build/Makefile
+2-22 files

HardenedBSD/src 0f9ab6csys/conf files

sys/conf/files: Add iwx driver

PR:             290812
Fixes:          2ad0f7e91582 ("Import iwx as ported from OpenBSD by Future Crew.")
Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D53758

(cherry picked from commit a615ded5bf2dd7f563eed6766d32fc063ae36f92)
DeltaFile
+4-0sys/conf/files
+4-01 files

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