HardenedBSD/src fdc5ff6lib/libnetbsd/sys cdefs.h, sbin/route route_netlink.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+30-0lib/libnetbsd/sys/cdefs.h
+6-6sbin/route/route_netlink.c
+11-1sys/netlink/route/rt.c
+3-2usr.bin/netstat/route_netlink.c
+5-0share/man/man5/style.mdoc.5
+2-0sys/netlink/netlink_snl_route_parsers.h
+57-96 files

HardenedBSD/src d5d56c4lib/libnetbsd/sys cdefs.h, sbin/route route_netlink.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+30-0lib/libnetbsd/sys/cdefs.h
+6-6sbin/route/route_netlink.c
+11-1sys/netlink/route/rt.c
+3-2usr.bin/netstat/route_netlink.c
+5-0share/man/man5/style.mdoc.5
+2-0sys/netlink/netlink_snl_route_parsers.h
+57-96 files

HardenedBSD/src b5366f8sbin/route route_netlink.c

route(8): show expire time of each nexthop in monitor

Reviewed by: glebius
Differential Revision: https://reviews.freebsd.org/D55514
DeltaFile
+2-0sbin/route/route_netlink.c
+2-01 files

HardenedBSD/src 8230cf1sbin/route route_netlink.c

route(8): Fix -expire argument when using netlink

Also fixes nexthop expire value on route get using netlink.

Reviewed by: glebius
MFC after: 3 weeks
Differential Revision: https://reviews.freebsd.org/D55444
DeltaFile
+4-6sbin/route/route_netlink.c
+4-61 files

HardenedBSD/src 2f7cfeeusr.bin/netstat route_netlink.c

netstat(1): Fix expire column in -r flag using netlink

Reviewed by: glebius
MFC after: 3 weeks
Differential Revision: https://reviews.freebsd.org/D55440
DeltaFile
+3-2usr.bin/netstat/route_netlink.c
+3-21 files

HardenedBSD/src ff6d1fasys/netlink netlink_snl_route_parsers.h, sys/netlink/route rt.c

rtnetlink: Add support for nexthop expiration in new/get route

Before this change, netlink only shows nexthop
expire value if route is not multipath.
Now it can set expire time during route creation.
Also, show expire time of multipath nexthops.

Reviewed by: glebius
MFC after: 3 weeks
Differential Revision: https://reviews.freebsd.org/D55442
DeltaFile
+11-1sys/netlink/route/rt.c
+2-0sys/netlink/netlink_snl_route_parsers.h
+13-12 files

HardenedBSD/src db5344alib/libnetbsd/sys cdefs.h

lib/libnetbsd: bring in `__type_m{ax,in}*` macro family

These macros are used by some of the NetBSD tests which calculate the
size of types, e.g., `__type_max(time_t)`.

This wraps up the set of macros needed in order to update to the a
netbsd-tests snapshot from this past month.

Obtained from:  https://github.com/netbsd/src (55b4b44)
MFC after:      1 week
DeltaFile
+30-0lib/libnetbsd/sys/cdefs.h
+30-01 files

HardenedBSD/src 2abdbe9share/man/man5 style.mdoc.5

style.mdoc: Add example manuals to FILES

This is the OG meat and potatoes.

MFC after:              3 days
Reviewed by:            0mp, carlavilla
Differential Revision:  https://reviews.freebsd.org/D55301
DeltaFile
+5-0share/man/man5/style.mdoc.5
+5-01 files

HardenedBSD/src b53c5cblib/libc/gen uexterr_format.c, share/man/man4 rge.4

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+189-102usr.sbin/lpr/lpd/recvjob.c
+25-9sys/dev/ath/if_ath_keycache.c
+20-12usr.sbin/lpr/lpd/lpd.c
+20-8lib/libc/gen/uexterr_format.c
+18-8sys/dev/mwl/if_mwl.c
+8-8share/man/man4/rge.4
+280-1475 files not shown
+306-15611 files

HardenedBSD/src 0ddb183lib/libc/gen uexterr_format.c, share/man/man4 rge.4

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+189-102usr.sbin/lpr/lpd/recvjob.c
+25-9sys/dev/ath/if_ath_keycache.c
+20-12usr.sbin/lpr/lpd/lpd.c
+20-8lib/libc/gen/uexterr_format.c
+18-8sys/dev/mwl/if_mwl.c
+8-8share/man/man4/rge.4
+280-1475 files not shown
+306-15611 files

HardenedBSD/src b126abclib/libfetch common.c, sys/kern subr_module.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+46-56lib/libfetch/common.c
+14-11usr.sbin/bsdinstall/scripts/bootconfig
+18-0tools/build/mk/OptionalObsoleteFiles.inc
+7-6usr.bin/diff/diffreg_new.c
+4-4usr.bin/m4/eval.c
+0-8sys/kern/subr_module.c
+89-8518 files not shown
+133-9524 files

