HardenedBSD/src 4e9c1bcsys/contrib/zlib gzread.c zlib.h, sys/contrib/zlib/contrib/gcc_gvmat64 gvmat64.S

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-574sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
+190-124sys/contrib/zlib/gzread.c
+213-94sys/contrib/zlib/zlib.h
+168-99sys/contrib/zlib/gzwrite.c
+38-151sys/contrib/zlib/inflate.c
+91-91sys/contrib/zlib/inffixed.h
+700-1,13342 files not shown
+1,704-1,81048 files

HardenedBSD/src b795742sys/contrib/zlib gzread.c zlib.h, sys/contrib/zlib/contrib/gcc_gvmat64 gvmat64.S

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-574sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
+190-124sys/contrib/zlib/gzread.c
+213-94sys/contrib/zlib/zlib.h
+168-99sys/contrib/zlib/gzwrite.c
+38-151sys/contrib/zlib/inflate.c
+91-91sys/contrib/zlib/inffixed.h
+700-1,13342 files not shown
+1,704-1,81048 files

HardenedBSD/src 7aa1dbasys/contrib/zlib gzread.c zlib.h, sys/contrib/zlib/contrib/gcc_gvmat64 gvmat64.S

MFV: zlib 1.3.2.

Relnotes:       yes
MFC after:      2 weeks
DeltaFile
+0-574sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
+190-124sys/contrib/zlib/gzread.c
+213-94sys/contrib/zlib/zlib.h
+168-99sys/contrib/zlib/gzwrite.c
+38-151sys/contrib/zlib/inflate.c
+91-91sys/contrib/zlib/inffixed.h
+700-1,13331 files not shown
+1,622-1,75137 files

HardenedBSD/src 280d433contrib/gcc_gvmat64 gvmat64.S, contrib/vstudio/vc12 zlibvc.vcxproj

Vendor import of zlib 1.3.2.
DeltaFile
+570-574contrib/gcc_gvmat64/gvmat64.S
+0-1,100contrib/vstudio/vc9/zlibvc.vcproj
+0-875contrib/vstudio/vc17/zlibvc.vcxproj
+0-796contrib/vstudio/vc9/testzlib.vcproj
+0-781contrib/vstudio/vc9/zlibstat.vcproj
+0-668contrib/vstudio/vc12/zlibvc.vcxproj
+570-4,794244 files not shown
+10,397-25,093250 files

HardenedBSD/src eb0a78fsys/x86/include specialreg.h, sys/x86/x86 identcpu.c

x86 FRED: add CPUID, MSR, and CR4 bits

Reviewed by:    jhb
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55810
DeltaFile
+23-0sys/x86/include/specialreg.h
+7-4sys/x86/x86/identcpu.c
+30-42 files

HardenedBSD/src 914a535sys/amd64/amd64 trap.c

amd64: move efirt trap checks into the helper

Reviewed by:    imp, jhb
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55808
DeltaFile
+26-29sys/amd64/amd64/trap.c
+26-291 files

HardenedBSD/src d92ebdesys/amd64/amd64 trap.c

amd64: move code to clear PSL_T on debug exception into a helper

Reviewed by:    jhb
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D55827
DeltaFile
+13-8sys/amd64/amd64/trap.c
+13-81 files

HardenedBSD/src 277830brelease/tools ec2.conf

EC2: Don't use unicode in boot loader

The boot loader menu is disabled by default in EC2, but if it is ever
turned on, the default (unicode) output breaks EC2's web interface to
the serial console.

Set loader_menu_frame="ascii" instead.

MFC after:      3 days
Sponsored by:   Amazon
DeltaFile
+3-1release/tools/ec2.conf
+3-11 files

HardenedBSD/src 4a80559. Makefile.inc1

Revert "Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools"

This reverts commit 858f53dd43ecb84cf2597229e9dbda2f242d9dd6.

It is not clear to me why building from Linux or MacOS fails to build
the toolchain, so reintroduce the long-standing slightly-broken
toolchain until that can be determined.

Reported by:    vexeduxr, jrtc27
DeltaFile
+1-0Makefile.inc1
+1-01 files

HardenedBSD/src 512e189sys/netinet6 in6_pcb.c

inpcb: remove a completely outdated comment
DeltaFile
+0-11sys/netinet6/in6_pcb.c
+0-111 files

HardenedBSD/src 77e0c9csys/netinet in_pcb.c

inpcb: in in_pcbbind() use bool for anonport
DeltaFile
+2-1sys/netinet/in_pcb.c
+2-11 files

HardenedBSD/src 78c4f82usr.sbin/jail command.c

jail: fix crash with startup commands on a jail without name

Jail name is optional, thus don't try setenv(NULL).

