FreeBSD/src 4ebf794tools/tools/crypto cryptocheck.c

cryptocheck: Don't test Chacha20-Poly1305 with an IV size of 8

OpenSSL 3.0+ doesn't support an IV size of 8 either for the Chacha20
stream cipher or the AEAD combination with Poly1305.  This did work
previously with OpenSSL 1.1.

Reviewed by:    markj
Sponsored by:   AFRL, DARPA
Differential Revision:  https://reviews.freebsd.org/D45280
DeltaFile
+2-2tools/tools/crypto/cryptocheck.c
+2-21 files

FreeBSD/src 76df3c5sbin/ifconfig ifvlan.c, tests/sys/net if_vlan.sh

ifconfig: Redo fix vlan/vlanproto reconfiguration

When the if_vlan(4) interface has not been fully configured, i.e., a
bare interface without a physical interface associated with it,
retrieving the current settings of it and unconditionally overwriting
`params` will result in losing vlandev settings in `params`. That will
lead to failing to associate the if_vlan(4) interface with the requested
physical interface and the false report 'both vlan and vlandev must be
specified'.

Fix that by checking if the vlan interface has been fully configured.

The basic VLAN test is slightly modified to cover this case.

PR:             279181
Reviewed by:    kp
Tested by:      Mike Tancsa <mike at sentex.net>
Fixes:          b82b8055ad44 ifconfig: fix vlan/vlanproto reconfiguration
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D45283
DeltaFile
+26-5sbin/ifconfig/ifvlan.c
+7-3tests/sys/net/if_vlan.sh
+33-82 files

FreeBSD/src 48edad2libexec/nuageinit nuageinit

fix (nuageinit): SSH keys are not handled in metadata but in userdata

MFC After: 1 day
DeltaFile
+0-7libexec/nuageinit/nuageinit
+0-71 files

FreeBSD/src 7975f57sys/kern uipc_shm.c

uipc_shm: Fix double check for shmfd->shm_path

Reviewed by:    emaste, zlei
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1250
DeltaFile
+12-14sys/kern/uipc_shm.c
+12-141 files

FreeBSD/src 8e5e42dshare/man/man4 ice.4 Makefile

Add man page for the ice network driver.

PR:             262892
MFC after:      3 days
Reviewed by:    concussious.bugzilla at runbox.com, erj
Differential Revision:  https://reviews.freebsd.org/D45270
DeltaFile
+250-0share/man/man4/ice.4
+2-0share/man/man4/Makefile
+252-02 files

FreeBSD/src 5dced41share/man/man7 networking.7 Makefile

networking.7 : create network quickstart guide

Now that the handbook has been moved to ports, I think it's very nice to
have a network quickstart guide in-band, in base, in the system manual.
If the user uses any of the following terms "man -k
{network,networking,wifi,quickstart}" this page will come up, which is I
think a very common use case for new users.

Currently, this document explains connecting to a basic Ethernet
network, a basic wifi network, scanning for wifi networks, and airplane
mode, as well as linking to other sections, including the handbook

Co-authored-by: Graham Perrin <grahamperrin at gmail.com>
Reviewed by: imp, bcr, freebsd at igalic.co
Pull Request: https://github.com/freebsd/freebsd-src/pull/833

(cherry picked from commit 75eda0096bf83b9b88996d9903b5d4e504047eba)
DeltaFile
+101-0share/man/man7/networking.7
+5-0share/man/man7/Makefile
+106-02 files

FreeBSD/src 828e648lib/libc/sys intro.2

intro.2 as errno.2: Update maximum hard link limit

MFC after:      1 week
Co-authored-by: brooks
Reviewed by:    brooks, emaste, imp
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1192

(cherry picked from commit 6dfbe695c3223822734dddc926415a3ba347b42c)
DeltaFile
+7-2lib/libc/sys/intro.2
+7-21 files

FreeBSD/src cbe2436lib/libc/sys intro.2

intro.2: Add sys/syscall.h to SYNOPSIS

MFC after:      1 week
Co-authored-by: brooks
Reviewed by:    brooks, emaste, imp
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1192

(cherry picked from commit 69ff2d754c1c8bd9c2b6cea28aa754e9f92f9613)
DeltaFile
+1-0lib/libc/sys/intro.2
+1-01 files

FreeBSD/src 040a7e0sys/modules Makefile

sys/modules/dpdk_lpm4: do not build without INET

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1236

