[Midnightbsd-cvs] [MidnightBSD/src] 10cc84: ctfdump: Use getprogname()

Tue Jun 27 11:14:50 EDT 2023

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 10cc84d61f3e273e1573f56f01b7cb4d1e5de9f0
      https://github.com/MidnightBSD/src/commit/10cc84d61f3e273e1573f56f01b7cb4d1e5de9f0
  Author: Zhenlei Huang <zlei at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M cddl/contrib/opensolaris/tools/ctf/common/utils.c
    M cddl/contrib/opensolaris/tools/ctf/dump/dump.c

  Log Message:
  -----------
  ctfdump: Use getprogname()

Also remove no longer used function `getpname()`.

Reviewed by:	markj
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D38740

(cherry picked from commit 3dd5524264095ed8612c28908e13f80668eff2f9)
(cherry picked from commit 994eb2fb8a901c883f2bd24fa29c6cd513cb4340)

  Commit: 2ad297e3801d3b3401f61dafb3cf2c69ca881060
      https://github.com/MidnightBSD/src/commit/2ad297e3801d3b3401f61dafb3cf2c69ca881060
  Author: Mark Johnston <markj at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M cddl/contrib/opensolaris/tools/ctf/common/utils.c
    M cddl/contrib/opensolaris/tools/ctf/common/utils.h
    M cddl/contrib/opensolaris/tools/ctf/dump/dump.c

  Log Message:
  -----------
  ctfdump: Remove definitions of warn() and vwarn()

The presence of the latter causes a link error when building a
statically linked ctfdump(1) because libc defines the same symbol.
libc's warn() is defined as a weak symbol and so does not cause the same
problem, but let's just use libc's version.

Reported by:	stephane rochoy <stephane.rochoy at stormshield.eu>
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 45dd2eaac379e5576f745380260470204c49beac)
(cherry picked from commit 5def1805d144f3e95dac966d72a6fc3878ce6b98)

  Commit: 7a09caa52bbec96eb10220267244b235d0368a78
      https://github.com/MidnightBSD/src/commit/7a09caa52bbec96eb10220267244b235d0368a78
  Author: Joerg Wunsch <joerg at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M release/tools/arm.subr

  Log Message:
  -----------
  MFC: ARM release build: enable IPv6 SLAAC by default

When building ARM release images, enable IPv6 SLAAC by default in
addition to IPv4 DHCP.

Unlike amd64 (and other desktop/server) releases, ARM releases on SoC
setups are usually deployed by just using the installation image, so
there is no interactive network configuration. Not having IPv6
included by default is kind of an anachronism these days, given that
FreeBSD with the KAME project once pioneered IPv6 technology.

(cherry picked from commit 57228a49333505aebbc992f3799819667630f255)

  Commit: 6df91314a448b621fb3a294c296fad5ec5bcb6ae
      https://github.com/MidnightBSD/src/commit/6df91314a448b621fb3a294c296fad5ec5bcb6ae
  Author: Zhenlei Huang <zlei at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M cddl/contrib/opensolaris/tools/ctf/common/utils.h

  Log Message:
  -----------
  ctf: Remove unused function prototype for getpname()

This function prototype should have been removed along with the
implementation.

Fixes:		3dd552426409 ctfdump: Use getprogname()
MFC after:	1 day

(cherry picked from commit f8e1aa85fed08d5f689cb36d65a76d191f6500dd)
(cherry picked from commit eba26d0ba37e647572b3ec285352f778ef0ec9f0)

  Commit: bd9c8200df15c728b1bea3678239718777ccbf8a
      https://github.com/MidnightBSD/src/commit/bd9c8200df15c728b1bea3678239718777ccbf8a
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sbin/ping/ping.c

  Log Message:
  -----------
  ping: Fix unsigned integer underflow resuling in a ping -R segfault

ping -R (F_RROUTE) will loop at ping.c:1381 until it segfaults or
the unsigned int hlen happens to be less than the size of an IP header:

slippy$ ping -R 192.168.0.101
PING 192.168.0.101 (192.168.0.101): 56 data bytes
64 bytes from 192.168.0.101: icmp_seq=0 ttl=63 time=1.081 ms
RR: 	192.168.0.1
	192.168.0.101
	192.168.0.101
	10.1.1.254
	10.1.1.91
unknown option bb
unknown option 32
unknown option 6
...
unknown option 96
unknown option 2d
Segmentation fault

The reason for this is while looping through loose source routing (LSRR)
and strict source routing (SSRR), hlen will become smaller than the IP
header. It may even become negative. This should terminate the loop.
However, when hlen is unsigned, an integer underflow occurs becoming a
large number causing the loop to continue virtually forever until hlen
is either by chance smaller than the lenghth of an IP header or it
segfaults.