Fixes:  d8f021add40c321c4578da55dae52fb93c7ccb5f
DeltaFile
+2-2usr.sbin/jail/command.c
+2-21 files

HardenedBSD/src c70f382libexec/rtld-elf/aarch64 reloc.c

rtld-elf: Remove stray _exit prototype for aarch64

It's not clear why this is here. It's existed since the very first
version of rtld-elf for aarch64 but has never been used, and anything
actually using exit or _exit should be using rtld_libc.h's #define that
aliases them to __sys_exit.

Fixes:  047c6e3ae6ab ("Add the arm64 code to the runtime linker. It's not able to be built as we still need libc_pic for a few things, but this is expected to be ready soon.")
DeltaFile
+0-2libexec/rtld-elf/aarch64/reloc.c
+0-21 files

HardenedBSD/src 703901bsys/dev/ichwd i6300esbwd.c

i6300esbwd: Set error appropriately on event

Per the watchdog driver contract, if the driver successfully arms the
watchdog it must set error to 0, and if it's unable to arm the watchdog
it must leave error alone.

Sponsored by:   Hewlett Packard Enterprise
DeltaFile
+2-1sys/dev/ichwd/i6300esbwd.c
+2-11 files

HardenedBSD/src fa34136share/misc committers-ports.dot

committers-ports.dot: Add new committer (mce)

Update Mentor and Mentee Information.

Reviewed by: osa, fluffy (mentors)
Approved by: fluffy (mentor)
Differential Revision: https://reviews.freebsd.org/D55839
DeltaFile
+3-0share/misc/committers-ports.dot
+3-01 files

HardenedBSD/src e5205b0contrib/ofed/libirdma irdma_uk.c, sys/dev/irdma irdma_cm.c irdma_utils.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+359-134sys/dev/irdma/irdma_cm.c
+260-116sys/dev/irdma/irdma_utils.c
+240-63sys/dev/irdma/irdma_kcompat.c
+122-151sys/dev/irdma/irdma_ctrl.c
+149-113contrib/ofed/libirdma/irdma_uk.c
+147-113sys/dev/irdma/irdma_uk.c
+1,277-69034 files not shown
+2,270-1,25940 files

HardenedBSD/src 03bf2decontrib/ofed/libirdma irdma_uk.c, sys/dev/irdma irdma_cm.c irdma_utils.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+359-134sys/dev/irdma/irdma_cm.c
+260-116sys/dev/irdma/irdma_utils.c
+240-63sys/dev/irdma/irdma_kcompat.c
+122-151sys/dev/irdma/irdma_ctrl.c
+149-113contrib/ofed/libirdma/irdma_uk.c
+147-113sys/dev/irdma/irdma_uk.c
+1,277-69034 files not shown
+2,270-1,25940 files

HardenedBSD/src a1fa147sys/netinet6 nd6_nbr.c

ndp: fix late KASSERT in nd6_queue_timer

Reviewed by:    glebius
Fixes:          7f3b46fe54f1 ("ndp: Add support for Gratuitous...")
Differential Revision: https://reviews.freebsd.org/D55844
DeltaFile
+4-2sys/netinet6/nd6_nbr.c
+4-21 files

HardenedBSD/src e9f3af5contrib/elftoolchain/readelf readelf.c

readelf: Use the gABI name for a dynamic tag value.
DeltaFile
+1-1contrib/elftoolchain/readelf/readelf.c
+1-11 files

HardenedBSD/src 4da237ashare/man/man3 alloca.3

alloca.3: Add entry about defining VLAs in same block as alloca() to BUGS

Refer to alloca() as a (builtin) function or macro, as it could be
defined as either depending on the compiler.

Paragraph about bug comes from Darwin's libc, and example added to
illustrate it.

Reviewed by:    bnovkov
Approved by:    bnovkov
MFC after:      3 days
Obtained from:  https://github.com/apple-oss-distributions/libc (partially)
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D55370
DeltaFile
+29-11share/man/man3/alloca.3
+29-111 files

HardenedBSD/src 9874e4csys/dev/ixgbe ixgbe_type_e610.h ixgbe_e610.c, sys/netinet6 nd6_nbr.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+43-14sys/dev/ixgbe/ixgbe_type_e610.h
+35-13sys/dev/ixgbe/ixgbe_e610.c
+34-0sys/dev/ixgbe/if_ix.c
+12-10sys/netinet6/nd6_nbr.c
+4-1sys/sys/elf_common.h
+128-385 files

HardenedBSD/src 35b1dc2sys/dev/ixgbe ixgbe_type_e610.h ixgbe_e610.c, sys/netinet6 nd6_nbr.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+43-14sys/dev/ixgbe/ixgbe_type_e610.h
+35-13sys/dev/ixgbe/ixgbe_e610.c
+34-0sys/dev/ixgbe/if_ix.c
+12-10sys/netinet6/nd6_nbr.c
+4-1sys/sys/elf_common.h
+128-385 files