HardenedBSD/src 6fd9887lib/libc/gen uexterr_format.c err.3

Refinements to the output when the EXTERROR_VERBOSE environment is set

When kernel external errors are available they are included in the
err(3) library function messages. In addition to the extended error
itself, the kernel also tracks the kernel file and line number at
which the error was generated. This additional information is not
included in the err(3) messages unless the EXTERROR_VERBOSE environment
variable is present. Currently, when EXTERROR_VERBOSE is present,
all the internal extended error information associated with the
error is printed most of which is redundant with the formatted error
message printed by err(3). This change will add only the kernel
file and line number to the err(3) message when EXTERROR_VERBOSE
is present and set to "brief".

Sample output with bad protection bits to mmap:

guest_16 % ./Example bigfile
Example: mmap bigfile: Invalid argument (unknown PROT bits 0x8)


    [12 lines not shown]
DeltaFile
+20-8lib/libc/gen/uexterr_format.c
+7-1lib/libc/gen/err.3
+27-92 files

HardenedBSD/src 56fbfd1usr.sbin/lpr/lpd lpd.c lpd.8

lpd: Add timeout option

Set a 120-second receive timeout on all client connections, and add a
command-line option to change that value.

MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55400
DeltaFile
+20-12usr.sbin/lpr/lpd/lpd.c
+7-1usr.sbin/lpr/lpd/lpd.8
+27-132 files

HardenedBSD/src 9065be0usr.sbin/lpr/lpd recvjob.c

lpd: Improve robustness

* Check for integer overflow when receiving file sizes.

* Check for buffer overflow when receiving file names, and fully
  validate the names.

* Check for integer overflow when checking for available disk space.

* Check for I/O errors when sending status codes.

* Enforce one job per connection and one control file per job (see
  code comments for additional details).

* Simplify readfile(), avoiding constructs vulnerable to integer
  overflow.

* Don't delete files we didn't create.


    [9 lines not shown]
DeltaFile
+189-102usr.sbin/lpr/lpd/recvjob.c
+189-1021 files

HardenedBSD/src 9b75d6eusr.sbin/lpr/chkprintcap chkprintcap.8, usr.sbin/lpr/lp lp.1

lpr: Add deprecation notice

These programs require elevated privileges to work and have not seen
regular maintenance in decades.  Unless someone steps up and overhauls
them, we will have to remove them before 16.0.  Better-maintained
alternatives are available in ports (print/cups, sysutils/LPRng).

MFC after:      3 days

(cherry picked from commit d57dee7ab66f60537b557cb602be194e3eed253d)
DeltaFile
+3-0usr.sbin/lpr/lpr/lpr.1
+3-0usr.sbin/lpr/chkprintcap/chkprintcap.8
+3-0usr.sbin/lpr/lp/lp.1
+3-0usr.sbin/lpr/lpc/lpc.8
+3-0usr.sbin/lpr/lpd/lpd.8
+3-0usr.sbin/lpr/lpq/lpq.1
+18-04 files not shown
+30-010 files

HardenedBSD/src 122de34etc/mtree BSD.usr.dist BSD.debug.dist, share/examples Makefile

build: Move all of lp under LPR option

* Tag related directories with package=lp

* Make the examples/printing directory conditional on MK_LPR

* Make the hosts.lpd(5) manual page conditional on MK_LPR

MFC after:      3 days

(cherry picked from commit d4f6cb75424950ee776833ebc6b57855c094a610)
DeltaFile
+18-0tools/build/mk/OptionalObsoleteFiles.inc
+3-3etc/mtree/BSD.usr.dist
+2-2etc/mtree/BSD.debug.dist
+3-1share/examples/Makefile
+1-1share/man/man5/Makefile
+27-75 files

HardenedBSD/src d58ab2ausr.bin/diff diffreg_new.c

diff: Drop unnecessary casts, fix none algo

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55349

(cherry picked from commit d5404462f691230423dc8cc543c6fdc44f34ec31)
DeltaFile
+7-6usr.bin/diff/diffreg_new.c
+7-61 files

HardenedBSD/src 8124bd4usr.bin/m4 eval.c misc.c, usr.bin/m4/tests eval.m4 regress.eval.out

m4: Fix eval output width

According to POSIX, the optional third argument is the minimum number
of digits to print regardless of sign.  We interpreted it as the minimum
width of the output including the sign.  Additionally, the variable used
to hold this value was confusingly named “maxdigits”.

PR:             293214
MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D55311

(cherry picked from commit 507c611aeac7ca9aed12353b1044bb21ab00afae)
DeltaFile
+4-4usr.bin/m4/eval.c
+0-2usr.bin/m4/misc.c
+2-0usr.bin/m4/tests/eval.m4
+2-0usr.bin/m4/tests/regress.eval.out
+8-64 files

HardenedBSD/src 3b879f7lib/libfetch common.c

libfetch: Fail hard if interrupted while connecting