Reviewed by:	asomers
Fixes:		46d7b45a267b
Differential Revision:	https://reviews.freebsd.org/D38744

(cherry picked from commit 70960bb86a3ba5b6f5c4652e613e6313a7ed1ac1)

  Commit: f0d86a0ad798bd74c429a6bb87633df633fae266
      https://github.com/MidnightBSD/src/commit/f0d86a0ad798bd74c429a6bb87633df633fae266
  Author: Zhenlei Huang <zlei at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/net/vnet.c
    M sys/net/vnet.h

  Log Message:
  -----------
  vnet: Make vnet_sys[un]init() static

These two functions are intended to be used only when allocating or
destroying vnet instances.

No functional change intended.

Reviewed by:	kp
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D37955

(cherry picked from commit fb9b76e05247e014f5faa554161028f6aa409bfd)
(cherry picked from commit 7b6d9cae9760152f0994d0825ee49cb5b5e204dc)

  Commit: c7345260b16fea374f64b31f86f12768e1e4b191
      https://github.com/MidnightBSD/src/commit/c7345260b16fea374f64b31f86f12768e1e4b191
  Author: Richard Scheffenegger <rscheff at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/netinet/tcp_usrreq.c

  Log Message:
  -----------
  tcp: Make TCP PCAP buffer properly configurable.

Reviewed By:		tuexen, cc, #transport
MFC after:		3 days
Sponsored by:		NetApp, Inc.
Differential Revision:	https://reviews.freebsd.org/D38824

(cherry picked from commit 399a5655e6edf69a63f1c37e66fdad19dcfdb5cf)

  Commit: 639ab2d26a6946f63945fe795fe921fca7e16061
      https://github.com/MidnightBSD/src/commit/639ab2d26a6946f63945fe795fe921fca7e16061
  Author: Kristof Provost <kp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/netpfil/pf/if_pfsync.c

  Log Message:
  -----------
  pfsync: support deferring IPv6 packets

When we send out a deferred packet we must make sure to call
ip6_output() for IPv6 packets. If not we might end up attempting to
ip_fragment() an IPv6 packet, which could lead to us reading outside of
the mbuf.

PR:		268246
Reviewed by:	melifaro, zlei
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D38586

(cherry picked from commit 9a1cab6d79b7286e5f650f57ed95625e6ddb8e4b)

  Commit: 899dd6a252953e809592aa0361600fb206de40c9
      https://github.com/MidnightBSD/src/commit/899dd6a252953e809592aa0361600fb206de40c9
  Author: Kristof Provost <kp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/netpfil/pf/if_pfsync.c

  Log Message:
  -----------
  pfsync: ensure 'error' is always initialised

Reported by:	Herbert J. Skuhra <herbert at gojira.at>
MFC after:	2 weeks

(cherry picked from commit f52ca3dfd5520332e8cb8d08eda1b92aca2a159c)

  Commit: 26b52a93260e8e9d3c7ef0a4fd1c0a43776cd538
      https://github.com/MidnightBSD/src/commit/26b52a93260e8e9d3c7ef0a4fd1c0a43776cd538
  Author: Colin Percival <cperciva at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M release/tools/ec2.conf

  Log Message:
  -----------
  Bump EC2 image size to 5 GB

The latest weekly snapshots failed to install mandatory packages due
to the snapshot disk running out of space.

Direct commit to stable/12.

  Commit: 4e8106491bfa2009dcd01e33e25804c448b765a0
      https://github.com/MidnightBSD/src/commit/4e8106491bfa2009dcd01e33e25804c448b765a0
  Author: Dmitry Chagin <dchagin at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/compat/linprocfs/linprocfs.c

  Log Message:
  -----------
  linprocfs(4): Fixup process size in the /proc/pid/stat file

According to the Linux sources the kernel exposes a proces virtual
memory size via proc filesystem into the three files - stat, status
and statm. This is the struct mm->total_vm value adjusted to the
corresponding units - bytes, kilobytes and pages.

The fix is based on a fernape@ analysis.

PR:		265937
Reported by:	Ray Bellis
MFC after:	3 days

(cherry picked from commit a55b5a9aed3981fcec205e246436991d138c78a2)

  Commit: b2e07d888d9b6228adccc43a0100def87b73a09c
      https://github.com/MidnightBSD/src/commit/b2e07d888d9b6228adccc43a0100def87b73a09c
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M share/man/man4/netgraph.4

  Log Message:
  -----------
  netgraph.4: remove obsolete ng_atm.4 reference

MFC After:	3 days

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D38876

(cherry picked from commit 3518a5bbd9bb0c03b38dea62e577042b779c3aed)

  Commit: 2b670925751c478994532b2246b6341036bff304
      https://github.com/MidnightBSD/src/commit/2b670925751c478994532b2246b6341036bff304
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/conf/NOTES
    M sys/conf/options

  Log Message:
  -----------
  NATM: Remove useless NETGRAPH_ATM_ATMPIF option

