FreeBSD/src 93fbfefsys/net if_vxlan.c

if_vxlan(4): Add checking for loops and nesting of tunnels

User misconfiguration, either tunnel loops, or a large number of
different nested tunnels, can overflow the kernel stack. Prevent that
by using if_tunnel_check_nesting().

PR:             278394
Diagnosed by:   markj
Reviewed by:    kp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D45197
DeltaFile
+23-0sys/net/if_vxlan.c
+23-01 files

FreeBSD/src b454edeshare/misc usb_vendors

usb_vendors: update to 2024.03.18

(cherry picked from commit 79bffdf3f42e2e8e62223fcffd537d5d254ddbb7)
DeltaFile
+47-5share/misc/usb_vendors
+47-51 files

FreeBSD/src 5b609bbshare/misc pci_vendors

pci_vendors: update to 2024.05.14

(cherry picked from commit b0b9435ef1ec64c21f7243dbd02ad10e7f612149)
DeltaFile
+449-52share/misc/pci_vendors
+449-521 files

FreeBSD/src 2c5c85clibexec/rc rc.conf

nuageinit: by default to not enable nuageinit

MFC After:      1 day
Reported by:    karels@

(cherry picked from commit 5681636ead6790d5ad2c24a4712f010fcdfc926c)
DeltaFile
+1-0libexec/rc/rc.conf
+1-01 files

FreeBSD/src d16bc4fcontrib/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)
DeltaFile
+84-45contrib/atf/atf-c/macros.h
+84-451 files

FreeBSD/src fe623d6contrib/atf/atf-c atf-c.3 macros.h, contrib/atf/atf-sh atf-sh.3 atf-check.cpp

Import atf 0.22 snapshot 55c21b2c5fb189bbdfccb2b297bfa89236502542

The main improvement is the ability to skip a test that is expected to
fail.

(cherry picked from commit 71a1ae7cebd3791d4d18ac9620a7a4ce8cf15819)
DeltaFile
+22-5contrib/atf/atf-c/atf-c.3
+19-0contrib/atf/atf-c/macros.h
+3-9contrib/atf/atf-c/tc.c
+6-6contrib/atf/atf-sh/atf-sh.3
+2-2contrib/atf/atf-sh/atf-check.cpp
+52-225 files

FreeBSD/src a8177d8contrib/atf/atf-sh libatf-sh.subr

atf-sh: fix comment typo

Signed-off-by: Igor Ostapenko <pm at igoro.pro>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/895
(cherry picked from commit d4d14d965fb92d2bceb744be41310dc47f27ab80)
DeltaFile
+1-1contrib/atf/atf-sh/libatf-sh.subr
+1-11 files

FreeBSD/src e95e161contrib/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)
DeltaFile
+9-44contrib/ldns/resolver.c
+31-4contrib/ldns/parse.c
+2-0contrib/ldns/ldns/parse.h
+42-483 files

FreeBSD/src 54290c4sbin/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)
DeltaFile
+25-16sbin/ifconfig/ifconfig.c
+12-2sbin/ifconfig/ifconfig.8
+37-182 files

FreeBSD/src 7daf360contrib/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)
DeltaFile
+9-44contrib/ldns/resolver.c
+31-4contrib/ldns/parse.c
+2-0contrib/ldns/ldns/parse.h
+42-483 files

FreeBSD/src 745ee87contrib/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)
DeltaFile
+84-45contrib/atf/atf-c/macros.h
+84-451 files

FreeBSD/src dd1a16csbin/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)
DeltaFile
+25-17sbin/ifconfig/ifconfig.c
+23-9sbin/ifconfig/ifconfig.8
+48-262 files

FreeBSD/src b601165contrib/llvm-project/llvm/lib/TargetParser Host.cpp

Merge commit 87f3407856e6 from llvm-project (by Phoebe Wang):

  [X86][Driver] Do not add `-evex512` for `-march=native` when the target doesn't support AVX512 (#91694)