(cherry picked from commit 304a03275a65cf811fb6c06fa1c37783d07c99a4)
DeltaFile
+1-1sys/modules/Makefile
+1-11 files

FreeBSD/src f30c2d8sys/netinet6 in6_pcb.c

sys/netinet6/in6_pcb.c: fix compile without INET

in6_mapped_sockaddr() and in6_mapped_peeraddr() both define a local
variable named 'inp', but in the non-INET case, this variable is set
and never used, causing a compiler error:

/src/freebsd/src/lf/sys/netinet6/in6_pcb.c:547:16: error:
        variable 'inp' set but not used [-Werror,-Wunused-but-set-variable]
  547 |         struct  inpcb *inp;
      |                        ^
/src/freebsd/src/lf/sys/netinet6/in6_pcb.c:573:16: error:
        variable 'inp' set but not used [-Werror,-Wunused-but-set-variable]
  573 |         struct  inpcb *inp;

Fix this by guarding all the INET-specific logic, including the variable
definition, behind #ifdef INET.

While here, tweak formatting in in6_mapped_peeraddr() so both functions
are the same.

    [5 lines not shown]
DeltaFile
+8-6sys/netinet6/in6_pcb.c
+8-61 files

FreeBSD/src 7aba922sys/dev/irdma irdma_cm.c

sys/dev/irdma/irdma_cm: fix compile without INET

irdma_get_vlan_ipv4() calls ip_ifp_find() even if INET isn't defined, in
which case this function isn't available.

Stub this out for the non-INET case to return an error (0xffff) instead.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1156

(cherry picked from commit 0478a0356272ab3907af9d97711f0bb8b14bf38b)
DeltaFile
+4-1sys/dev/irdma/irdma_cm.c
+4-11 files

FreeBSD/src e7d689finclude sysexits.h, share/man/man3 sysexits.3

sysexits: Tidy deprecated header and manual

<sysexits.h> was deprecated in the base system in a1432b4 for FreeBSD
8.0 and is retained only for backwards compatibility.  Make that clear,
since sysexits(3) suggested using it since it was in style(9) prior
to this.

MFC after:      1 week
Co-authored-by: imp
Fixes:          a1432b4
Reviewed by:    imp, pauamma (previous version)
Pull Request    https://github.com/freebsd/freebsd-src/pull/1195

(cherry picked from commit 5ccaab1797e5bdc404f2299ebaec1265547a4744)
DeltaFile
+18-25share/man/man3/sysexits.3
+4-3include/sysexits.h
+22-282 files

FreeBSD/src 25aa002sys/fs/nfsclient nfs_clbio.c

nfs client comment typo fix

(cherry picked from commit ff4480baf6f15551aee58707bffc9b15608d89d8)
DeltaFile
+1-1sys/fs/nfsclient/nfs_clbio.c
+1-11 files

FreeBSD/src c8b9eccsys/x86/include specialreg.h

x86: Add Intel TD/HFI related MSR/CPUID defines to specialregs.h

(cherry picked from commit 338d53965d9f4bfb1a83c1bcff3ff78944ce3a9f)
DeltaFile
+30-0sys/x86/include/specialreg.h
+30-01 files

FreeBSD/src 1fbc850sys/x86/include specialreg.h x86_var.h, sys/x86/x86 identcpu.c

AMD CPUs: update bits and data from CPUID 0x8000_0008

(cherry picked from commit c6113ac5a2c2bfee875979ebd40a007ef4d60069)
DeltaFile
+17-0sys/x86/include/specialreg.h
+12-0sys/x86/x86/identcpu.c
+1-0sys/x86/include/x86_var.h
+30-03 files

FreeBSD/src f03a011sys/x86/include specialreg.h x86_var.h, sys/x86/x86 identcpu.c

AMD CPUs: update bits and data from CPUID 0x8000_0008

(cherry picked from commit c6113ac5a2c2bfee875979ebd40a007ef4d60069)
DeltaFile
+17-0sys/x86/include/specialreg.h
+12-0sys/x86/x86/identcpu.c
+1-0sys/x86/include/x86_var.h
+30-03 files

FreeBSD/src 983aec5sys/x86/include specialreg.h

x86: Add Intel TD/HFI related MSR/CPUID defines to specialregs.h

(cherry picked from commit 338d53965d9f4bfb1a83c1bcff3ff78944ce3a9f)
DeltaFile
+30-0sys/x86/include/specialreg.h
+30-01 files