HardenedBSD/src d44a333contrib/jemalloc/src jemalloc.c, libexec/rc/rc.d virtual_oss

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-0contrib/jemalloc/src/jemalloc.c
+1-1libexec/rc/rc.d/virtual_oss
+4-12 files

HardenedBSD/src 5b7aa6ccontrib/ofed/libirdma irdma_uk.c, sys/dev/irdma irdma_cm.c irdma_utils.c

irdma(4): update irdma to version 1.3.56-k

Update Intel irdma driver to version 1.3.56-k

Notable changes:
- adding E830 support
- adding E835 support

Signed-off-by: Sobczak, Bartosz <bartosz.sobczak at intel.com>

Reviewed by:    Andrew Zhu <anzhu at netapp.com>
Tested by:      Mateusz Moga <mateusz.moga at intel.com>
MFC after:      2 weeks
Sponsored by:   Intel Corporation
Differential Revision:  https://reviews.freebsd.org/D55479
DeltaFile
+359-134sys/dev/irdma/irdma_cm.c
+260-116sys/dev/irdma/irdma_utils.c
+240-63sys/dev/irdma/irdma_kcompat.c
+122-151sys/dev/irdma/irdma_ctrl.c
+149-113contrib/ofed/libirdma/irdma_uk.c
+147-113sys/dev/irdma/irdma_uk.c
+1,277-69031 files not shown
+2,236-1,24537 files

HardenedBSD/src 6388835libexec/rc/rc.d virtual_oss

rc: virtual_oss: Silence potential hw.snd.default_unit error

PR:             293582
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit e85f221def717660c9daf4c0616dfb9cdfb75827)
DeltaFile
+1-1libexec/rc/rc.d/virtual_oss
+1-11 files

HardenedBSD/src 13ee84csys/dev/ixgbe ixgbe_type_e610.h ixgbe_e610.c

ix(4): Add EEE support for E610 adapters

The ix driver now supports Energy Efficient Ethernet (EEE) on Intel
E610 devices. EEE allows the network interface to enter low-power
states during periods of low link utilization, reducing power
consumption while maintaining full performance when needed.

E610 adapters provide EEE support through BASE-T PHY functionality.
Due to this PHY-based implementation, EEE is supported only
on 2.5Gb speeds and above.

Signed-off-by: Yogesh Bhosale <yogesh.bhosale at intel.com>
Signed-off-by: Krzysztof Galazka <krzysztof.galazka at intel.com>

Authored-by: Yogesh Bhosale <yogesh.bhosale at intel.com>

Approved by:    kbowling (mentor)
Tested by:      Mateusz Moga <mateusz.moga at intel.com>
MFC after:      2 weeks

    [2 lines not shown]
DeltaFile
+43-14sys/dev/ixgbe/ixgbe_type_e610.h
+35-13sys/dev/ixgbe/ixgbe_e610.c
+34-0sys/dev/ixgbe/if_ix.c
+112-273 files

HardenedBSD/src 75f1665sys/netinet6 nd6_nbr.c

ndp: Fix free after use and exclude delayed proxy

PR:     293777
Fixes:  f37fbe30f559 ("ndp: implement delayed ...")
DeltaFile
+12-10sys/netinet6/nd6_nbr.c
+12-101 files

HardenedBSD/src b5f564fsys/sys elf_common.h

sys/elf_common.h: Add the gABI spelling for a dynamic tag value.
DeltaFile
+4-1sys/sys/elf_common.h
+4-11 files

HardenedBSD/src b4d8d9bcontrib/jemalloc/src jemalloc.c

rallocx path: only set errno on the realloc case.

PR:             291677
Obtained from:  jemalloc (commit 83b075789b4239035931c1ee212576d00153bbf0)
Fixes:          c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch")
MFC after:      3 days
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2059

(cherry picked from commit 2c5cd07828ad76c332e3bedc29fc641809e85396)
DeltaFile
+3-1contrib/jemalloc/src/jemalloc.c
+3-11 files

HardenedBSD/src 3abef03contrib/jemalloc/src jemalloc.c

Set errno to ENOMEM on rallocx() OOM failures

realloc() and rallocx() shares path, and realloc() should set errno to
ENOMEM upon OOM failures.

PR:             291677
Obtained from:  jemalloc (commit 38056fea64c34ca4fef0a16212776eaa4de80b78)
Fixes:          c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch")
MFC after:      3 days
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2059

(cherry picked from commit 5583b64f230fe0ea4e3d4bf4566205b521190fbb)
DeltaFile
+1-0contrib/jemalloc/src/jemalloc.c
+1-01 files