This fixes an issue where the first address that DNS returns is blocked
by a packet filter, so we hang for a while, then the user hits Ctrl-C,
interrupting connect(2), whereupon we move on to the next address, get
a connection, request the file, and return to fetch(1), which sees that
SIGINT was caught and bails.

Note that we make no attempt to enforce fetchTimeout in the connection
phase, and never have.  It's feasible, but non-trivial, so we'll leave
it as an exercise for future us.

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

(cherry picked from commit afbdcd402bb439bd3d487baaad63b68e95929265)
DeltaFile
+7-1lib/libfetch/common.c
+7-11 files

HardenedBSD/src 4587768lib/libfetch common.c

libfetch: Clean up fetch_info usage

* Provide a wrapper for the common if (verbose) fetch_info(...) idiom.

* Replace remaining instances of fprintf(stderr, ...) with fetch_info().

* Fix a few style nits.

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

(cherry picked from commit 1b7c4d29fdfc975facdc43f6da50947cf3bb8e4a)
DeltaFile
+34-54lib/libfetch/common.c
+34-541 files

HardenedBSD/src d699baclib/libfetch common.c

libfetch: Gracefully skip unsupported protocols

If socket() fails because the address family or protocol is unsupported,
just continue with the next address.

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

(cherry picked from commit b5d570e711da1dad303312bebaf1bd2fb720f0dc)
DeltaFile
+5-1lib/libfetch/common.c
+5-11 files

HardenedBSD/src 8ebc054sys/dev/mwl if_mwl.c

mwl: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Notably this driver was very clear about its expectation the net80211
key layout w/ key, TX MIC and RX MIC matches the firmware layout
and just memcpy()'ed it.  That has been refactored.

Differential Revision:  https://reviews.freebsd.org/D54484
DeltaFile
+18-8sys/dev/mwl/if_mwl.c
+18-81 files

HardenedBSD/src 70786desys/dev/wpi if_wpi.c

wpi: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Differential Revision:  https://reviews.freebsd.org/D54482
DeltaFile
+6-3sys/dev/wpi/if_wpi.c
+6-31 files

HardenedBSD/src 76a2032sys/dev/iwi if_iwi.c

iwi: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Differential Revision:  https://reviews.freebsd.org/D54481
DeltaFile
+3-2sys/dev/iwi/if_iwi.c
+3-21 files

HardenedBSD/src fec9453sys/dev/ipw if_ipw.c

ipw: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Differential Revision:  https://reviews.freebsd.org/D54480
DeltaFile
+3-2sys/dev/ipw/if_ipw.c
+3-21 files

HardenedBSD/src a54a36csys/dev/ath if_ath_keycache.c

ath: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Differential Revision:  https://reviews.freebsd.org/D54479
DeltaFile
+25-9sys/dev/ath/if_ath_keycache.c
+25-91 files

HardenedBSD/src 25e8905share/man/man4 rge.4

rge.4: correct media types in the manual page

Correct media types for 1000Mbit/s, 2500Mbit/s, 5000Mbit/s and 10Gbit/s.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D55496
DeltaFile
+8-8share/man/man4/rge.4
+8-81 files

HardenedBSD/src 5425bdausr.sbin/bsdinstall/scripts bootconfig

bsdinstall: fix EFI boot entry creation

update_uefi_bootentry assumes that the caller sets FREEBSD_BOOTNAME and
mntpt, which isn't the case anymore. The result is that there is no
"FreeBSD" boot entry created/updated after install. Most machines manage
to boot from the removable media path (if the loader is installed there
too), but some don't.

Take the loader's path as an argument and rename the variable used in
the ZFS mirror loop so mntpt can be reused below.

Also mark nentries as a local variable so it doesn't leak out of the
function.

PR:             293385
Fixes:          494de51bc0074472d1b01604f085daea0844f240
MFC after:      2 days
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D55469

    [2 lines not shown]
DeltaFile
+14-11usr.sbin/bsdinstall/scripts/bootconfig
+14-111 files

HardenedBSD/src a369760usr.sbin/efibootmgr efibootmgr.8

efibootmgr.8: capitalize examples section header

MFC after:      3 days

(cherry picked from commit fac9ae3db4e6a28dfd467369e262f636e10a3b01)
DeltaFile
+1-1usr.sbin/efibootmgr/efibootmgr.8
+1-11 files

HardenedBSD/src 923b3fcsys/kern subr_module.c

sys/subr_module: remove useless macro gates

These constants are always defined by sys/sys/linker.h.

Reviewed by: vexeduxr
Signed-off-by: Quentin Thébault <quentin.thebault at defenso.fr>
Sponsored by: Defenso
MFC after: 2 weeks
Closes: https://github.com/freebsd/freebsd-src/pull/2004

(cherry picked from commit 912418193ed1f9a0f58b083037751b1fbc4c30ef)
DeltaFile
+0-8sys/kern/subr_module.c
+0-81 files