This code was removed as part of the NATM removal in 2017 and somehow
this option was missed.

MFC after:	3 days

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D38874

(cherry picked from commit 3746e90118c941eb5c9123e22fe05026b78382ab)

  Commit: f287f7f874b9f858ac1cbebf34a83791e2c5a1e4
      https://github.com/MidnightBSD/src/commit/f287f7f874b9f858ac1cbebf34a83791e2c5a1e4
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/conf/NOTES
    M sys/conf/options

  Log Message:
  -----------
  NgATM: Remove useless NGATM_ATM option

MFC after:	3 days

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D38875

(cherry picked from commit bd32aedeee1a2af8293bfb1a2c85432b7ed8f207)

  Commit: 8c41530cada1d759caa1a3967d262b511b4bfbff
      https://github.com/MidnightBSD/src/commit/8c41530cada1d759caa1a3967d262b511b4bfbff
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M share/man/man4/ng_ccatm.4
    M share/man/man4/ng_sscfu.4
    M share/man/man4/ng_sscop.4
    M share/man/man4/ng_uni.4
    M share/man/man4/ngatmbase.4
    M sys/netgraph/atm/ccatm/ng_ccatm.c
    M sys/netgraph/atm/ngatmbase.c
    M sys/netgraph/atm/sscfu/ng_sscfu.c
    M sys/netgraph/atm/sscop/ng_sscop.c
    M sys/netgraph/atm/uni/ng_uni.c

  Log Message:
  -----------
  NgATM: deprecate

Support for ATM NICs was removed prior to FreeBSD 12.  At the time it
was unclear if this code was still useful without it.  Now the time has
come to finish removing support.

Add DREPRECATION NOTICEs to the manpages and gone_in(14, ...) warnings
in the constructors (or module init for ngatmbase).

MFC after:	3 days
Relnotes:	yes

Reviewed by:	manu, emaste
Differential Revision:	https://reviews.freebsd.org/D38877

(cherry picked from commit 211c302f10d76fc12e50c87039cfc06aa9e659c1)

  Commit: 7b03ebe979422993836aa7dee4491d334cc192b3
      https://github.com/MidnightBSD/src/commit/7b03ebe979422993836aa7dee4491d334cc192b3
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M share/man/man4/ng_atmllc.4
    M sys/netgraph/ng_atmllc.c

  Log Message:
  -----------
  ng_atmllc: deprecate

With the deprecation of NgATM, ng_atmllc is the last vestage of ATM
support so deprecate it too.

MFC after:	3 days
Relnotes:	yes

Reviewed by:	manu, emaste
Differential Revision:	https://reviews.freebsd.org/D38878

(cherry picked from commit c2285a7b092f524b5694e42bfb5fd24f71815771)

  Commit: 49c78a4253f4e6372e85b6593a728d2fa4ece19d
      https://github.com/MidnightBSD/src/commit/49c78a4253f4e6372e85b6593a728d2fa4ece19d
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/usb/usbdevs

  Log Message:
  -----------
  usbdevs: Remove duplicate APC entries

(cherry picked from commit b1723f48d8cdc9ac6fc3fc256b779b3c07827c0b)

  Commit: ed6f057c84dd0edf0cc2da2bc5da6c9525eb39ae
      https://github.com/MidnightBSD/src/commit/ed6f057c84dd0edf0cc2da2bc5da6c9525eb39ae
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/usb/usbdevs

  Log Message:
  -----------
  usbdevs: Add APC Smart-UPS1000

(cherry picked from commit 6f295aab8093e291d2166325e4627321953268c8)

  Commit: a2321aef0493f9bd1b7b2062d300afcd3f8404ae
      https://github.com/MidnightBSD/src/commit/a2321aef0493f9bd1b7b2062d300afcd3f8404ae
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sys/dev/usb/quirk/usb_quirk.c

  Log Message:
  -----------
  usb: Add HID_IGNORE quirk for APC Smart-UPS1000

Without the HID_IGNORE quirk enabled it will appear to be a uhid device.

PR:		269729

(cherry picked from commit 8866ea619a1f91616ba7e002a3ad10dfb10148c9)

  Commit: 02d504a60611ddafac7fd2a039f51d3fa8688e7b
      https://github.com/MidnightBSD/src/commit/02d504a60611ddafac7fd2a039f51d3fa8688e7b
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M crypto/heimdal/lib/gssapi/krb5/arcfour.c

  Log Message:
  -----------
  heimdal: Fix CVE-2022-4152, signature validation error

When CVE-2022-3437 was fixed by changing memcmp to be a constant
time and the workaround for th e compiler was to add "!=0". However
the logic implmented was inverted resulting in CVE-2022-4152.