FreeBSD/src f148aa5sys/fs/nfsclient nfs_clbio.c

nfs client comment typo fix

(cherry picked from commit ff4480baf6f15551aee58707bffc9b15608d89d8)
DeltaFile
+1-1sys/fs/nfsclient/nfs_clbio.c
+1-11 files

FreeBSD/src 3641339lib/msun/riscv Symbol.map fenv.h

msun/riscv: expose fe{disable,enable}except

This is required for GCC to build.

PR:             272759
Reported by:    dgilbert at eicat.ca
Submitted by:   jrtc27
Differential Revision:  https://reviews.freebsd.org/D44333

(cherry picked from commit 1947a9383ec3a048e334022365aa199a6ae55289)
DeltaFile
+4-6lib/msun/riscv/Symbol.map
+3-4lib/msun/riscv/fenv.h
+7-102 files

FreeBSD/src 07f9866lib/msun/riscv Symbol.map fenv.h

msun/riscv: expose fe{disable,enable}except

This is required for GCC to build.

PR:             272759
Reported by:    dgilbert at eicat.ca
Approved by:    re (cperciva)
Submitted by:   jrtc27
Differential Revision:  https://reviews.freebsd.org/D44333

(cherry picked from commit 1947a9383ec3a048e334022365aa199a6ae55289)
(cherry picked from commit 7ad17751074ca79a89ca503f5ac647819579e858)
DeltaFile
+4-6lib/msun/riscv/Symbol.map
+3-4lib/msun/riscv/fenv.h
+7-102 files

FreeBSD/src 7ad1775lib/msun/riscv Symbol.map fenv.h

msun/riscv: expose fe{disable,enable}except

This is required for GCC to build.

PR:             272759
Reported by:    dgilbert at eicat.ca
Submitted by:   jrtc27
Differential Revision:  https://reviews.freebsd.org/D44333

(cherry picked from commit 1947a9383ec3a048e334022365aa199a6ae55289)
DeltaFile
+4-6lib/msun/riscv/Symbol.map
+3-4lib/msun/riscv/fenv.h
+7-102 files

FreeBSD/src 7a2bb28contrib/unbound configure~ configure, contrib/unbound/doc unbound.doxygen

unbound: Vendor import 1.20.0

Release notes at
        https://www.nlnetlabs.nl/news/2024/May/08/unbound-1.20.0-released/

Security:       The DNSBomb vulnerability CVE-2024-33655

Merge commit 'c2a80056864d6eda0398fd127dc0ae515b39752b' into main

(cherry picked from commit 335c7cda12138f2aefa41fb739707612cc12a9be)
DeltaFile
+26,616-0contrib/unbound/configure~
+7,476-5,132contrib/unbound/configure
+3,827-3,706contrib/unbound/util/configlexer.c
+2,339-2,199contrib/unbound/util/configparser.c
+2,007-886contrib/unbound/doc/unbound.doxygen
+859-0contrib/unbound/testdata/val_dnameqtype_qmin.rpl
+43,124-11,923102 files not shown
+52,634-13,120108 files

FreeBSD/src 5df4924contrib/ldns resolver.c parse.c, contrib/ldns/ldns parse.h

ldns: Ignore commented-out lines in resolv.conf.

This merges upstream PR 238 + an additional bug fix.

PR:             278721
MFC after:      1 week

(cherry picked from commit 3b092e4936c433889cc668ea9563c8fd437d1a3e)
(cherry picked from commit 7daf36028411c3a9c73e0c75732f9cbcbf66362e)

Approved by:    re (cperciva)
DeltaFile
+9-44contrib/ldns/resolver.c
+31-4contrib/ldns/parse.c
+2-0contrib/ldns/ldns/parse.h
+42-483 files

FreeBSD/src 0829f93contrib/atf/atf-c macros.h

atf: Guard against multiple evaluation.

Note that the ATF-C++ macros have the same issue, but they are not as
easily fixed.

MFC after:      3 days
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D45148

(cherry picked from commit a7beca6fb113986839de73b7cf73d933464898c6)
(cherry picked from commit 745ee870031e3b35141fe720bdebe9baa234e942)

Approved by:    re (cperciva)
DeltaFile
+84-45contrib/atf/atf-c/macros.h
+84-451 files

FreeBSD/src f44abb7sbin/ifconfig ifconfig.c ifconfig.8

ifconfig: Add format shortcuts.

MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D45166

(cherry picked from commit 847ef59d4b5eab234bd1f8eb947ad74bdab5614e)

ifconfig: Markup nits.

MFC after:      3 days
Reviewed by:    imp, allanjude
Differential Revision:  https://reviews.freebsd.org/D45209

(cherry picked from commit 42b28f815214aa582fe4ca707687d3af47850230)
(cherry picked from commit dd1a16c9e2c1c95d9ac7ad0b082248e60ede0e99)

Approved by:    re (cperciva)
DeltaFile
+25-17sbin/ifconfig/ifconfig.c
+23-9sbin/ifconfig/ifconfig.8
+48-262 files

FreeBSD/src 284244acontrib/one-true-awk run.c awk.1

awk: Merge in bsd-feature branch of OTA from 20240422 (31bb33a32f71)

In the last 2nd edition import, I mistakenly grabbed from the 'main'
branch of upstream rather than the bsd-feature branch. This means that
we have a regression in awk from that point forward: all the
BSD-specific bit functions (and a few others) were dropped. This
restores it at the same level.

MFC After:              1 day
Sponsored by:           Netflix

(cherry picked from commit eb690a0576e8cf5412124477eace3bb765068c3d)
DeltaFile
+238-2contrib/one-true-awk/run.c
+52-0contrib/one-true-awk/awk.1
+24-0contrib/one-true-awk/ChangeLog
+23-0contrib/one-true-awk/parse.c
+19-1contrib/one-true-awk/awkgram.y
+9-0contrib/one-true-awk/lex.c
+365-33 files not shown
+377-39 files

FreeBSD/src 02cae85contrib/one-true-awk run.c awk.1

ota: Merge one true awk 20240422 (a3b68e649d2d)

Apr 22, 2024:
        fixed regex engine gototab reallocation issue that was
        introduced during the Nov 24 rewrite. Thanks to Arnold Robbins.
        Fixed a scan bug in split in the case the separator is a single
        character. thanks to Oguz Ismail for spotting the issue.

Mar 10, 2024:
        fixed use-after-free bug in fnematch due to adjbuf invalidating
        the pointers to buf. thanks to github user caffe3 for spotting
        the issue and providing a fix, and to Miguel Pineiro Jr.
        for the alternative fix.
        MAX_UTF_BYTES in fnematch has been replaced with awk_mb_cur_max.
        thanks to Miguel Pineiro Jr.

Sponsored by:           Netflix

(cherry picked from commit 1023317ac491090f8d84a62999ffc303cf88528c)
DeltaFile
+4-240contrib/one-true-awk/run.c
+0-52contrib/one-true-awk/awk.1
+20-14contrib/one-true-awk/b.c
+0-24contrib/one-true-awk/ChangeLog
+0-23contrib/one-true-awk/parse.c
+1-19contrib/one-true-awk/awkgram.y
+25-3728 files not shown
+44-39514 files

FreeBSD/src f65f02csys/geom/stripe g_stripe.c g_stripe.h

geom_stripe: Cascade cantrim just like we do for gmirror

If any of the disks can support trim, cascade that up the
stack. Otherwise, trims won't pass through striped raid setups.

PR: 277673
Reviewed by: imp (minor style tweaks from bug report)

(cherry picked from commit ea2d874cca7cdfe6133c1835dadd8f0672723fa6)
DeltaFile
+20-1sys/geom/stripe/g_stripe.c
+3-0sys/geom/stripe/g_stripe.h
+23-12 files

FreeBSD/src 4c2ea6esys/cam/scsi scsi_da.c

da: Update trim stats for WRITE SAME and ATA TRIM

The scsi UNMAP path updated trim stats in the da sysctl, but the ATA
TRIM passthru and WRITE SAME paths did not. Add code so they do.

PR: 277637
Reviewed by: imp (tweaked WS path to update ranges)

(cherry picked from commit 12117d0e9314d1706508386c1c49ace2de578b31)
DeltaFile
+6-0sys/cam/scsi/scsi_da.c
+6-01 files

FreeBSD/src d59058fsys/sys sndstat.h

sound: Make SNDST_UNVLBUF_MAX a power of two

Fixes:          074d337ad618 ("sound: Check user-supplied size passed to SNDSTIOC_ADD_USER_DEVS*")
Reported by:    markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 day
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D45277
DeltaFile
+1-1sys/sys/sndstat.h
+1-11 files