From 569ffd723ab6b7eb5bff163849bc36705adea19b Mon Sep 17 00:00:00 2001 From: purplerain Date: Mon, 23 Sep 2024 18:52:58 +0000 Subject: [PATCH] sync with OpenBSD -current --- lib/libssl/ssl_lib.c | 4 +--- libexec/login_chpass/login_chpass.c | 4 +--- share/man/man7/mdoc.7 | 23 +++++++++++---------- sys/arch/amd64/amd64/machdep.c | 4 ++-- sys/arch/arm64/arm64/cpu.c | 4 +++- sys/arch/arm64/stand/efiboot/efiboot.c | 4 +++- sys/dev/acpi/acpi_x86.c | 5 +++-- sys/dev/acpi/acpibtn.c | 3 ++- sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h | 3 +++ sys/dev/pci/pcidevs | 5 ++++- sys/dev/pci/pcidevs.h | 5 ++++- sys/dev/pci/pcidevs_data.h | 14 ++++++++++++- sys/kern/uipc_usrreq.c | 8 +++---- usr.bin/ssh/authfile.c | 4 +--- usr.bin/ssh/monitor.c | 4 +--- usr.bin/ssh/progressmeter.c | 3 +-- usr.bin/ssh/sshkey.c | 5 +---- 17 files changed, 59 insertions(+), 43 deletions(-) diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 1a2bf3695..63d72baf8 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.329 2024/08/03 04:50:27 tb Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.330 2024/09/22 14:59:48 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1372,10 +1372,8 @@ SSL_ctrl(SSL *s, int cmd, long larg, void *parg) s->max_cert_list = larg; return (l); case SSL_CTRL_SET_MTU: -#ifndef OPENSSL_NO_DTLS1 if (larg < (long)dtls1_min_mtu()) return (0); -#endif if (SSL_is_dtls(s)) { s->d1->mtu = larg; return (larg); diff --git a/libexec/login_chpass/login_chpass.c b/libexec/login_chpass/login_chpass.c index c82ff4115..eaf4bfc6a 100644 --- a/libexec/login_chpass/login_chpass.c +++ b/libexec/login_chpass/login_chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_chpass.c,v 1.21 2018/04/26 12:42:51 guenther Exp $ */ +/* $OpenBSD: login_chpass.c,v 1.22 2024/09/22 04:19:22 jsg Exp $ */ /*- * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved. @@ -44,8 +44,6 @@ #define _PATH_LOGIN_LCHPASS "/usr/libexec/auth/login_lchpass" -#define BACK_CHANNEL 3 - void local_chpass(char **); int diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7 index c621462e5..bccd67d60 100644 --- a/share/man/man7/mdoc.7 +++ b/share/man/man7/mdoc.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mdoc.7,v 1.184 2024/06/17 15:35:33 schwarze Exp $ +.\" $OpenBSD: mdoc.7,v 1.186 2024/09/22 10:32:28 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons .\" Copyright (c) 2010, 2011, 2013-2020 Ingo Schwarze @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 17 2024 $ +.Dd $Mdocdate: September 22 2024 $ .Dt MDOC 7 .Os .Sh NAME @@ -2418,7 +2418,7 @@ The second major version of the C language standard. .br The third major version of the C language standard. .El -.It POSIX.1 before the Single UNIX Specification +.It POSIX.1 before XPG4.2 .Pp .Bl -tag -width "-p1003.1g-2000" -compact .It \-p1003.1-88 @@ -2459,7 +2459,7 @@ Technical Corrigendum. .br Includes POSIX.1-1990, 1b, 1c, and 1i. .El -.It X/Open Portability Guide version 4 and related standards +.It X/Open Portability Guide before XPG4.2 .Pp .Bl -tag -width "-p1003.1g-2000" -compact .It \-xpg3 @@ -2486,7 +2486,7 @@ Updates to POSIX.2. .br Based on POSIX.1 and POSIX.2, published in 1992. .El -.It Single UNIX Specification version 1 and related standards +.It X/Open Portability Guide Issue 4 Version 2 and related standards .Pp .Bl -tag -width "-p1003.1g-2000" -compact .It \-susv1 @@ -2511,13 +2511,14 @@ Networking APIs, including sockets. .br Published in 1995. .El -.It Single UNIX Specification version 2 and related standards +.It X/Open Portability Guide Issue 5 and related standards .Pp .Bl -tag -width "-p1003.1g-2000" -compact .It \-susv2 .St -susv2 +.br This Standard was published in 1997 -and is also called X/Open Portability Guide version 5. +and is also called X/Open Portability Guide Issue 5. It was used as the basis for UNIX 98 certification. The following refer to parts of it. .Pp @@ -2535,7 +2536,7 @@ The following refer to parts of it. .It \-xns5.2 .St -xns5.2 .El -.It Single UNIX Specification version 3 +.It POSIX Issue 6 .Pp .Bl -tag -width "-p1003.1-2001" -compact .It \-p1003.1-2001 @@ -2544,7 +2545,7 @@ The following refer to parts of it. .St -susv3 .br This standard is based on C99, SUSv2, POSIX.1-1996, 1d, and 1j. -It is also called X/Open Portability Guide version 6. +It is also called X/Open Portability Guide Issue 6. It is used as the basis for UNIX 03 certification. .Pp .It \-p1003.1-2004 @@ -2552,7 +2553,7 @@ It is used as the basis for UNIX 03 certification. .br The second and last Technical Corrigendum. .El -.It POSIX issues 7 and 8 +.It POSIX Issues 7 and 8 .Pp .Bl -tag -width "-p1003.1g-2000" -compact .It \-p1003.1-2008 @@ -3029,7 +3030,7 @@ then the macro accepts an arbitrary number of arguments. .It Ic \&Fx Ta Yes Ta Yes Ta n .It Ic \&Hf Ta \&No Ta \&No Ta n .It Ic \&Ic Ta Yes Ta Yes Ta >0 -.It Ic \&In Ta \&No Ta \&No Ta 1 +.It Ic \&In Ta Yes Ta Yes Ta 1 .It Ic \&Lb Ta \&No Ta \&No Ta 1 .It Ic \&Li Ta Yes Ta Yes Ta >0 .It Ic \&Lk Ta Yes Ta Yes Ta >0 diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 0569461b9..7f85f92cb 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.296 2024/07/29 18:43:11 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.297 2024/09/21 19:06:07 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -488,7 +488,7 @@ extern int amd64_has_xcrypt; extern int need_retpoline; const struct sysctl_bounded_args cpuctl_vars[] = { - { CPU_LIDACTION, &lid_action, 0, 2 }, + { CPU_LIDACTION, &lid_action, -1, 2 }, { CPU_PWRACTION, &pwr_action, 0, 2 }, { CPU_CPUID, &cpu_id, SYSCTL_INT_READONLY }, { CPU_CPUFEATURE, &cpu_feature, SYSCTL_INT_READONLY }, diff --git a/sys/arch/arm64/arm64/cpu.c b/sys/arch/arm64/arm64/cpu.c index e19b89b32..31f0fa3ea 100644 --- a/sys/arch/arm64/arm64/cpu.c +++ b/sys/arch/arm64/arm64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.131 2024/07/30 08:59:33 kettenis Exp $ */ +/* $OpenBSD: cpu.c,v 1.132 2024/09/23 13:50:33 jsg Exp $ */ /* * Copyright (c) 2016 Dale Rahn @@ -87,6 +87,7 @@ #define CPU_PART_CORTEX_A520 0xd80 #define CPU_PART_CORTEX_A720 0xd81 #define CPU_PART_CORTEX_X4 0xd82 +#define CPU_PART_NEOVERSE_V3AE 0xd83 #define CPU_PART_NEOVERSE_V3 0xd84 #define CPU_PART_CORTEX_X925 0xd85 #define CPU_PART_CORTEX_A725 0xd87 @@ -177,6 +178,7 @@ struct cpu_cores cpu_cores_arm[] = { { CPU_PART_NEOVERSE_V1, "Neoverse V1" }, { CPU_PART_NEOVERSE_V2, "Neoverse V2" }, { CPU_PART_NEOVERSE_V3, "Neoverse V3" }, + { CPU_PART_NEOVERSE_V3AE, "Neoverse V3AE" }, { 0, NULL }, }; diff --git a/sys/arch/arm64/stand/efiboot/efiboot.c b/sys/arch/arm64/stand/efiboot/efiboot.c index 063b6e445..07e04c331 100644 --- a/sys/arch/arm64/stand/efiboot/efiboot.c +++ b/sys/arch/arm64/stand/efiboot/efiboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efiboot.c,v 1.59 2024/09/20 19:12:50 kettenis Exp $ */ +/* $OpenBSD: efiboot.c,v 1.60 2024/09/23 00:10:04 jsg Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko @@ -1129,6 +1129,8 @@ struct smbios_dtb { "qcom/x1e80100-lenovo-yoga-slim7x.dtb" }, { "SAMSUNG", "Galaxy Book4 Edge", "qcom/x1e80100-samsung-galaxy-book4-edge.dtb" }, + { "HP", "HP Omnibook X Laptop 14-fe0xxx", + "qcom/x1e80100-hp-omnibook-x14.dtb" }, }; void * diff --git a/sys/dev/acpi/acpi_x86.c b/sys/dev/acpi/acpi_x86.c index 7ccc46c3b..41cb67a81 100644 --- a/sys/dev/acpi/acpi_x86.c +++ b/sys/dev/acpi/acpi_x86.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_x86.c,v 1.31 2024/08/31 15:53:44 deraadt Exp $ */ +/* $OpenBSD: acpi_x86.c,v 1.32 2024/09/21 19:06:06 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert * Copyright (c) 2005 Jordan Hargrave @@ -32,12 +32,13 @@ sleep_showstate(void *v, int sleepmode) { struct acpi_softc *sc = v; int fallback_state = -1; + extern int lid_action; switch (sleepmode) { case SLEEP_SUSPEND: sc->sc_state = ACPI_STATE_S3; #ifdef __amd64__ - if (sc->sc_fadt->flags & FADT_POWER_S0_IDLE_CAPABLE) + if (lid_action == -1) sc->sc_state = ACPI_STATE_S0; fallback_state = ACPI_STATE_S0; /* No S3, use S0 */ #endif diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c index ad1b8d1c8..8eca9772a 100644 --- a/sys/dev/acpi/acpibtn.c +++ b/sys/dev/acpi/acpibtn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpibtn.c,v 1.53 2024/08/06 17:38:56 kettenis Exp $ */ +/* $OpenBSD: acpibtn.c,v 1.54 2024/09/21 19:06:06 deraadt Exp $ */ /* * Copyright (c) 2005 Marco Peereboom * @@ -254,6 +254,7 @@ acpibtn_notify(struct aml_node *node, int notify_type, void *arg) switch (lid_action) { case 1: + case -1: goto sleep; #ifdef HIBERNATE case 2: diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h index e6dffd083..ae9251cdf 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h @@ -230,8 +230,11 @@ static const struct pci_matchid amdgpu_devices[] = { 7600, 7600 XT, Pro W7600 */ {0x1002, 0x7483 }, /* Radeon RX 7600M */ {0x1002, 0x7489 }, /* Radeon Pro W7500 */ + {0x1002, 0x7499 }, /* Radeon RX 7300, 7400, Pro W7400 */ /* GC 11.0.3, DCN 3.2.0, dGPU, "Navi 32" */ + {0x1002, 0x7460 }, /* Radeon Pro V710 */ + {0x1002, 0x7461 }, /* Radeon Pro V710 */ {0x1002, 0x7470 }, /* Radeon Pro W7700 */ {0x1002, 0x747e }, /* Radeon RX 7700 XT, 7800 XT */ diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 54e97c537..a5ac0f4e1 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.2089 2024/09/06 03:48:20 jsg Exp $ +$OpenBSD: pcidevs,v 1.2090 2024/09/23 03:59:03 jsg Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -2166,11 +2166,14 @@ product ATI NAVI31_2 0x7448 Navi 31 product ATI NAVI31_4 0x744a Navi 31 product ATI NAVI31_1 0x744c Navi 31 product ATI NAVI31_3 0x745e Navi 31 +product ATI NAVI32_3 0x7460 Navi 32 +product ATI NAVI32_4 0x7461 Navi 32 product ATI NAVI32_1 0x7470 Navi 32 product ATI NAVI32_2 0x747e Navi 32 product ATI NAVI33_1 0x7480 Navi 33 product ATI NAVI33_2 0x7483 Navi 33 product ATI NAVI33_3 0x7489 Navi 33 +product ATI NAVI33_4 0x7499 Navi 33 product ATI MI300A 0x74a0 MI300A product ATI MI300X 0x74a1 MI300X product ATI RADEON_9000IGP 0x7834 Radeon 9000/9100 IGP diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index d8f2d76e0..aa1cdad7b 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.2089 2024/09/06 03:48:20 jsg Exp + * OpenBSD: pcidevs,v 1.2090 2024/09/23 03:59:03 jsg Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -2171,11 +2171,14 @@ #define PCI_PRODUCT_ATI_NAVI31_4 0x744a /* Navi 31 */ #define PCI_PRODUCT_ATI_NAVI31_1 0x744c /* Navi 31 */ #define PCI_PRODUCT_ATI_NAVI31_3 0x745e /* Navi 31 */ +#define PCI_PRODUCT_ATI_NAVI32_3 0x7460 /* Navi 32 */ +#define PCI_PRODUCT_ATI_NAVI32_4 0x7461 /* Navi 32 */ #define PCI_PRODUCT_ATI_NAVI32_1 0x7470 /* Navi 32 */ #define PCI_PRODUCT_ATI_NAVI32_2 0x747e /* Navi 32 */ #define PCI_PRODUCT_ATI_NAVI33_1 0x7480 /* Navi 33 */ #define PCI_PRODUCT_ATI_NAVI33_2 0x7483 /* Navi 33 */ #define PCI_PRODUCT_ATI_NAVI33_3 0x7489 /* Navi 33 */ +#define PCI_PRODUCT_ATI_NAVI33_4 0x7499 /* Navi 33 */ #define PCI_PRODUCT_ATI_MI300A 0x74a0 /* MI300A */ #define PCI_PRODUCT_ATI_MI300X 0x74a1 /* MI300X */ #define PCI_PRODUCT_ATI_RADEON_9000IGP 0x7834 /* Radeon 9000/9100 IGP */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index 003d5dbbd..46ef4bbf3 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.2089 2024/09/06 03:48:20 jsg Exp + * OpenBSD: pcidevs,v 1.2090 2024/09/23 03:59:03 jsg Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -6791,6 +6791,14 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_3, "Navi 31", }, + { + PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_3, + "Navi 32", + }, + { + PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_4, + "Navi 32", + }, { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_1, "Navi 32", @@ -6811,6 +6819,10 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_3, "Navi 33", }, + { + PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_4, + "Navi 33", + }, { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MI300A, "MI300A", diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 270e45593..89c736863 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.209 2024/08/06 20:13:58 mvs Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.210 2024/09/22 08:40:37 claudio Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -234,13 +234,13 @@ uipc_setaddr(const struct unpcb *unp, struct mbuf *nam) * and don't really want to reserve the sendspace. Their recvspace should * be large enough for at least one max-size datagram plus address. */ -#define PIPSIZ 8192 +#define PIPSIZ 32768 u_int unpst_sendspace = PIPSIZ; /* [a] */ u_int unpst_recvspace = PIPSIZ; /* [a] */ u_int unpsq_sendspace = PIPSIZ; /* [a] */ u_int unpsq_recvspace = PIPSIZ; /* [a] */ -u_int unpdg_sendspace = 2*1024; /* [a] really max datagram size */ -u_int unpdg_recvspace = 16*1024; /* [a] */ +u_int unpdg_sendspace = 8192; /* [a] really max datagram size */ +u_int unpdg_recvspace = PIPSIZ; /* [a] */ const struct sysctl_bounded_args unpstctl_vars[] = { { UNPCTL_RECVSPACE, &unpst_recvspace, 0, SB_MAX }, diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index eb0bdeda2..84404dd4e 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.144 2023/03/14 07:26:25 dtucker Exp $ */ +/* $OpenBSD: authfile.c,v 1.145 2024/09/22 12:56:21 jsg Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -47,8 +47,6 @@ #include "ssherr.h" #include "krl.h" -#define MAX_KEY_FILE_SIZE (1024 * 1024) - /* Save a key blob to a file */ static int sshkey_save_private_blob(struct sshbuf *keybuf, const char *filename) diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index 6d34e7240..61a2310f4 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.244 2024/09/15 01:09:40 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.245 2024/09/22 12:56:21 jsg Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -1527,8 +1527,6 @@ monitor_openfds(struct monitor *mon, int do_logfds) mon->m_log_recvfd = mon->m_log_sendfd = -1; } -#define MM_MEMSIZE 65536 - struct monitor * monitor_init(void) { diff --git a/usr.bin/ssh/progressmeter.c b/usr.bin/ssh/progressmeter.c index 5a301b4d2..372b309d8 100644 --- a/usr.bin/ssh/progressmeter.c +++ b/usr.bin/ssh/progressmeter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: progressmeter.c,v 1.53 2023/04/12 14:22:04 jsg Exp $ */ +/* $OpenBSD: progressmeter.c,v 1.54 2024/09/22 12:56:21 jsg Exp $ */ /* * Copyright (c) 2003 Nils Nordman. All rights reserved. * @@ -44,7 +44,6 @@ #define DEFAULT_WINSIZE 80 #define MAX_WINSIZE 512 -#define PADDING 1 /* padding between the progress indicators */ #define UPDATE_INTERVAL 1 /* update the progress meter every second */ #define STALL_TIME 5 /* we're stalled after this many seconds */ diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 1ebcd1c88..07ee9244b 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.146 2024/09/04 05:33:34 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.147 2024/09/22 12:56:21 jsg Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -72,9 +72,6 @@ #define DEFAULT_CIPHERNAME "aes256-ctr" #define DEFAULT_ROUNDS 24 -/* Version identification string for SSH v1 identity files. */ -#define LEGACY_BEGIN "SSH PRIVATE KEY FILE FORMAT 1.1\n" - /* * Constants relating to "shielding" support; protection of keys expected * to remain in memory for long durations