Reported by:	Timothy E Zingelman <zingelman _AT_ fnal.gov>
Security:	CVE-2022-4152
Security:	https://www.cve.org/CVERecord?id=CVE-2022-45142
Security:	https://nvd.nist.gov/vuln/detail/CVE-2022-45142
Security:	https://security-tracker.debian.org/tracker/CVE-2022-45142
Security:	https://bugs.gentoo.org/show_bug.cgi?id=CVE-2022-45142
Security:	https://bugzilla.samba.org/show_bug.cgi?id=15296
Security:	https://www.openwall.com/lists/oss-security/2023/02/08/1

(cherry picked from commit 5abaf0866445a61c11665fffc148ecd13a7bb9ac)

  Commit: 5874b0fd000567632ec77e7f363988223d2afb46
      https://github.com/MidnightBSD/src/commit/5874b0fd000567632ec77e7f363988223d2afb46
  Author: Kristof Provost <kp at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M tests/sys/netpfil/pf/fragmentation.sh

  Log Message:
  -----------
  pf tests: test IPv6 fragmentation with link-local addresses

We've observed a panic after pf_refragment6() with link-local addresses,
because pf_refragment6() calls ip6_forward() even for a simple output
case.
That results in us entering ip6_forward() with an mbuf with a NULL
m->m_pkthdr.rcvif, which can cause a NULL deref (but seemingly not for
GUAs.

Test sending fragmented link-local packets to pf.

MFC after:	3 days
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D39063

(cherry picked from commit 225e85513fd7a5e31f649e35f0b99454bb725776)

  Commit: 74d8c9949943bb65e3d4a3b1d8dab662cd538f66
      https://github.com/MidnightBSD/src/commit/74d8c9949943bb65e3d4a3b1d8dab662cd538f66
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M share/man/man5/smbfs.5

  Log Message:
  -----------
  smbfs.5: Us .An -nosplit for the AUTHORS section

Use .An -nosplit for the AUTHORS section, so that
it renders without an unnecessary newline.

No .Dd bump since it isn't a content change.

(cherry picked from commit ac6bc808f51654414cb7a72f6849b3e61b1fb172)

  Commit: c2823ae054dbd7ea3f7eec7c4788e0a5bc3521dc
      https://github.com/MidnightBSD/src/commit/c2823ae054dbd7ea3f7eec7c4788e0a5bc3521dc
  Author: Konstantin Belousov <kib at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M lib/libc/amd64/string/memmove.S

  Log Message:
  -----------
  amd64 libc: add missed GNU-stack annotation to memmove/memcpy

Sponsored by:	The FreeBSD Foundation
MFC after:	1 week

(cherry picked from commit ae507c25de5ab327fca6578d2bd015aa4792b20d)

  Commit: 59fa58401fca9703b338fef904d029d5230d7654
      https://github.com/MidnightBSD/src/commit/59fa58401fca9703b338fef904d029d5230d7654
  Author: Ryan Libby <rlibby at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c

  Log Message:
  -----------
  dtrace: avoid gcc9 Walloca-larger-than

gcc9 grew a new warning for unbounded allocas, such as the one in
dt_options_load.  Remove both uses of alloca in dt_options.c.

Reviewed by:	markj
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D22880

(cherry picked from commit fa19b250bdb7e463b58a8e7628ebea09a44197f3)

  Commit: f9999f0da6a7ed5467278c0c197c1576e6c6035c
      https://github.com/MidnightBSD/src/commit/f9999f0da6a7ed5467278c0c197c1576e6c6035c
  Author: John Baldwin <jhb at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M bin/df/df.c

  Log Message:
  -----------
  Revert "df: remove the unused fstype var"

This reverts commit 647f70e6bf4213f3a892277fcafe2c36d81aa3a5.

fstype is used in a call to build_iovec_argf() in this branch, and the
reverted commit didn't remove the variable, just its initialization.

This is a direct commit to stable/12.

Reported by:	GCC -Wmaybe-uninitialized

  Commit: dd7511ee6ee21ddcde28f8c84f79247e460cb17e
      https://github.com/MidnightBSD/src/commit/dd7511ee6ee21ddcde28f8c84f79247e460cb17e
  Author: Ryan Libby <rlibby at FreeBSD.org>
  Date:   2023-06-27 (Tue, 27 Jun 2023)

  Changed paths:
    M sbin/camcontrol/camcontrol.c
    M sys/sys/ata.h

  Log Message:
  -----------
  Declare packed struct ata_params as 2-byte-aligned

This avoids gcc9 warning about unaligned access to the structure when
casting to uint16_t pointer type.

Submitted by:	imp
Reviewed by:	imp
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D22888

(cherry picked from commit 36947e1f4deacec2a88bba226e9b46efebe8655e)

Compare: https://github.com/MidnightBSD/src/compare/1c4c06f5f36c...dd7511ee6ee2