This prevents problems with ports that fail to build with
CPUTYPE=native, if the native CPU supports AVX512F, resulting in errors
like:

  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:197:21: error: always_inline function '_mm512_set1_epi8' requires target feature 'evex512', but would be inlined into function 'adler32_x86_avx512_vl512_vnni' that is compiled without support for 'evex512'
    197 |         const vec_t ones = VSET1_8(1);
        |                            ^
  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:116:23: note: expanded from macro 'VSET1_8'
    116 | #  define VSET1_8(a)            _mm512_set1_epi8(a)
        |                                 ^
  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:197:21: error: AVX vector return of type '__m512i' (vector of 8 'long long' values) without 'evex512' enabled changes the ABI
  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:116:23: note: expanded from macro 'VSET1_8'
    116 | #  define VSET1_8(a)            _mm512_set1_epi8(a)
        |                                 ^


    [11 lines not shown]
DeltaFile
+2-1contrib/llvm-project/llvm/lib/TargetParser/Host.cpp
+2-11 files

FreeBSD/src 14efb9bcontrib/llvm-project/llvm/lib/TargetParser Host.cpp

Merge commit 87f3407856e6 from llvm-project (by Phoebe Wang):

  [X86][Driver] Do not add `-evex512` for `-march=native` when the target doesn't support AVX512 (#91694)

This prevents problems with ports that fail to build with
CPUTYPE=native, if the native CPU supports AVX512F, resulting in errors
like:

  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:197:21: error: always_inline function '_mm512_set1_epi8' requires target feature 'evex512', but would be inlined into function 'adler32_x86_avx512_vl512_vnni' that is compiled without support for 'evex512'
    197 |         const vec_t ones = VSET1_8(1);
        |                            ^
  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:116:23: note: expanded from macro 'VSET1_8'
    116 | #  define VSET1_8(a)            _mm512_set1_epi8(a)
        |                                 ^
  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:197:21: error: AVX vector return of type '__m512i' (vector of 8 'long long' values) without 'evex512' enabled changes the ABI
  /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:116:23: note: expanded from macro 'VSET1_8'
    116 | #  define VSET1_8(a)            _mm512_set1_epi8(a)
        |                                 ^


    [11 lines not shown]
DeltaFile
+2-1contrib/llvm-project/llvm/lib/TargetParser/Host.cpp
+2-11 files

FreeBSD/src 18c38edsys/net if_ovpn.c, tests/sys/net/if_ovpn if_ovpn.sh

if_ovpn: cope with loops

User misconfiguration may lead to routing loops where we try to send the tunnel
packet into the tunnel. This eventually leads to stack overflows and panics.

Avoid this using if_tunnel_check_nesting(), which will drop the packet if we're
looping or we hit three layers of nested tunnels.

MFC after:      1 week
Sponsored by:   Rubicon Communications, LLC ("Netgate")

(cherry picked from commit 59a6666ec91d71f97aaae5195bbfafd9d422db2e)
DeltaFile
+9-0sys/net/if_ovpn.c
+8-0tests/sys/net/if_ovpn/if_ovpn.sh
+17-02 files

FreeBSD/src fecd303sys/net if.c

if: guard against if_ioctl being NULL

There are situations where an struct ifnet has a NULL if_ioctl pointer.

For example, e6000sw creates such struct ifnets for each of its ports so it can
call into the MII code.

If there is then a link state event this calls do_link_state_change()
-> rtnl_handle_ifevent() -> dump_iface() -> get_operstate() ->
get_operstate_ether(). That wants to know if the link is up or down, so it tries
to ioctl(SIOCGIFMEDIA), which doesn't go well if if_ioctl is NULL.

Guard against this, and return EOPNOTSUPP.

PR:             275920
MFC ater:       3 days
Approved by:    re (cperciva)
Sponsored by:   Rubicon Communications, LLC ("Netgate")


    [2 lines not shown]
DeltaFile
+3-0sys/net/if.c
+3-01 files

FreeBSD/src c7581d7stand/libofw ofw_console.c, stand/uboot uboot_console.c

loader: fix stupid typos

Sponsored by:           Netflix
DeltaFile
+1-1stand/libofw/ofw_console.c
+1-1stand/uboot/uboot_console.c
+2-22 files

FreeBSD/src 861f802stand/i386/libi386 textvidc.c

