diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 04f61563d..86db0c32b 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1259 2024/02/11 21:56:10 kn Exp $ +# $OpenBSD: install.sub,v 1.1260 2024/02/19 13:53:03 kn Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -3126,9 +3126,7 @@ encrypt_root() { ;; [pP]*) $AI || break ask_passphrase 'New passphrase?' - PASSFILE=/tmp/i/passfile - (umask 077 && print -r -- "$_passphrase" >$PASSFILE) - _args=-p$PASSFILE + _args=-s break ;; [nN]*) return @@ -3142,8 +3140,10 @@ encrypt_root() { md_prep_fdisk $_chunk echo 'RAID *' | disklabel -w -A -T- $_chunk - bioctl -Cforce -cC -l${_chunk}a $_args softraid0 >/dev/null - rm -fP $PASSFILE + # Standard input is ignored in interactive mode. + print -r -- "$_passphrase" | + bioctl -Cforce -cC -l${_chunk}a $_args softraid0 >/dev/null + unset _passphrase # No volumes existed before asking, but we just created one. ROOTDISK=$(get_softraid_volumes) diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp index c7de29996..3c8adf3cb 100644 --- a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp +++ b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp @@ -158,12 +158,6 @@ void x86::getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple, // consider deprecating this and instead warn if the user requests external // retpoline thunks and *doesn't* request some form of retpolines. auto SpectreOpt = clang::driver::options::ID::OPT_INVALID; - if (Triple.isOSOpenBSD() && Triple.getArch() == llvm::Triple::x86_64 && - Args.hasFlag(options::OPT_mretpoline, options::OPT_mno_retpoline, true)) { - Features.push_back("+retpoline-indirect-calls"); - Features.push_back("+retpoline-indirect-branches"); - SpectreOpt = options::OPT_mretpoline; - } else if (Args.hasArgNoClaim(options::OPT_mretpoline, options::OPT_mno_retpoline, options::OPT_mspeculative_load_hardening, options::OPT_mno_speculative_load_hardening)) { diff --git a/gnu/llvm/lld/ELF/Driver.cpp b/gnu/llvm/lld/ELF/Driver.cpp index dcaea265a..eae1a4cc3 100644 --- a/gnu/llvm/lld/ELF/Driver.cpp +++ b/gnu/llvm/lld/ELF/Driver.cpp @@ -510,7 +510,6 @@ constexpr const char *knownZFlags[] = { "nokeep-text-section-prefix", "nopack-relative-relocs", "norelro", - "noretpolineplt", "noseparate-code", "nostart-stop-gc", "notext", diff --git a/lib/libcrypto/pkcs7/pk7_attr.c b/lib/libcrypto/pkcs7/pk7_attr.c index 5eff5241e..52463aa3a 100644 --- a/lib/libcrypto/pkcs7/pk7_attr.c +++ b/lib/libcrypto/pkcs7/pk7_attr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_attr.c,v 1.14 2023/02/16 08:38:17 tb Exp $ */ +/* $OpenBSD: pk7_attr.c,v 1.15 2024/02/19 15:37:44 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -57,14 +57,12 @@ */ #include -#include -#include + #include -#include -#include +#include +#include #include #include -#include int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap) diff --git a/lib/libcrypto/x509/x509_asid.c b/lib/libcrypto/x509/x509_asid.c index ecd35b1f1..c9d3c8d7c 100644 --- a/lib/libcrypto/x509/x509_asid.c +++ b/lib/libcrypto/x509/x509_asid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_asid.c,v 1.41 2023/11/11 09:35:21 tb Exp $ */ +/* $OpenBSD: x509_asid.c,v 1.42 2024/02/19 15:44:10 tb Exp $ */ /* * Contributed to the OpenSSL Project by the American Registry for * Internet Numbers ("ARIN"). @@ -568,6 +568,8 @@ extract_min_max(ASIdOrRange *aor, ASN1_INTEGER **min, ASN1_INTEGER **max) static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice) { + ASIdOrRange *a, *b; + ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max = NULL; ASN1_INTEGER *a_max_plus_one = NULL; ASN1_INTEGER *orig; BIGNUM *bn = NULL; @@ -590,15 +592,8 @@ ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice) * It's a list, check it. */ for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) { - ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, - i); - ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, - i + 1); - ASN1_INTEGER *a_min = NULL, - *a_max = NULL, - *b_min = NULL, - *b_max = - NULL; + a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i); + b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1); if (!extract_min_max(a, &a_min, &a_max) || !extract_min_max(b, &b_min, &b_max)) @@ -640,15 +635,11 @@ ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice) * Check for inverted range. */ i = sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; - { - ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, - i); - ASN1_INTEGER *a_min, *a_max; - if (a != NULL && a->type == ASIdOrRange_range) { - if (!extract_min_max(a, &a_min, &a_max) || - ASN1_INTEGER_cmp(a_min, a_max) > 0) - goto done; - } + a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i); + if (a != NULL && a->type == ASIdOrRange_range) { + if (!extract_min_max(a, &a_min, &a_max) || + ASN1_INTEGER_cmp(a_min, a_max) > 0) + goto done; } ret = 1; @@ -677,6 +668,8 @@ LCRYPTO_ALIAS(X509v3_asid_is_canonical); static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice) { + ASIdOrRange *a, *b; + ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max = NULL; ASN1_INTEGER *a_max_plus_one = NULL; ASN1_INTEGER *orig; BIGNUM *bn = NULL; @@ -707,15 +700,8 @@ ASIdentifierChoice_canonize(ASIdentifierChoice *choice) * former and fixing the latter. */ for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) { - ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, - i); - ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, - i + 1); - ASN1_INTEGER *a_min = NULL, - *a_max = NULL, - *b_min = NULL, - *b_max = - NULL; + a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i); + b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1); if (!extract_min_max(a, &a_min, &a_max) || !extract_min_max(b, &b_min, &b_max)) @@ -800,15 +786,11 @@ ASIdentifierChoice_canonize(ASIdentifierChoice *choice) * Check for final inverted range. */ i = sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; - { - ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, - i); - ASN1_INTEGER *a_min, *a_max; - if (a != NULL && a->type == ASIdOrRange_range) { - if (!extract_min_max(a, &a_min, &a_max) || - ASN1_INTEGER_cmp(a_min, a_max) > 0) - goto done; - } + a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i); + if (a != NULL && a->type == ASIdOrRange_range) { + if (!extract_min_max(a, &a_min, &a_max) || + ASN1_INTEGER_cmp(a_min, a_max) > 0) + goto done; } /* Paranoia */ diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 2143cbe16..0774373c6 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.106 2024/02/09 08:47:42 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.107 2024/02/19 09:25:52 dtucker Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -570,8 +570,7 @@ case "$SCRIPT" in *) REGRESS_INTEROP_PUTTY=no ;; esac -if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then - puttysetup() { +puttysetup() { if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then skip "putty interop tests not enabled" fi @@ -623,8 +622,9 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then echo "KexAlgorithms +diffie-hellman-group14-sha1" \ >>${OBJ}/sshd_proxy fi - } -fi + PUTTYDIR=${OBJ}/.putty + export PUTTYDIR +} REGRESS_INTEROP_DROPBEAR=no if test -x "$DROPBEARKEY" -a -x "$DBCLIENT" -a -x "$DROPBEARCONVERT"; then diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 3a83decb4..ef314b78f 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.2062 2024/02/19 03:00:37 kevlo Exp $ +$OpenBSD: pcidevs,v 1.2063 2024/02/19 05:36:17 jsg Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -4304,6 +4304,32 @@ product INTEL 82597EX_SR 0x1a48 82597EX product INTEL BXT_IGD_2 0x1a84 HD Graphics product INTEL BXT_IGD_3 0x1a85 HD Graphics product INTEL 82597EX_LR 0x1b48 82597EX +product INTEL C741_ESPI 0x1b81 C741 eSPI +product INTEL C740_PCIE_8 0x1bb0 C740 PCIE +product INTEL C740_PCIE_9 0x1bb1 C740 PCIE +product INTEL C740_PCIE_10 0x1bb2 C740 PCIE +product INTEL C740_PCIE_11 0x1bb3 C740 PCIE +product INTEL C740_PCIE_12 0x1bb4 C740 PCIE +product INTEL C740_PCIE_13 0x1bb5 C740 PCIE +product INTEL C740_PCIE_0 0x1bb8 C740 PCIE +product INTEL C740_PCIE_1 0x1bb9 C740 PCIE +product INTEL C740_PCIE_2 0x1bba C740 PCIE +product INTEL C740_PCIE_3 0x1bbb C740 PCIE +product INTEL C740_PCIE_4 0x1bbc C740 PCIE +product INTEL C740_PCIE_5 0x1bbd C740 PCIE +product INTEL C740_PCIE_6 0x1bbe C740 PCIE +product INTEL C740_PCIE_7 0x1bbf C740 PCIE +product INTEL C740_P2SB 0x1bc6 C740 P2SB +product INTEL C740_PMC_1 0x1bc7 C740 PMC +product INTEL C740_SMB 0x1bc9 C740 SMBus +product INTEL C740_SPI 0x1bca C740 SPI +product INTEL C740_TH 0x1bcc C740 TH +product INTEL C740_XHCI 0x1bcd C740 xHCI +product INTEL C740_PMC_2 0x1bce C740 PMC +product INTEL C740_AHCI_1 0x1bd2 C740 AHCI +product INTEL C740_MROM 0x1be6 C740 MROM +product INTEL C740_AHCI_2 0x1bf2 C740 AHCI +product INTEL C740_DMA_SMB 0x1bff C740 DMA SMBus product INTEL 6SERIES_SATA_1 0x1c00 6 Series SATA product INTEL 6SERIES_SATA_2 0x1c01 6 Series SATA product INTEL 6SERIES_AHCI_1 0x1c02 6 Series AHCI @@ -6220,6 +6246,11 @@ product INTEL 82440BX_AGP 0x71a1 82440BX AGP product INTEL 82443GX 0x71a2 82443GX product INTEL 82372FB_IDE 0x7601 82372FB IDE product INTEL 82740 0x7800 82740 AGP +product INTEL Z790_ESPI 0x7a04 Z790 eSPI +product INTEL H770_ESPI 0x7a05 H770 eSPI +product INTEL B760_ESPI 0x7a06 B760 eSPI +product INTEL C266_ESPI 0x7a13 C266 eSPI +product INTEL C262_ESPI 0x7a14 C262 eSPI product INTEL 700SERIES_P2SB 0x7a20 700 Series P2SB product INTEL 700SERIES_PMC 0x7a21 700 Series PMC product INTEL 700SERIES_SMB 0x7a23 700 Series SMBus @@ -7050,7 +7081,12 @@ product INTEL RPL_S_HB_5 0xa705 Core 13G Host product INTEL RPL_H_HB_1 0xa706 Core 13G Host product INTEL RPL_H_HB_2 0xa707 Core 13G Host product INTEL RPL_U_HB_1 0xa708 Core 13G Host +product INTEL RPL_PX_HB_1 0xa709 Core 13G Host +product INTEL RPL_PX_HB_2 0xa70a Core 13G Host product INTEL RPL_PCIE_1 0xa70d Core 13G PCIE +product INTEL RPL_E_HB_1 0xa711 Xeon E-2400 Host +product INTEL RPL_E_HB_2 0xa712 Xeon E-2400 Host +product INTEL RPL_E_HB_3 0xa713 Xeon E-2400 Host product INTEL RPL_H_HB_3 0xa716 Core 13G Host product INTEL RPL_HX_HB_3 0xa719 Core 13G Host product INTEL RPL_U_HB_2 0xa71b Core 13G Host @@ -7067,6 +7103,7 @@ product INTEL RPL_PCIE_2 0xa72d Core 13G PCIE product INTEL RPL_TBT_PCIE2 0xa72f Core 13G PCIE product INTEL RPL_TBT_DMA0 0xa73e Core 13G TBT product INTEL RPL_TBT_PCIE1 0xa73f Core 13G PCIE +product INTEL RPL_S_HB_6 0xa740 Core 14G Host product INTEL RPL_PCIE_3 0xa74d Core 13G PCIE product INTEL RPL_GNA 0xa74f Core 13G GNA product INTEL RPL_IPU 0xa75d Core 13G IPU diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 841711611..cdd316615 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.2062 2024/02/19 03:00:37 kevlo Exp + * OpenBSD: pcidevs,v 1.2063 2024/02/19 05:36:17 jsg Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -4309,6 +4309,32 @@ #define PCI_PRODUCT_INTEL_BXT_IGD_2 0x1a84 /* HD Graphics */ #define PCI_PRODUCT_INTEL_BXT_IGD_3 0x1a85 /* HD Graphics */ #define PCI_PRODUCT_INTEL_82597EX_LR 0x1b48 /* 82597EX */ +#define PCI_PRODUCT_INTEL_C741_ESPI 0x1b81 /* C741 eSPI */ +#define PCI_PRODUCT_INTEL_C740_PCIE_8 0x1bb0 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_9 0x1bb1 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_10 0x1bb2 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_11 0x1bb3 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_12 0x1bb4 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_13 0x1bb5 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_0 0x1bb8 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_1 0x1bb9 /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_2 0x1bba /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_3 0x1bbb /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_4 0x1bbc /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_5 0x1bbd /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_6 0x1bbe /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_PCIE_7 0x1bbf /* C740 PCIE */ +#define PCI_PRODUCT_INTEL_C740_P2SB 0x1bc6 /* C740 P2SB */ +#define PCI_PRODUCT_INTEL_C740_PMC_1 0x1bc7 /* C740 PMC */ +#define PCI_PRODUCT_INTEL_C740_SMB 0x1bc9 /* C740 SMBus */ +#define PCI_PRODUCT_INTEL_C740_SPI 0x1bca /* C740 SPI */ +#define PCI_PRODUCT_INTEL_C740_TH 0x1bcc /* C740 TH */ +#define PCI_PRODUCT_INTEL_C740_XHCI 0x1bcd /* C740 xHCI */ +#define PCI_PRODUCT_INTEL_C740_PMC_2 0x1bce /* C740 PMC */ +#define PCI_PRODUCT_INTEL_C740_AHCI_1 0x1bd2 /* C740 AHCI */ +#define PCI_PRODUCT_INTEL_C740_MROM 0x1be6 /* C740 MROM */ +#define PCI_PRODUCT_INTEL_C740_AHCI_2 0x1bf2 /* C740 AHCI */ +#define PCI_PRODUCT_INTEL_C740_DMA_SMB 0x1bff /* C740 DMA SMBus */ #define PCI_PRODUCT_INTEL_6SERIES_SATA_1 0x1c00 /* 6 Series SATA */ #define PCI_PRODUCT_INTEL_6SERIES_SATA_2 0x1c01 /* 6 Series SATA */ #define PCI_PRODUCT_INTEL_6SERIES_AHCI_1 0x1c02 /* 6 Series AHCI */ @@ -6225,6 +6251,11 @@ #define PCI_PRODUCT_INTEL_82443GX 0x71a2 /* 82443GX */ #define PCI_PRODUCT_INTEL_82372FB_IDE 0x7601 /* 82372FB IDE */ #define PCI_PRODUCT_INTEL_82740 0x7800 /* 82740 AGP */ +#define PCI_PRODUCT_INTEL_Z790_ESPI 0x7a04 /* Z790 eSPI */ +#define PCI_PRODUCT_INTEL_H770_ESPI 0x7a05 /* H770 eSPI */ +#define PCI_PRODUCT_INTEL_B760_ESPI 0x7a06 /* B760 eSPI */ +#define PCI_PRODUCT_INTEL_C266_ESPI 0x7a13 /* C266 eSPI */ +#define PCI_PRODUCT_INTEL_C262_ESPI 0x7a14 /* C262 eSPI */ #define PCI_PRODUCT_INTEL_700SERIES_P2SB 0x7a20 /* 700 Series P2SB */ #define PCI_PRODUCT_INTEL_700SERIES_PMC 0x7a21 /* 700 Series PMC */ #define PCI_PRODUCT_INTEL_700SERIES_SMB 0x7a23 /* 700 Series SMBus */ @@ -7055,7 +7086,12 @@ #define PCI_PRODUCT_INTEL_RPL_H_HB_1 0xa706 /* Core 13G Host */ #define PCI_PRODUCT_INTEL_RPL_H_HB_2 0xa707 /* Core 13G Host */ #define PCI_PRODUCT_INTEL_RPL_U_HB_1 0xa708 /* Core 13G Host */ +#define PCI_PRODUCT_INTEL_RPL_PX_HB_1 0xa709 /* Core 13G Host */ +#define PCI_PRODUCT_INTEL_RPL_PX_HB_2 0xa70a /* Core 13G Host */ #define PCI_PRODUCT_INTEL_RPL_PCIE_1 0xa70d /* Core 13G PCIE */ +#define PCI_PRODUCT_INTEL_RPL_E_HB_1 0xa711 /* Xeon E-2400 Host */ +#define PCI_PRODUCT_INTEL_RPL_E_HB_2 0xa712 /* Xeon E-2400 Host */ +#define PCI_PRODUCT_INTEL_RPL_E_HB_3 0xa713 /* Xeon E-2400 Host */ #define PCI_PRODUCT_INTEL_RPL_H_HB_3 0xa716 /* Core 13G Host */ #define PCI_PRODUCT_INTEL_RPL_HX_HB_3 0xa719 /* Core 13G Host */ #define PCI_PRODUCT_INTEL_RPL_U_HB_2 0xa71b /* Core 13G Host */ @@ -7072,6 +7108,7 @@ #define PCI_PRODUCT_INTEL_RPL_TBT_PCIE2 0xa72f /* Core 13G PCIE */ #define PCI_PRODUCT_INTEL_RPL_TBT_DMA0 0xa73e /* Core 13G TBT */ #define PCI_PRODUCT_INTEL_RPL_TBT_PCIE1 0xa73f /* Core 13G PCIE */ +#define PCI_PRODUCT_INTEL_RPL_S_HB_6 0xa740 /* Core 14G Host */ #define PCI_PRODUCT_INTEL_RPL_PCIE_3 0xa74d /* Core 13G PCIE */ #define PCI_PRODUCT_INTEL_RPL_GNA 0xa74f /* Core 13G GNA */ #define PCI_PRODUCT_INTEL_RPL_IPU 0xa75d /* Core 13G IPU */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index 631f7e482..ea91d4d18 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.2062 2024/02/19 03:00:37 kevlo Exp + * OpenBSD: pcidevs,v 1.2063 2024/02/19 05:36:17 jsg Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -14575,6 +14575,110 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82597EX_LR, "82597EX", }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C741_ESPI, + "C741 eSPI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_8, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_9, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_10, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_11, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_12, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_13, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_0, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_1, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_2, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_3, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_4, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_5, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_6, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PCIE_7, + "C740 PCIE", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_P2SB, + "C740 P2SB", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PMC_1, + "C740 PMC", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_SMB, + "C740 SMBus", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_SPI, + "C740 SPI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_TH, + "C740 TH", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_XHCI, + "C740 xHCI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_PMC_2, + "C740 PMC", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_AHCI_1, + "C740 AHCI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_MROM, + "C740 MROM", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_AHCI_2, + "C740 AHCI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C740_DMA_SMB, + "C740 DMA SMBus", + }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_SATA_1, "6 Series SATA", @@ -22239,6 +22343,26 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82740, "82740 AGP", }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z790_ESPI, + "Z790 eSPI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H770_ESPI, + "H770 eSPI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_B760_ESPI, + "B760 eSPI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C266_ESPI, + "C266 eSPI", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C262_ESPI, + "C262 eSPI", + }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_700SERIES_P2SB, "700 Series P2SB", @@ -25559,10 +25683,30 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_U_HB_1, "Core 13G Host", }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_PX_HB_1, + "Core 13G Host", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_PX_HB_2, + "Core 13G Host", + }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_PCIE_1, "Core 13G PCIE", }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_E_HB_1, + "Xeon E-2400 Host", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_E_HB_2, + "Xeon E-2400 Host", + }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_E_HB_3, + "Xeon E-2400 Host", + }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_H_HB_3, "Core 13G Host", @@ -25627,6 +25771,10 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_TBT_PCIE1, "Core 13G PCIE", }, + { + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_S_HB_6, + "Core 14G Host", + }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_PCIE_3, "Core 13G PCIE", diff --git a/usr.bin/rsync/sender.c b/usr.bin/rsync/sender.c index e2999aa25..8e49f4d0e 100644 --- a/usr.bin/rsync/sender.c +++ b/usr.bin/rsync/sender.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sender.c,v 1.30 2021/08/29 13:43:46 claudio Exp $ */ +/* $OpenBSD: sender.c,v 1.31 2024/02/19 16:39:18 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -432,7 +432,7 @@ rsync_sender(struct sess *sess, int fdin, * poll events on demand. */ - pfd[0].fd = fdin; /* from receiver */ + pfd[0].fd = -1; /* from receiver */ pfd[0].events = POLLIN; pfd[1].fd = -1; /* to receiver */ pfd[1].events = POLLOUT; @@ -440,7 +440,11 @@ rsync_sender(struct sess *sess, int fdin, pfd[2].events = POLLIN; for (;;) { - assert(pfd[0].fd != -1); + /* disable recevier until all buffered data was sent */ + if (pfd[1].fd != -1 && wbufsz > 0) + pfd[0].fd = -1; + else + pfd[0].fd = fdin; if ((c = poll(pfd, 3, poll_timeout)) == -1) { ERR("poll"); goto out; diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index 36a888f98..8fe49ac07 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.485 2024/02/13 16:35:43 claudio Exp $ */ +/* $OpenBSD: bgpd.h,v 1.486 2024/02/19 10:15:35 job Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -705,7 +705,8 @@ enum err_codes { ERR_HOLDTIMEREXPIRED, ERR_FSM, ERR_CEASE, - ERR_RREFRESH + ERR_RREFRESH, + ERR_SENDHOLDTIMEREXPIRED, }; enum suberr_update { diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index be8e2fbf6..fddd2f415 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.462 2024/02/13 16:12:37 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.463 2024/02/19 10:15:35 job Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer @@ -705,11 +705,15 @@ bgp_fsm(struct peer *peer, enum session_events event) change_state(peer, STATE_IDLE, event); break; case EVNT_TIMER_HOLDTIME: - case EVNT_TIMER_SENDHOLD: session_notification(peer, ERR_HOLDTIMEREXPIRED, 0, NULL); change_state(peer, STATE_IDLE, event); break; + case EVNT_TIMER_SENDHOLD: + session_notification(peer, ERR_SENDHOLDTIMEREXPIRED, + 0, NULL); + change_state(peer, STATE_IDLE, event); + break; case EVNT_RCVD_OPEN: /* parse_open calls change_state itself on failure */ if (parse_open(peer)) @@ -746,11 +750,15 @@ bgp_fsm(struct peer *peer, enum session_events event) change_state(peer, STATE_IDLE, event); break; case EVNT_TIMER_HOLDTIME: - case EVNT_TIMER_SENDHOLD: session_notification(peer, ERR_HOLDTIMEREXPIRED, 0, NULL); change_state(peer, STATE_IDLE, event); break; + case EVNT_TIMER_SENDHOLD: + session_notification(peer, ERR_SENDHOLDTIMEREXPIRED, + 0, NULL); + change_state(peer, STATE_IDLE, event); + break; case EVNT_TIMER_KEEPALIVE: session_keepalive(peer); break; @@ -782,11 +790,15 @@ bgp_fsm(struct peer *peer, enum session_events event) change_state(peer, STATE_IDLE, event); break; case EVNT_TIMER_HOLDTIME: - case EVNT_TIMER_SENDHOLD: session_notification(peer, ERR_HOLDTIMEREXPIRED, 0, NULL); change_state(peer, STATE_IDLE, event); break; + case EVNT_TIMER_SENDHOLD: + session_notification(peer, ERR_SENDHOLDTIMEREXPIRED, + 0, NULL); + change_state(peer, STATE_IDLE, event); + break; case EVNT_TIMER_KEEPALIVE: session_keepalive(peer); break; diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c index 9b05d529d..cd7b9d900 100644 --- a/usr.sbin/pppd/sys-bsd.c +++ b/usr.sbin/pppd/sys-bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys-bsd.c,v 1.32 2021/10/24 21:24:19 deraadt Exp $ */ +/* $OpenBSD: sys-bsd.c,v 1.33 2024/02/19 16:39:03 denis Exp $ */ /* * sys-bsd.c - System-dependent procedures for setting up @@ -1123,7 +1123,7 @@ dodefaultroute(g, cmd) rtmsg.gway.sin_len = sizeof(rtmsg.gway); rtmsg.gway.sin_family = AF_INET; rtmsg.gway.sin_addr.s_addr = g; - rtmsg.mask.sin_len = sizeof(rtmsg.dst); + rtmsg.mask.sin_len = sizeof(rtmsg.mask); rtmsg.mask.sin_family = AF_INET; rtmsg.hdr.rtm_msglen = sizeof(rtmsg);