textvidc: Reindent

Since this is now 'new code' go ahead and reindent for modern project
preferences.

Sponsored by:           Netflix
DeltaFile
+347-344stand/i386/libi386/textvidc.c
+347-3441 files

FreeBSD/src 3f012b9stand/i386/libi386 nullconsole.c spinconsole.c

loader: stlye(9) nit: Space between return and the value

Sponsored by:           Netflix
DeltaFile
+3-3stand/i386/libi386/nullconsole.c
+3-3stand/i386/libi386/spinconsole.c
+6-62 files

FreeBSD/src 4cddd20stand/libofw ofw_net.c ofw_console.c

loader/ofw: Style(9) pass over return statements

Make these consistent. Some files weren't even consistent with
themselves. Make them all either return <space> ( <value> ); or
return;

Sponsored by:           Netflix
DeltaFile
+6-6stand/libofw/ofw_net.c
+5-5stand/libofw/ofw_console.c
+4-4stand/libofw/ofw_copy.c
+2-2stand/libofw/devicename.c
+2-2stand/libofw/ofw_time.c
+1-1stand/libofw/ofw_module.c
+20-206 files

FreeBSD/src b3551dastand/efi/libefi efi_console.c

efi_console: Use c99 initializers

Sponsored by:           Netflix
DeltaFile
+8-8stand/efi/libefi/efi_console.c
+8-81 files

FreeBSD/src 125b181stand/userboot/userboot userboot_cons.c

userboot: Use C99 Initializers for each of the consoles here

Sponsored by:           Netflix
DeltaFile
+14-16stand/userboot/userboot/userboot_cons.c
+14-161 files

FreeBSD/src 1f180d0stand/libofw ofw_console.c

ofw: Use C99 initializers for the console struct

Sponsored by:           Netflix
DeltaFile
+7-8stand/libofw/ofw_console.c
+7-81 files

FreeBSD/src 6e28b4astand/uboot uboot_console.c

uboot: Use c99 initializers for the console struct

Sponsored by:           Netflix
DeltaFile
+7-8stand/uboot/uboot_console.c
+7-81 files

FreeBSD/src 2d425b6stand/efi/libefi eficom.c, stand/i386/libi386 comconsole.c

loader: c_init returns 0 or 1

c_init returns 0 (success) or 1 (failure). Don't return other values.

Sponsored by:           Netflix
DeltaFile
+2-2stand/efi/libefi/eficom.c
+2-2stand/i386/libi386/comconsole.c
+4-42 files

FreeBSD/src 803060bstand/i386/libi386 spinconsole.c

i386/spinconsole: Use C99 initializers

Sponsored by:           Netflix
DeltaFile
+7-8stand/i386/libi386/spinconsole.c
+7-81 files

FreeBSD/src f989ebdstand/kboot/kboot hostcons.c

kboot: Use C99 initialiers for hostconsole.

Sponsored by:           Netflix
DeltaFile
+7-8stand/kboot/kboot/hostcons.c
+7-81 files

FreeBSD/src 5e7b0cdstand/i386/libi386 nullconsole.c

i386/nullconsole: Use C99 initializers

Sponsored by:           Netflix
DeltaFile
+7-8stand/i386/libi386/nullconsole.c
+7-81 files

FreeBSD/src 0111f09stand/kboot/kboot main.c

kboot: Initialize hostfs_root sooner (and remove kboot.conf)

Move the initialization of hostfs_root to be a bit sooner. While it
doesn't matter for the default case, we may want to use hostfs files
sooner.

Also, while we're here, remove kboot.conf. It duplicates the command
line and has proven difficult to use. It will be replaced by an early
script that can influence the state of the boot loader before we select
a device to boot from (including strongly suggesting which one to boot
from).

Sponsored by:           Netflix
DeltaFile
+4-4stand/kboot/kboot/main.c
+4-41 files

FreeBSD/src a578e2bstand/i386/libi386 textvidc.c

boot/i386: Use C99 initializer for textvidc

Sponsored by:           Netflix
DeltaFile
+7-8stand/i386/libi386/textvidc.c
+7-81 files