From nobody Mon Mar 18 03:40:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TygcL4bk2z5FTsl; Mon, 18 Mar 2024 03:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TygcL46nHz45Ks; Mon, 18 Mar 2024 03:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5mqIoIRTZecFlYqJXj1+urFQDpv8Nc7Z19jGe6SGENI=; b=ur+94ZHYVwMXolspEy8nhNAEKZFDq1dRojCGQPLB+GeneMRkLBypWRJ1EOTLdFGxE16pHf ayPWXrsrw9GtfUaC0mynjvVKaGMR6gZmOfzdYPyvZSELMwVJKds8SaFkNxsSXO2uEuMy9L MkgXYfShy8hyaEZDkyn+J4sQBDH7Sj1mOwxwjCv9XTPxwLzdvWDkL3L+HyfNT7vbpzpZmD jK3h76iDIO6lZUJiMSOu09nhJTeNpU/SVQVbvEOuBZOcMas1TEBx9rv7p41Ke9wFe+HJBF 644akPnFth5U0cfU0sssP6DSyIoaSx/PPvWr39VupvR9muSmUO/tCs9R6SyyqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710733250; a=rsa-sha256; cv=none; b=hPf76Yslpah9UAQwZKxYSDemILfLJfSaCQ0JUbWUHgtkkKLy8G8A1fS9/XT/ai8MLuOWXV lrZSOR1JBPtnsVxsxztVfANhjwUv+A6DgrMk4AqqQEHEK3dXVW+MVjwFgMbquba5gMdakw Pkv9n0beEiIayVjoT707o/Nx6pffcuZW2kDG2HBV2MWDju5WNqeDcymxGV2p7F9Y2nmy7K ftX68XmHaR1ULPdHUuykxyYdhp4+mC1Z5kTR5UmKBypxDZSPD4CszsyBvGrIQbvkMy2Yq7 rUsSDHIX35JPv6KT7UOuFnu1W15N/xDyP7/O2RpApkbuuECahaDl8i5Ch7kL0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5mqIoIRTZecFlYqJXj1+urFQDpv8Nc7Z19jGe6SGENI=; b=Xfv+hZJwaExS92rZ6TeAFXmJ2O395BRrC2k+0xkHHF4/0S8RpbI4eJCkBgBYZdzf3qIEEG touIA4x4SwFT/5xfBPt9uMGmeqICJDk1zGWEbrHORXuLwtjjx2cOWdBvg27EldlXzQ0XIW vfj/K5ZDjWNmAnhXt1IyYa5WQQYyoL2Ub/1MM066OCtibtVKhpnSY0LKgaaTHMxVcscy6d jj2Q04TO5jSRnx5sPe118tkP4gqNlYNZhO/GIfqxuHCzHe8APotoAYDYEf2bEISrIwyt4q LezcpHABcaXomHRM+KiOiD348gZOCri/HT9KaaIEQrKMyyCz087gSnbP/R2ZXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TygcL3k8Nz163L; Mon, 18 Mar 2024 03:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42I3eoCg057368; Mon, 18 Mar 2024 03:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I3eoU7057365; Mon, 18 Mar 2024 03:40:50 GMT (envelope-from git) Date: Mon, 18 Mar 2024 03:40:50 GMT Message-Id: <202403180340.42I3eoU7057365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7e9323311117 - stable/13 - rtld: add some dlopen tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7e9323311117758e7b17386445afd9a7e98bf290 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7e9323311117758e7b17386445afd9a7e98bf290 commit 7e9323311117758e7b17386445afd9a7e98bf290 Author: Kyle Evans AuthorDate: 2024-02-13 15:38:02 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 03:34:05 +0000 rtld: add some dlopen tests dlopen_basic just tests that libthr.so can be dlopen()ed, which will just serve as a sanity check that "libthr.so" is a thing that can be dlopened in case we get a weird failure in dlopen_recursing. dlopen_recursing tests a regression reported after the libsys split, where some dlopen() may cause infinite recursion and a resulting crash. This case is inspired by bdrewery's description of what seemed to be causing his issue. The corresponding fix landed in commit 968a18975ad ("rtld: ignore load_filtees() calls if we already [...]") Reviewed by: kib (cherry picked from commit c5796f1572c82b88e8b6a2810c92f30e5ac3e118) --- libexec/rtld-elf/tests/Makefile | 2 ++ libexec/rtld-elf/tests/dlopen_test.c | 52 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index 06e143a441a1..e380e9850fc1 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -13,6 +13,8 @@ ATF_TESTS_C+= ld_preload_fds SRCS.$t= $t.c common.c .endfor +ATF_TESTS_C+= dlopen_test + WARNS?= 3 .include diff --git a/libexec/rtld-elf/tests/dlopen_test.c b/libexec/rtld-elf/tests/dlopen_test.c new file mode 100644 index 000000000000..ab1e8da1cb41 --- /dev/null +++ b/libexec/rtld-elf/tests/dlopen_test.c @@ -0,0 +1,52 @@ +/*- + * + * Copyright (C) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +#include + +ATF_TC_WITHOUT_HEAD(dlopen_basic); +ATF_TC_BODY(dlopen_basic, tc) +{ + void *hdl, *sym; + + hdl = dlopen("libthr.so", RTLD_NOW); + ATF_REQUIRE(hdl != NULL); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym != NULL); + + dlclose(hdl); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym == NULL); +} + +ATF_TC_WITHOUT_HEAD(dlopen_recursing); +ATF_TC_BODY(dlopen_recursing, tc) +{ + void *hdl; + + /* + * If this doesn't crash, we're OK; a regression at one point caused + * some infinite recursion here. + */ + hdl = dlopen("libthr.so", RTLD_NOW | RTLD_GLOBAL); + ATF_REQUIRE(hdl != NULL); + + dlclose(hdl); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dlopen_basic); + ATF_TP_ADD_TC(tp, dlopen_recursing); + + return atf_no_error(); +} From nobody Mon Mar 18 03:40:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TygcM5d3Vz5FV3C; Mon, 18 Mar 2024 03:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TygcM4yVyz456t; Mon, 18 Mar 2024 03:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTAJVlU0Z/xueghadfLTJUxCINfEFFV4fJf/+Gnpxf8=; b=oUtmM2IWs1bQcEZLZTE6LASqRngPv7mxZslUcaG2alEYT4SPdpGLbgSNCfMhsdkK7MN1+l 3iiMHndzp9TEnC6Sd5oIXskczxn/J6sXItib7HATEKovCWK0p07D0PkF7s4vELqtlgSwnO bfDqF0RRtO+JL0oSfEbM1r5t/m2qe9sFChRbDvHjQTzAAb6wHoB7QTkSkBK2T7tBKwZYb2 URuAgCfK5h570htdtmb0cQ4jMKhaECO/aIk0ujMsIVtQ8DeZAEHs6+8jV0tDIjv6Xaq+pO z2CDQp96xzkQUnX33nhfWwGYaB5Tq6eIBAoqLepBOqKcYzrH6zFhLS4A6xzJcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710733251; a=rsa-sha256; cv=none; b=dReQ7SlVwwx7qB9TESM3YHDMxzDdyFZ4P2VKQg5oPh4utXUcV+Fb7I/2oq9Zx2fFgiGIFM WATxyF4q+o6kpIo3v4eu6BRSVR7f3E+qNuYjcwP6AinxkEhneY9hNhW6C1AJIUZHy/go4X Boal+LASJsgbPIvLXOI2Uj/xbUDtfQcH7eWt8RNT+t7X6aNwiiRipVsDqgZfJhpAFBRjGR 6IcRZrCf/sQTpX+NyB1lBQnFS+g1KlLdJ9DBvQXIbHPCxsJJE1+lEy3Z+suNr3DwRWlggu VeylK8xRUuizqqoKnGS3UfgDR9eollrLN91iq6IjN+TjB7J4RqxPchrlH+wGYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTAJVlU0Z/xueghadfLTJUxCINfEFFV4fJf/+Gnpxf8=; b=l+iPnqfPTPVuFJuwvEu/TZTlBJkr38NkGB7K4nUmmbwY1ipWKW3sB6fifu/q+gWVlEg4zo tUy40/Rghv2SCPKnet9YN7M9+CLLu4B+RFZ8ohqbNx1cfcrqJCJqFafQKuAHdEt9CGVIzH 690+OsW4+jpYIB0ZXF0MTE1Tn6QmbIHxLefvxTrt3uQkWLDLMUkvIMBOOrfHcxlaLFLOsM Gj+bF6w4+yBanKrsvObRaApyf+dugnlHLQfgkWsUIsI+ncCI6sYG37X9aSalPNrGdEcKd1 Na0h2JvXMaHjl1NsaF2yl8ydin6Hl4YikQEXwQW7L28yvfTrMdbL047qIimvUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TygcM4Z75z15cg; Mon, 18 Mar 2024 03:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42I3epVZ057632; Mon, 18 Mar 2024 03:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I3epXH057618; Mon, 18 Mar 2024 03:40:51 GMT (envelope-from git) Date: Mon, 18 Mar 2024 03:40:51 GMT Message-Id: <202403180340.42I3epXH057618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 79a095fa8a66 - stable/13 - crunchgen: slap a dependency on the generated makefile for .lo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 79a095fa8a66a55e21d75c540a56249718d4eb73 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=79a095fa8a66a55e21d75c540a56249718d4eb73 commit 79a095fa8a66a55e21d75c540a56249718d4eb73 Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 03:34:09 +0000 crunchgen: slap a dependency on the generated makefile for .lo crunchgen generates a foo.lo for each binary it will end up crunching into the final product. While they have a dependency on the libs that are used to link them, nothing will force relinking if the set of libs needed to link them is changed. Because of this, incremental builds may not be possible if one builds a version of, e.g., rescue/ with a broken set of libs specified for a project -- a subsequent fix won't be rolled in cleanly, it will require purging the rescue/ objdir. This is a bit crude, but the foo.mk we generate doesn't actually get regenerated all that often in practice, so a spurious relink for the vast majority of crunched objects won't actually happen all that often. Reviewed by: bapt, emaste, imp (cherry picked from commit 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f) --- usr.sbin/crunch/crunchgen/crunchgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 2315b139b8b6..31d64e8ab676 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1129,8 +1129,8 @@ prog_makefile_rules(FILE *outmk, prog_t *p) "int _crunched_%s_stub(int argc, char **argv, char **envp)" "{return main(argc,argv,envp);}\" >%s_stub.c\n", p->ident, p->ident, p->name); - fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)", - p->name, p->name, p->ident); + fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS) %s", + p->name, p->name, p->ident, outmkname); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From nobody Mon Mar 18 11:02:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TysPc2srlz5DF9P; Mon, 18 Mar 2024 11:02:12 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TysPc2Pmyz4vsS; Mon, 18 Mar 2024 11:02:12 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710759732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eaiOHkH9vs/Oilgh6yr7/f86/WcUzI4HIRSe47G9ap0=; b=amAVuKGLcfmW4usx8Yx8fOY3Y8FTm/K7vdRlJZqxWS9RnxfQUOG+fNPt4cU2Z5ZRkYu2F5 MjSl9DQKp/6o2Q0NWeaVWNIFMCIMsK6KdDWb7SC/NvwLXdTW4iHsN0J5YYc1gEt6No/Te0 PrIVjgzLUhSgrq938LjV6uOrusGof1yuHK8mAS8SURSUzEeVzt7muX9cME6zEFCciToXPg WWMhl55uSD/Ipn2w1BaWThmEeZr/8xAYyGQggF0XeIrFKpkbZp3ZzAPuogapHV6XzpP5Vl 6JNHh0FhAvWgn5+52/2dNfgKRYNyhn09mf9fqXJFzz0kL9363znAv2KSS1R55A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710759732; a=rsa-sha256; cv=none; b=Yr4SDj+saHuAhXs46SqoO/CE6WCqSdzf984g0X3DZ43dQJzg6Y0D6clRHbgP25MVVYAmqr UKOw4LUs0cL+nf8qUwP3E3ExpQe5812El1INFZTR1twvMeEc3QIyul+OforTBjjNhQH5sL jQ2wMcS7kAk95zFLvbKCDZaQav2CtQG5fI8047p1xBn094owN6HHuc3upHdHj0qtZEPFCi i9DoD2Jf98/qNL3S4hgjCAT3XP+YoN1iRC6oo12za2R0hV+Z0XnHYLUYk+KKcWkkST7W/e 7wBaD9dqsGg8bJyUJWh1YkeYY/of/PAvsv80EjI2xX2lAPute58B6rAmaq600A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710759732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eaiOHkH9vs/Oilgh6yr7/f86/WcUzI4HIRSe47G9ap0=; b=tZavpLRngPiGVFQIeTQv02A7YrWyGydGBD9Niv1bN1vCUQegY57IvN3mzjwWVSQLZhyJSZ xb0PIbPD4syDh53cMbyQ+BQGoCVzHofHYuQqDrtkYxfZ7uG5yBIv20jtICHFIFL+Im4lMG Fgm2FyHKjs0cA09VNv0yUk1FRlRrA9i8qdo2uspxWd8j6QEQAy3hXN5DtGvTjPQsK4JvTU vzmQUAhh3jzl+xQEHZlv+oRvt8+pOO/UC35+FZmoQH9i2PUH3DCWxCQQZusWMI4aGm/dAG Jgi2/hUDfklZWDtg4AGPkBPuenXK3TW7ODSBZVCXeE9GoFgk/PX4UBRnThtjJw== Received: from ltc.des.dev (163.23.65.37.rev.sfr.net [37.65.23.163]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TysPc1Q0Zz1SV8; Mon, 18 Mar 2024 11:02:12 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 54511782A1; Mon, 18 Mar 2024 12:02:10 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 81be5a55d9bb - stable/14 - zfs: merge openzfs/zfs@c883088df (zfs-2.2-release) into stable/14 In-Reply-To: <202402231838.41NIcEgt087454@gitrepo.freebsd.org> (Martin Matuska's message of "Fri, 23 Feb 2024 18:38:14 GMT") References: <202402231838.41NIcEgt087454@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 18 Mar 2024 12:02:10 +0100 Message-ID: <86r0g7hkgd.fsf@ltc.des.dev> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Martin Matuska writes: > The branch stable/14 has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D81be5a55d9bb8717e280433cd8= 927dfe9bf9b814 > > commit 81be5a55d9bb8717e280433cd8927dfe9bf9b814 > Merge: fba1a994acfe c883088df83c > Author: Martin Matuska > AuthorDate: 2024-02-23 18:37:08 +0000 > Commit: Martin Matuska > CommitDate: 2024-02-23 18:37:36 +0000 > > zfs: merge openzfs/zfs@c883088df (zfs-2.2-release) into stable/14 This broke the gcc12 build due to improper use of the ASSERT0() macro to check a pointer in sys/contrib/openzfs/module/zfs/dbuf.c. Are you going to fix it or am I going to have to revert it? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Mar 18 13:44:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tyx153TF8z5Dlp7; Mon, 18 Mar 2024 13:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyx1530SZz4L8p; Mon, 18 Mar 2024 13:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710769481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaVh9wf0zrANZ33tdjFCmXOUmvrDxxnyl6/EHnz+1rE=; b=S0X2EouJpmJWueCeNurMA0uMMnnsOjf6+PaHyWMW4EoiVu1ZuWUuoRDZ4U86LuW5PPf/8D Z5nKCMgslilALaLMqkeuotFtdm/tVF4qkX20ZqgvZH1eKklfyIpzsxoNf3WwbRYp/z9kGe pOMPYxl/G3OmC7NZAHlJ83ctkIoxJ+aezNOJoA5mdCM3KF0a2oxI1xIYa8O8d/3czDCKb0 ytzATYIC7qpr5/zJVKH+afRBIwXrLbIeHVQhFK6wvIDksyPDcF5z/I0mFpyB3+tkBeveu1 9STAsbOrls7RsMB/hd8LyRftVbJkNMT4g1MtGmy30Pk8MbtiEIsGnWY0TeVhqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710769481; a=rsa-sha256; cv=none; b=euG5h520CXH4pFosku6hNAh1J4D0G7R0hemP1f9+64bTn3Sc8Xy3EAFvuVbZ/aZnDldz+n od2JfCt185LJm3fgTT5YPykAkRdjpsCZqabddTxd9Yrh9qfM/xz63oe+d6HUclI+cBTGZO lVLN234IW5+sq55JbKiOBvUTdudd6mbSYNfzhraSn34wIveHl9qRNEEZAAR9F+sx1brZV4 enhqimWwFIUFUBoZG9/KpzAIFmjkadHIsVvGT4zg2iC1SZEgzdCaXkmedG74Ot6pGPhyx/ XVjT8Y2RQzbCW48J+ICuwgTBJoCRWNghB0ZMCf005mSf6ze11YRFM/T1GuvzYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710769481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaVh9wf0zrANZ33tdjFCmXOUmvrDxxnyl6/EHnz+1rE=; b=Si2/LYp4H06hVlpz2XM28T96goEZ+XYd+QNmeW+3IvvlSjeQ1IjfkRat0l12nkG/iXarOa vwmywFj6kzZqE0kKo3SbgZPxikGsbug84oYK9pmQaAG82tynSDtfHF7PsPbSvK2uy07eH3 wPwKhOAFjhHEZ7m9q2bKnJfV8YXK94sljv94JlzdOqwUeuhhXomNpejvpJf6vILWHbIl8L 5K9BUGpvCwp44x9oBDYtyJNuc4t9Imt94iY0FvD2BaTNnWtMbvE28U1OLa4ZWaZ/XihI5f pl4tc77ind6fdR/Io6mog9YeJmYke3hTd+EU2uFv1w9devzw2neHWngvCaCNmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tyx152c1VzQ3F; Mon, 18 Mar 2024 13:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IDif7W080042; Mon, 18 Mar 2024 13:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IDifKr080039; Mon, 18 Mar 2024 13:44:41 GMT (envelope-from git) Date: Mon, 18 Mar 2024 13:44:41 GMT Message-Id: <202403181344.42IDifKr080039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2165931f74f5 - stable/14 - zfs: fix NULL assertion in dbuf.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2165931f74f5b1cbb8f0dee4b5764b694170a5ec Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2165931f74f5b1cbb8f0dee4b5764b694170a5ec commit 2165931f74f5b1cbb8f0dee4b5764b694170a5ec Author: Martin Matuska AuthorDate: 2024-03-18 11:44:52 +0000 Commit: Martin Matuska CommitDate: 2024-03-18 13:43:58 +0000 zfs: fix NULL assertion in dbuf.c When porting from OpenZFS master 86e115e to OpenZFS 2.2.x 9c40ae0 an assertion in dbuf.c was converted improperly. This is a direct commit to stable/14. OpenZFS PR: 16005 Differential Revision: https://reviews.freebsd.org/D44404 --- sys/contrib/openzfs/module/zfs/dbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index 280001bc34b6..6e983093fb97 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -1923,7 +1923,7 @@ dbuf_unoverride(dbuf_dirty_record_t *dr) zio_free(db->db_objset->os_spa, txg, bp); if (dr->dt.dl.dr_brtwrite) { - ASSERT0(dr->dt.dl.dr_data); + ASSERT(dr->dt.dl.dr_data == NULL); dr->dt.dl.dr_data = db->db_buf; } dr->dt.dl.dr_override_state = DR_NOT_OVERRIDDEN; From nobody Mon Mar 18 14:35:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tyy8C6gsPz5DrPX; Mon, 18 Mar 2024 14:35:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyy8C5txwz4SZ1; Mon, 18 Mar 2024 14:35:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rVSe2EjnfMLXCRBfrRLFymx/lIzV7K8kQV99QGM3x6U=; b=D6euql0ICr8sidOlXzPxU4FJ4Ur2+WC7GLfLcyvCR75cVrAx8yxrT7zqxmdfsXxrv2o7h1 TVTwO+JaxFPKt1Ias4oz9X1BZo6YftCWIGy6yoDVUi+WvbRvVMF9oGfz6/F6xQCE3p7si1 OKyqaC6PnOPvecB8Bsto5bHX0eaSbsmP3oPmLc3Ae7JDK0GbybWl2tqq2H8tf6DjPgTSZA fqI3GgXOcbwDodYcKYybkEsnB7KYEZtenGtOlTufMB0Sn1gJqjknffcAUUc8R1Z1rRVm8K Ihjr5Tywneus6Es8aQ8yjsJ9lSy5w7LhbDBkSP2nzn9KP64DAcADPwCrl1knag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772555; a=rsa-sha256; cv=none; b=g9rnJFSHXjPdXygCMl3EDGgpLtbmNMAiIMs3qahvepCgghLu6/7zxyFf3P2FkGtxvPCmYl Bq/DajP4PTzDrzknmKg0eCK5BsD6F8j0CA9yuN5GhOua4Ye6gO8m+OEmEwCpzudMrr+UvS HHql+TjaPOQyJadKa5LcreBd68GHgt4RJgWUEGNhRsA3kGlk1u3zDVw1/gFZ4Xnbe87Til NgcNxjLnKqbEBgRa1JUW8Kb445IzWxNtPzbOnIBAO+uqjYW+xJxIU4w+e9UDgSzkidhb/s zrgTUhdx3L//Q/9iB+6+2CXE6NstV8SJIfth7iN4HY6VntrfBs++CUbiuf1Gcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rVSe2EjnfMLXCRBfrRLFymx/lIzV7K8kQV99QGM3x6U=; b=aGrgGmmbYQ3gyZ28fbLk1ajBLdTtBDtfOnSYBzqimRGIz+OaSvragkgWBvYvXtvbWEsYO2 aJjg+SNWtNLNC7EmLgzd8ISkI+tt/Eotze9ww3Pyvqp/26jPB1++Rh1+DFPk+QWHze5DRL FskifDFDY9hKSnqShELM+aryxsOfgFNvXgKG2N42BF83OKEqBCUxZRfnDN+f01oZw4xMxW s+HPd9KMu0o71fIJQa5IDeWWECebAp2d7jve+sn5uTjzOvMOJ4HpPnsfWpP/pK2X+K1pcW tTUtUPp/vL/Buw7QkxklgfSWCWvIeRQ/qpWpPNBPmF7HhzF+l565d8ofuzHVJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tyy8C5V1szRbj; Mon, 18 Mar 2024 14:35:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IEZtYM066224; Mon, 18 Mar 2024 14:35:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEZtB3066221; Mon, 18 Mar 2024 14:35:55 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:35:55 GMT Message-Id: <202403181435.42IEZtB3066221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 741ca9249173 - stable/14 - kbdmap: remove debug List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 741ca9249173cb680288e057ad363837056181f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=741ca9249173cb680288e057ad363837056181f2 commit 741ca9249173cb680288e057ad363837056181f2 Author: Baptiste Daroussin AuthorDate: 2024-02-01 07:40:00 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:34:47 +0000 kbdmap: remove debug (cherry picked from commit f14ea00c8f4677d29ca966db6f0906e07f42fdbf) --- usr.sbin/kbdmap/kbdmap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index 78bb9e2741c5..cad42ec29985 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -399,7 +399,6 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) case BSDDIALOG_OK: for (i = 0; i < num_keymaps; i++) { if (listitems[i].on) { - printf("ici\n"); if (!strcmp(program, "kdbmap")) do_kbdcontrol(km_sorted[i]); else @@ -409,7 +408,6 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) } break; default: - printf("la\n"); if (font != NULL && strcmp(font, font_current)) /* Cancelled, restore old font */ vidcontrol(font_current); From nobody Mon Mar 18 14:35:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tyy8F1C85z5DrXV; Mon, 18 Mar 2024 14:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyy8D6vR0z4ScC; Mon, 18 Mar 2024 14:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XvAaQ2UoMPoaW8zZLfN+Eo3JrlxIdwB+A1IIlEALEYY=; b=vGbniRWwEXhja4qzbCr+QIRw2bXKzSgsMepXrTmvOesJbzMhQ2ajvOplHBjexM3KIoor8c tkeKcM1xhBI3ZbV3PGMYAF99VZlk6CXkgPsynaIwsO5V02CCmE7L/mPGoZ9NAxP8D1KYHC kw0z3owFLqtPyH3eCoCOGYkfhxPnduAvLfRFz8WolP5rStrlcoVYOS6wwEG0GUDi17VKq+ dPfq5hqC9kbdh3XcN0rLsxiC2qSiSXVFA9rrBgk1VwqTAbbjqb1swusSG852uxKRwuPs3Z oWPbtI6GfB0qPxk9+wfSKHuIhP8dbZSiEDr4jbGezoG9dJNL7Nv7GYYqH4EtLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772557; a=rsa-sha256; cv=none; b=g5oIDo1TrkI7j7If58DPWccfpWfOrRMuYZDMSLuW6D0YHtLWUCoeIzd7Y31KuL9weLN//6 WZ4Zjhc7xRRb/YDsow8pcSLQ+eZa+wHWUMyklPVD4lV+bulYwqbJDGY+eJpSsrQObqRHoL WnjDoSl1iPRMsrwnZtT7G9DV2wY71TlpHOeYzUrC3K+tR8IAvRwKlWyVmGtMCZq0FWaDDy Y4bRdZkVWuNdxe/F6a2ZbQTCZRK3/2yxG+MCs0UH5/7ioJ/IuJ5U4kTaat1+lYqskrcHKx ePGuW6Tj2rUOjRy4y81GFEiorujyaQ8ChDuXQSMx0i2O9zU/W6uHtvSAiZGJpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XvAaQ2UoMPoaW8zZLfN+Eo3JrlxIdwB+A1IIlEALEYY=; b=YSprV1btG1QCaVm937SBz1Nyts90NQM2sWakUyvuIBuxFo2giNy6dvzzTe0iB8V6YikKOv B7NfZIXqgT94aoqOPduhEredJ1dZ+iENuYmzgV+Ktkc/FwZXnDxfud4Csn/WQE61qWTf8U RCPrfkKjOftiKhonrm6t0NmIQEQCzy5CMyP1bC3qokMYbM3Os3btI/tn+xEoagtv1QbnLw j5aDgQt3C/N3nQh8MVUcgyTlkOLJp3NRpJyV1FACsEVxeco+gYXdzjC8efHZg07PMyrz2/ 4IgqS5B3rwyfkaVmxHBdKx6DQM3nhbRt04AUDBfC9GWti0+XFdRTFBroj1+sWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tyy8D6W0fzRbk; Mon, 18 Mar 2024 14:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IEZuj8066278; Mon, 18 Mar 2024 14:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEZuv9066275; Mon, 18 Mar 2024 14:35:56 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:35:56 GMT Message-Id: <202403181435.42IEZuv9066275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 20062c378b34 - stable/14 - kbdmap: fix typo preventing kbdmap to work under vt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20062c378b34f28f1f9a8025f0c5899a5349c903 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=20062c378b34f28f1f9a8025f0c5899a5349c903 commit 20062c378b34f28f1f9a8025f0c5899a5349c903 Author: Baptiste Daroussin AuthorDate: 2024-02-01 07:44:04 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:34:49 +0000 kbdmap: fix typo preventing kbdmap to work under vt (cherry picked from commit 0f4e8037332fa5e64b3bb291c9b1ba7f8d8b4d4e) --- usr.sbin/kbdmap/kbdmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index cad42ec29985..7735a0e55191 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -399,7 +399,7 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) case BSDDIALOG_OK: for (i = 0; i < num_keymaps; i++) { if (listitems[i].on) { - if (!strcmp(program, "kdbmap")) + if (!strcmp(program, "kbdmap")) do_kbdcontrol(km_sorted[i]); else do_vidfont(km_sorted[i]); From nobody Mon Mar 18 14:35:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tyy8G3g3Rz5DrK0; Mon, 18 Mar 2024 14:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyy8G0yPmz4T1t; Mon, 18 Mar 2024 14:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9gmIpk1CWH5PkmQ+0HOROs2Y8yWcyDiiEMSnUxYpMeQ=; b=bLPB6bR9o3xDEVHcmsQIGx/But6EN1enLb5f8wWkam0iqRtMx3WMul+aAd3DyMdkDIjye2 Ki33l8wrai8+uNsfRYlgiVysMYwOopuk0UMyL6N0BIwHwqfN9dz1474hme5+8dPHUQJr2C p8+ZgJrfQHtE9LAJeHLuDBTKqB2S202c5inQmlhGk/bO6imTvkCdEceJ/J+1kok2FzcJLd EBQBmo2So9ZCbt3geY1udO+G40rHp/WxuMv+wpKG6VXTMtuxfS1HTPQ5ihdwj2fa/K119j 4Iogv1aPRmfkG8lEebrtMxTMxaTP8sGzK2rjL7Q5UF1drwQsYHim408CeMDtcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772558; a=rsa-sha256; cv=none; b=i/rx5TdlyfLmRFdAr0C2lNe5aSuJ2DO+SlL3EZLa/B0ywoXBECgcgOkcWp+C0VnTodQbYC MUnwV43/YWLmFv5c5b7M9j0vX9qQxFNUUIKx2hmEWJzgmVXJZmJL3mZGzoexBM2afjQmEb l/iz7q39chmx2om1jQKU0zJMtC9uteAEPZA97p1gZvx2zsyAd9WlDuVOhKWc4bbY+ZugvD GluSyJlN4spTNPTSmNOEbzBHYvUORb6EjAPfotYnaRtErOMt/8IoJfP7t3PEFdKJLRHjOg 2ZWuZm7Okai3LyE2FInG0j1RY+Glgq+ZrGW3cyQnuyOMciAEsPLoraL2I+nv1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9gmIpk1CWH5PkmQ+0HOROs2Y8yWcyDiiEMSnUxYpMeQ=; b=FYw/1zQyU9gF2dM0cKDtRQZCBGGnYj9199LzqXpiWTiuDAK4wVTwFWI1RQDxA5Tl0MSwul CD0Kpea/JAARpKc3qFHgLdjUVGcHrxXfRFActMhgxFvgrHDNecAKudTCeTLMN8QfiS8pL8 iTo02NCgLQTQWvPjOE/OFWJ3ayVnIY1npTKxv6BMFIYkqWVPuqtnYtXuOSoKo6OECc1fvI OxKKuTNl7ajshkSCagMg1YHAYFwfsJ7kW6loFv2prcZ0pDGEjRGgwmcv6Y+cwH9HV9oWDK /feLQp4C1vcH5sCDhfiaT4rlZzI5LPf1gFvUbRno7/BIvL2S/URoXxAgVQS/Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tyy8G0Z3YzRDN; Mon, 18 Mar 2024 14:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IEZwtZ066317; Mon, 18 Mar 2024 14:35:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEZvmX066314; Mon, 18 Mar 2024 14:35:57 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:35:57 GMT Message-Id: <202403181435.42IEZvmX066314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 122f46bd922b - stable/14 - pci_vendors: update to 2024.02.02 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 122f46bd922b060e831cfc8dd6c8d1e1d33fa6d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=122f46bd922b060e831cfc8dd6c8d1e1d33fa6d4 commit 122f46bd922b060e831cfc8dd6c8d1e1d33fa6d4 Author: Baptiste Daroussin AuthorDate: 2024-02-27 13:01:11 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:35:31 +0000 pci_vendors: update to 2024.02.02 (cherry picked from commit cce3a70a77a94751ce2d65890e539e24ff6081a3) --- share/misc/pci_vendors | 723 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 615 insertions(+), 108 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index bad1d0bd066b..ca3e5af4c97c 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.11.11 -# Date: 2023-11-11 03:15:02 +# Version: 2024.02.02 +# Date: 2024-02-02 14:41:33 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -48,7 +48,11 @@ 7a15 Vivante GPU (Graphics Processing Unit) 7a19 PCI-to-PCI Bridge 7a24 OHCI USB Controller +# Found on 7A2000 PCH + 7a25 LG100 GPU 7a29 PCI-to-PCI Bridge +# Found on 7A2000 PCH + 7a36 Display Controller 0018 Fn-Link Technology Limited 6252 6252CPUB 802.11ax PCIe Wireless Network Adapter 001c PEAK-System Technik GmbH @@ -82,14 +86,24 @@ 8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] 025e Solidigm 0b60 NVMe DC SSD [Sentinel Rock Plus controller] + 025e 8008 NVMe DC SSD U.2 15mm [D7-P5510] 025e 8208 NVMe DC SSD U.2 15mm [D7-P5810] + 025e 8d1d NVMe DC SSD E1.L 9.5mm [D5-P5316] + 025e 9008 NVMe DC SSD U.2 15mm [D7-P5520] + 025e 900c NVMe DC SSD E1.S 9.5mm [D7-P5520] + 025e 900d NVMe DC SSD E1.S 15mm [D7-P5520] + 025e 901c NVMe DC SSD E1.L 9.5mm [D7-P5520] + 025e 9108 NVMe DC SSD U.2 15mm [D7-P5620] + 025e c008 NVMe DC SSD U.2 15mm [D5-P5530] 025e d408 NVMe DC SSD U.2 15mm [D5-P5430] 025e d40c NVMe DC SSD E1.S 9.5mm [D5-P5430] 025e d419 NVMe DC SSD E3.S 7.5mm [D5-P5430] 025e d808 NVMe DC SSD U.2 15mm [D5-P5336] 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] + 025e d81c NVMe DC SSD E1.L 18mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] + 2b59 NVMe DC SSD [Atomos Prime] f1ab P41 Plus NVMe SSD (DRAM-less) [Echo Harbor] f1ac P44 Pro NVMe SSD [Hollywood Beach] 0270 Hauppauge computer works Inc. (Wrong ID) @@ -177,6 +191,12 @@ 0a06 RCB672FXX 672-channel modular analog telephony card 0bae Bachmann electronic GmbH 0ccd Preferred Networks, Inc. + 0110 MN-Core + 0120 MN-Core 2 + 0ccd 0000 MN-Core 2 16GB + 0ccd 0010 MN-Core 2 32GB + 0200 MN-Core Direct Connect + 0201 MN-Core 2 Middle-plane 0e11 Compaq Computer Corporation 0001 PCI to EISA Bridge 0002 PCI to ISA Bridge @@ -821,6 +841,22 @@ 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 1028 22d2 PERC H975i Front 1028 22d3 PERC H975i Adapter + 1d49 020b ThinkSystem 460-16e SAS/SATA PCIe Gen5 24Gb HBA + 00b5 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx +# 9760W 32 internal port RAID controller + 1000 5000 MegaRAID 9760W-32i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal port RAID controller + 1000 5001 MegaRAID 9760W-16i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal and 16 external port RAID controller + 1000 5010 MegaRAID 9760W-16i16e 24G SAS/PCIe Storage Adapter +# 9700W 32 internal port Storage controller + 1000 5020 eHBA 9700W-32i 24G SAS/PCIe Storage Adapter +# 9700W 16 internal port Storage controller + 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter +# 9700 16 external port Storage controller + 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter +# Broadcom next-gen MPT PCIe switch + 00b8 Fusion-MPT Switch SAS50xx/SAS51xx 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1057,10 +1093,12 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter + 1d49 0507 ThinkSystem RAID 545-8i PCIe Gen4 12Gb Adapter 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit 1d49 0703 ThinkSystem M.2 RAID B540d-2HS SATA/NVMe Enablement Kit + 1d49 0704 ThinkSystem M.2 RAID B545i-2i SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1076,6 +1114,7 @@ 8086 0520 MegaRAID RAID Controller SRCU41L 8086 0523 MegaRAID RAID Controller SRCS16 3050 SAS2008 PCI-Express Fusion-MPT SAS-2 + 3150 1068e 6001 DX1 Multiformat Broadcast HD/SD Encoder/Decoder c010 PEX880xx PCIe Gen 4 Switch 1000 100b PEX88000 PCIe Gen 4 Virtual Upstream/Downstream Port @@ -1172,6 +1211,8 @@ 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] +# Used in the Steam Deck OLED + 1435 Sephiroth [AMD Custom GPU 0405] 145a Dummy Function (absent graphics controller) 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch @@ -1211,7 +1252,7 @@ 1637 Renoir Radeon High Definition Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 -# Used in the Steam Deck +# Used in the Steam Deck LCD 163f VanGogh [AMD Custom GPU 0405] 1640 Rembrandt Radeon High Definition Audio Controller 164c Lucienne @@ -2732,6 +2773,7 @@ 1028 2120 Radeon HD 6450 103c 2128 Radeon HD 6450 103c 2aee Radeon HD 7450A + 1043 047b EAH6450 SILENT/DI/1GD3(LP) 1092 6450 Radeon HD 6450 1462 2125 Radeon HD 6450 1462 2346 Radeon HD 7450 @@ -3729,6 +3771,7 @@ 6980 Polaris12 6981 Lexa XT [Radeon PRO WX 3200] 6985 Lexa XT [Radeon PRO WX 3100] + 103c 83b5 Radeon PRO WX 3100 6986 Polaris12 6987 Lexa [Radeon 540X/550X/630 / RX 640 / E9171 MCM] 698f Lexa XT [Radeon PRO WX 3100 / Barco MXRT 4700] @@ -3919,6 +3962,7 @@ 73a5 Navi 21 [Radeon RX 6950 XT] 1849 5230 Navi 21 [ASRock OC Forumla Radeon RX 6950XT] 1da2 441d Navi 21 [Sapphire Nitro+ Radeon RX 6950 XT] + 1eae 6950 Navi 21 [XFX Speedster MERC319 Radeon RX 6950 XT] 73ab Navi 21 Pro-XLA [Radeon Pro W6800X/Radeon Pro W6800X Duo] 73ae Navi 21 [Radeon Pro V620 MxGPU] 73af Navi 21 [Radeon RX 6900 XT] @@ -3938,8 +3982,11 @@ 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] + 148c 2409 Red Devil RX 6700 XT 1849 5219 Radeon RX 6700 XT Challenger D 1849 5222 RX 6700 XT Challenger D OC +# Gaming 1440/QHD Overclock edition with 12 Gb GDDR6 and PCIe 4.0 of Radeon RX 6700 XT by Sapphire PULSE manufactured on autumn 2022 / C1 reviseion + 1da2 445e Radeon RX 6700 XT GAMING OC 12G [Sapphire PULSE] 1da2 465e Radeon RX 6750 XT PULSE OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT @@ -3968,17 +4015,20 @@ 1da2 e457 PULSE AMD Radeon RX 6500 XT 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] - 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 744c Navi 31 [Radeon RX 7900 XT/7900 XTX/7900M] 1002 0e3b RX 7900 GRE [XFX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] + 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] 7489 Navi 33 [Radeon Pro W7500] + 74a0 Aqua Vanjaram [Instinct MI300A] + 74a1 Aqua Vanjaram [Instinct MI300X] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4362,6 +4412,7 @@ aa90 Turks HDMI Audio [Radeon HD 6500/6600 / 6700M Series] 1028 04a3 Precision M4600 aa98 Caicos HDMI Audio [Radeon HD 6450 / 7450/8450/8490 OEM / R5 230/235/235X OEM] + 1043 aa98 EAH6450 SILENT/DI/1GD3(LP) 174b aa98 Radeon HD 6450 1GB DDR3 aaa0 Tahiti HDMI Audio [Radeon HD 7870 XT / 7950/7970] aab0 Oland/Hainan/Cape Verde/Pitcairn HDMI Audio [Radeon HD 7000 Series] @@ -4835,6 +4886,7 @@ 5343 SPEA 3D Accelerator 1018 Unisys Systems 1019 Elitegroup Computer Systems + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 101a AT&T GIS (NCR) 0005 100VG ethernet 0007 BYNET BIC4G/2C/2G @@ -5345,7 +5397,7 @@ 1716 Family 12h/14h Processor Function 5 1718 Family 12h/14h Processor Function 6 1719 Family 12h/14h Processor Function 7 - 2000 79c970 [PCnet32 LANCE] + 2000 79C97x [PCnet32 LANCE] 1014 2000 NetFinity 10/100 Fast Ethernet 1022 2000 PCnet - Fast 79C971 103c 104c Ethernet with LAN remote power Adapter @@ -5359,7 +5411,7 @@ 1259 2454 AT-2450v4 10Mb Ethernet Adapter 1259 2700 AT-2700TX 10/100 Fast Ethernet 1259 2701 AT-2700FX 100Mb Ethernet - 1259 2702 AT-2700FTX 10/100 Mb Fiber/Copper Fast Ethernet + 1259 2702 AT-2700FTX (AM79C976KD [PCnet-PRO] chipset) 10/100 Mb Fiber/Copper Fast Ethernet 1259 2703 AT-2701FX 1259 2704 AT-2701FTX 10/100 Mb Fiber/Copper Fast Ethernet 4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard @@ -5373,7 +5425,7 @@ 1092 0a78 Multimedia Home Network Adapter 1668 0299 ActionLink Home Network Adapter 2003 Am 1771 MBW [Alchemy] - 2020 53c974 [PCscsi] + 2020 AM53/79C974 [PC-SCSI] 1af4 1100 QEMU Virtual Machine 2040 79c974 2080 CS5536 [Geode companion] Host Bridge @@ -5418,6 +5470,10 @@ 43ee 500 Series Chipset USB 3.1 XHCI Controller # maybe 1b21 1142 ASM1042A USB 3.0 Host Controller + 43f4 600 Series Chipset PCIe Switch Upstream Port + 43f5 600 Series Chipset PCIe Switch Downstream Port + 43f6 600 Series Chipset SATA Controller + 43f7 600 Series Chipset USB 3.2 Controller 57a3 Matisse PCIe GPP Bridge 57a4 Matisse PCIe GPP Bridge 57ad Matisse Switch Upstream @@ -6404,6 +6460,7 @@ 103c Hewlett-Packard Company 1005 A4977A Visualize EG 1008 Visualize FX + 1020 548XX Scope Interface 1028 Tach TL Fibre Channel Host Adapter 1029 Tach XL2 Fibre Channel Host Adapter 107e 000f Interphase 5560 Fibre Channel Adapter @@ -6560,8 +6617,6 @@ 3010 Samurai_1 3020 Samurai_IDE 1043 ASUSTeK Computer Inc. - 0464 Radeon R9 270x GPU - 0521 RX580 [RX 580 Dual O8G] 0675 ISDNLink P-IN100-ST-D 0675 1704 ISDN Adapter (PCI Bus, D, C) 0675 1707 ISDN Adapter (PCI Bus, DV, W) @@ -7020,6 +7075,7 @@ 90dc Baikal DMA Controller 90dd Baikal Memory (DDR3/SPM) 90de Baikal USB 3.0 xHCI Host Controller + 90eb CXD90062GG 9121 Nextorage NEM-PA NVMe SSD for PlayStation 104e Oak Technology, Inc 0017 OTI-64017 @@ -7251,6 +7307,7 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. + 9602 RS780/RS880 PCI to PCI bridge (int gfx) e0c3 T99W175 5G Modem [Snapdragon X55] 105c Wipro Infotech Limited 105d Number 9 Computer Company @@ -7492,7 +7549,7 @@ 1076 Chaintech Computer Co. Ltd 1077 QLogic Corp. 1016 ISP10160 Single Channel Ultra3 SCSI Processor - 1020 ISP1020 Fast-wide SCSI + 1020 ISP1020/1040 Fast-wide SCSI 1022 ISP1022 Fast-wide SCSI 1080 ISP1080 SCSI Host Adapter 1216 ISP12160 Dual Channel Ultra3 SCSI Processor @@ -10320,6 +10377,7 @@ 1043 402f AGP-V8200 DDR 1048 0c70 GLADIAC 920 0201 NV20 [GeForce3 Ti 200] + 1462 8503 G3Ti200 Pro VT128 0202 NV20 [GeForce3 Ti 500] 1043 405b V8200 T5 1545 002f Xtasy 6964 @@ -11619,6 +11677,7 @@ 1025 0753 GeForce GT 620M 1025 0754 GeForce GT 620M 17aa 3977 GeForce GT 640M LE + 1b0a 20c6 GeForce GT 630M 1b0a 2210 GeForce GT 635M 0dea GF108M [GeForce 610M] 17aa 365a GeForce 615 @@ -12477,6 +12536,9 @@ 15f7 GP100GL [Tesla P100 PCIe 12GB] 15f8 GP100GL [Tesla P100 PCIe 16GB] 15f9 GP100GL [Tesla P100 SXM2 16GB] + 15fa GP100GL [DGX Station / PH402 SKU 200] + 15fb GP100GL [GP100 SKU 200] + 15ff GP100GL [GP100 SKU 15ff] 1617 GM204M [GeForce GTX 980M] 1618 GM204M [GeForce GTX 970M] 1619 GM204M [GeForce GTX 965M] @@ -12646,6 +12708,7 @@ 10de 131d Tesla V100-SXM3-32GB-H 1dba GV100GL [Quadro GV100] 10de 12eb TITAN V CEO Edition + 1dbd GV100GL [Tesla GV100 DGX1-V] 1dbe GV100 Engineering Sample 1dc1 GV100 [CMP 100-200] 1df0 GV100GL [Tesla PG500-216] @@ -12801,6 +12864,7 @@ 21ae TU116GL 21bf TU116GL 21c2 TU116 + 21c3 TU116 21c4 TU116 [GeForce GTX 1660 SUPER] 21d1 TU116BM [GeForce GTX 1660 Ti Mobile] 2200 GA102 @@ -12846,9 +12910,10 @@ 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] 233d GH100 [H100 96GB] - 2342 GH100 [GH200 120GB] + 2342 GH100 [GH200 120GB / 480GB] 2343 GH100 - 2345 GH100 [GH200 480GB] + 2345 GH100 [GH100-88K-A1] + 237f GH100 [Skinny Joe] 23b0 GH100 23f0 GH100 2414 GA103 [GeForce RTX 3060 Ti] @@ -12945,25 +13010,33 @@ 25fb GA107 [RTX A500 Embedded GPU] 2681 AD102 [RTX TITAN Ada] 2684 AD102 [GeForce RTX 4090] + 2685 AD102 [GeForce RTX 4090 D] 26b1 AD102GL [RTX 6000 Ada Generation] 26b2 AD102GL [RTX 5000 Ada Generation] + 26b3 AD102GL [RTX 5880 Ada Generation] 26b5 AD102GL [L40] + 26b7 AD102GL [L20] 26b8 AD102GL [L40G] 26b9 AD102GL [L40S] + 26ba AD102GL [L20] 26f5 AD102GL [L40 CNX] + 2702 AD103 [GeForce RTX 4080 SUPER] 2703 AD103 [GeForce RTX 4080 SUPER] 2704 AD103 [GeForce RTX 4080] + 2705 AD103 [GeForce RTX 4070 Ti SUPER] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] + 2783 AD104 [GeForce RTX 4070 SUPER] 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] 27b1 AD104GL [RTX 4500 Ada Generation] 27b2 AD104GL [RTX 4000 Ada Generation] + 27b6 AD104GL [L2] 27b7 AD104GL [L16] 27b8 AD104GL [L4] 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] @@ -13193,6 +13266,7 @@ 8111 Twist3 Frame Grabber 10ec Realtek Semiconductor Co., Ltd. 0139 RTL-8139/8139C/8139C+ Ethernet Controller + 2600 Killer E2600 GbE Controller 3000 Killer E3000 2.5GbE Controller 4321 RTL8852BE 802.11ax PCIe Wireless Network Adapter 5208 RTS5208 PCI Express Card Reader @@ -13314,7 +13388,7 @@ 1458 e000 GA-MA69G-S3H Motherboard 1462 235c P965 Neo MS-7235 mainboard 1462 236c 945P Neo3-F motherboard - 8168 RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller + 8168 RTL8111/8168/8211/8411 PCI Express Gigabit Ethernet Controller 1019 8168 RTL8111/8168 PCI Express Gigabit Ethernet controller 1025 1094 Acer Aspire E5-575G 1028 0283 Vostro 220 @@ -13353,6 +13427,7 @@ 1462 4180 Wind PC MS-7418 1462 7522 X58 Pro-E 1462 7c37 X570-A PRO motherboard + 1734 11c0 RTL8211DN on Esprimo P510 D3171 motherboard 1775 11cc CC11/CL11 17aa 3098 ThinkCentre E73 17aa 3814 Z50-75 @@ -13431,6 +13506,7 @@ c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter c822 RTL8822CE 802.11ac PCIe Wireless Network Adapter c82f RTL8822CE 802.11ac PCIe Wireless Network Adapter + c852 RTL8852CE PCIe 802.11ax Wireless Network Controller d723 RTL8723DE 802.11b/g/n PCIe Adapter 10ed Ascii Corporation 7310 V7310 @@ -13690,6 +13766,8 @@ 0644 RocketRAID 644 4 Port SATA-III Controller (eSATA) 0645 RocketRAID 644L 4 Port SATA-III Controller (eSATA) 0646 RocketRAID 644LS SATA-III Controller (4 eSATA devices connected by 1 SAS cable) + 0750 Rocket 750 PCIe Gen2 SATA III Controller + 0840 RocketRAID 840 PCIe Gen3 SATA III Controller 1720 RocketRAID 1720 (2x SATA II RAID Controller) 1740 RocketRAID 1740 1742 RocketRAID 1742 @@ -13701,6 +13779,7 @@ 2322 RocketRAID 2322 SATA-II Controller 2340 RocketRAID 2340 16 Port SATA-II Controller 2640 RocketRAID 2640 SAS/SATA Controller + 2720 RocketRAID 2720 PCIe Gen2 6Gb/s SAS/SATA Controller 2722 RocketRAID 2722 # SFF-8087 Mini-SAS 16 port internal 2740 RocketRAID 2740 @@ -13708,12 +13787,21 @@ 2744 RocketRaid 2744 # SFF-8088 8 port external / SFF-8087 24 port internal 2782 RocketRAID 2782 + 2840 RocketRAID 2840 PCIe Gen3 6Gb/s SAS/SATA Controller 3120 RocketRAID 3120 3220 RocketRAID 3220 3320 RocketRAID 3320 + 3520 RocketRAID 3520 PCIe Gen1 8-Port SATA II Controller + 3530 RocketRAID 3530 PCIe Gen1 12-Port SATA II Controller + 3740 RocketRAID 3740 PCIe Gen3 12Gb/s SAS/SATA Controller 4310 RocketRaid 4310 + 4320 RocketRAID 4320 SAS Controller + 7103 SSD7103 PCIe Gen3 x16 4-Port M.2 NVMe RAID Controller + 7105 SSD7105 PCIe Gen3 x16 4-Port M.2 NVMe RAID Controller + 7110 SSD7110 PCIe Gen3 x16 NVMe RAID Controller 7505 SSD7505 PCIe Gen4 x16 4-Port M.2 NVMe RAID Controller 7540 SSD7540 PCIe Gen4 x16 8-Port M.2 NVMe RAID Controller + 7580 SSD7580 PCIe Gen4 x16 8-Port M.2 NVMe RAID Controller 1104 RasterOps Corp. 1105 Sigma Designs, Inc. 1105 REALmagic Xcard MPEG 1/2/3/4 DVD Decoder @@ -13899,6 +13987,7 @@ 1043 808c VT62xx USB1.1 4 port controller 1043 80a1 A7V8X-X motherboard 1043 80ed A7V600/K8V-X/A8V Deluxe motherboard + 1106 3038 USB 1.1 UHCI controller 1179 0001 Magnia Z310 1234 0925 MVP3 USB Controller 1458 5004 GA-7VAX Mainboard @@ -13931,6 +14020,7 @@ 1462 590d KT6 Delta-FIS2R (MS-6590) 1462 702d K8T NEO 2 motherboard 1462 971d MS-6917 + 153b 1146 Cameo DV Firewire controller 3050 VT82C596 Power Management 3051 VT82C596 Power Management 3053 VT6105M [Rhine-III] @@ -14026,7 +14116,7 @@ 1043 808c A7V8X motherboard 1043 80a1 A7V8X-X motherboard rev 1.01 1043 80ed A7V600/K8V-X/A8V Deluxe motherboard - 1106 3104 USB 2.0 Controller + 1106 3104 USB 2.0 EHCI controller 1297 f641 FX41 motherboard 1458 5004 GA-7VAX Mainboard 1462 5901 KT6 Delta-FIS2R (MS-6590) @@ -14344,6 +14434,8 @@ # Superfastcom-PCI (Commtech, Inc.) or DSCC4 WAN Adapter 2102 DSCC4 PEB/PEF 20534 DMA Supported Serial Communication Controller with 4 Channels 2104 Eicon Diva 2.02 compatible passive ISDN card +# S30807-Q5474 + 3101 HiPath 4000 PCI card 3141 SIMATIC NET CP 5611 / 5621 3142 SIMATIC NET CP 5613 / 5614 3143 SIMATIC NET CP 1613 @@ -15473,6 +15565,7 @@ 0805 SD TypA Controller 0d01 FIR Port Type-DO 1179 0001 FIR Port Type-DO + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 117a A-Trend Technology 117b L G Electronics, Inc. 117c ATTO Technology, Inc. @@ -16988,7 +17081,7 @@ 1274 2000 Creative CT4810 [Sound Blaster AudioPCI 128] 1274 2003 Creative SoundBlaster AudioPCI 128 1274 5880 Creative CT4750 [Sound Blaster PCI 128] - 1274 8001 Sound Blaster 16PCI 4.1ch + 1274 8001 Creative CT4750 [Sound Blaster 16 PCI/PCI 128/4.1 Digital] 1458 a000 5880 AudioPCI On Motherboard 6OXET 1462 6880 5880 AudioPCI On Motherboard MS-6188 1.00 270f 2001 5880 AudioPCI On Motherboard 6CTR @@ -17192,6 +17285,7 @@ 1000 PXD1000 1296 Kofax Image Products 1297 Holco Enterprise Co, Ltd/Shuttle Computer + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1298 Spellcaster Telecommunications Inc. 1299 Knowledge Technology Lab. 129a VMetro, inc. @@ -17348,6 +17442,7 @@ 0009 DAC64 0018 Riva128 1048 0c10 VICTORY Erazor + 1048 0c15 VICTORY Erazor LT-8 107b 8030 STB Velocity 128 1092 0350 Viper V330 1092 1092 Viper V330 @@ -17387,13 +17482,14 @@ # PI7C9X20508GP 5Port-8Lane PCI Express Switch GreenPacket Family 0508 PI7C9X20508GP PCI Express Switch 5Port-8Lane 2304 PI7C9X2G304 EL/SL PCIe2 3-Port/4-Lane Packet Switch - 2308 PI7C9X2G308GP 8-lane PCI Express 2.0 Switch with 3 PCI Express ports + 2308 PI7C9X2G308GP 3-Ports/8-lane PCIe 2.0 Switch 2404 PI7C9X2G404 EL/SL PCIe2 4-Port/4-Lane Packet Switch 2608 PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch ea50 cc10 RXi2-BP - 400a PI7C9X442SL PCI Express Bridge Port - 400e PI7C9X442SL USB OHCI Controller - 400f PI7C9X442SL USB EHCI Controller + 400a PI7C9X442SL PCIe Bridge Port + 400c PI7C9X440SL PCIe Bridge Port + 400e PI7C9X440SL/PI7C9X442SL USB OHCI Controller + 400f PI7C9X440SL/PI7C9X442SL USB EHCI Controller 71e2 PI7C7300A/PI7C7300D PCI-to-PCI Bridge 71e3 PI7C7300A/PI7C7300D PCI-to-PCI Bridge (Secondary Bus 2) 8140 PI7C8140A PCI-to-PCI Bridge @@ -17402,9 +17498,11 @@ 8152 PI7C8152A/PI7C8152B/PI7C8152BI PCI-to-PCI Bridge 8154 PI7C8154A/PI7C8154B/PI7C8154BI PCI-to-PCI Bridge 8619 PI7C9X2G1616PR PCIe2 16-Port/16-Lane Packet Switch - e110 PI7C9X110 PCI Express to PCI bridge + e110 PI7C9X110 PCIe- to-PCI bridge 1775 11cc CC11/CL11 CompactPCI Bridge e111 PI7C9X111SL PCIe-to-PCI Reversible Bridge + e112 PI7C9X112SL PCIe-to-PCI Bridge + e113 PI7C9X113SL/PI7C9X118SL PCIe-to-PCI Bridge e130 PCI Express to PCI-XPI7C9X130 PCI-X Bridge 12d9 Aculab PLC 0002 PCI Prosody @@ -17798,6 +17896,7 @@ 5411 2450 NVMe SSD [HendrixV] (DRAM-less) 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD + 5415 3500 NVMe SSD 5416 2550 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -19945,6 +20044,7 @@ 14c3 MEDIATEK Corp. 0608 MT7921K (RZ608) Wi-Fi 6E 80MHz 0616 MT7922 802.11ax PCI Express Wireless Network Adapter + 7603 MT7603E 802.11bgn PCI Express Wireless Network Adapter 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter 7615 MT7615E 802.11ac PCI Express Wireless Network Adapter 7630 MT7630e 802.11bgn Wireless Network Adapter @@ -19957,6 +20057,7 @@ 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 1a3b 5300 ASUS PCE-AXE59BT 7961 MT7921 802.11ax PCI Express Wireless Network Adapter + 8650 MT7650 Bluetooth 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB 14c6 Data Race Inc @@ -20204,6 +20305,8 @@ 14e4 d166 BCM95719-P41 4x1GBT Ethernet NIC 14e4 d366 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P +# NIC-ETH330T-3S-4P 4xGE 1000Base-T for OCP3.0 + 193d 1086 NIC-ETH330T-3S-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard 1028 01e6 PowerEdge 860 @@ -20485,6 +20588,8 @@ 152d 8b22 BCM57412 NetXtreme-E 25Gb RDMA Ethernet Controller # NIC-ETH531F-LP-2P BCM57412 2 x 10G SFP+ Ethernet PCIe Card 193d 1024 NIC-ETH531F-LP-2P +# NIC-ETH531F-3S-2P 2x10GbE SFP+ Adapter for OCP3.0 + 193d 1087 NIC-ETH531F-3S-2P 16d7 BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller 117c 00cc FastFrame N422 Dual-port 25Gb Ethernet Adapter 14e4 1402 BCM957414A4142CC 10Gb/25Gb Ethernet PCIe @@ -20575,6 +20680,8 @@ 14e4 5425 NetXtreme-E Quad-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957504-N425G) 14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE 1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet + 1760 BCM57608 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb/400Gb Ethernet + 14e4 d125 BCM57608 2x200G PCIe Ethernet NIC 1800 BCM57502 NetXtreme-E Ethernet Partition 1801 BCM57504 NetXtreme-E Ethernet Partition 1802 BCM57508 NetXtreme-E Ethernet Partition @@ -20592,6 +20699,7 @@ 1809 BCM5750X NetXtreme-E RDMA Virtual Function 14e4 df24 BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz RDMA Virtual Function 2711 BCM2711 PCIe Bridge + 2712 BCM2712 PCIe Bridge 3352 BCM3352 3360 BCM3360 4210 BCM4210 iLine10 HomePNA 2.0 @@ -21435,6 +21543,7 @@ be00 PCI Express Bridge 1557 MEDIASTAR Co Ltd 1558 CLEVO/KAPOK Computer + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1559 SI LOGIC Ltd 155a INNOMEDIA Inc 155b PROTAC INTERNATIONAL Corp @@ -21639,6 +21748,8 @@ 0283 ArcusE RMA 0284 Sagitta 0285 Sagitta RMA + 0286 LibraE Flash Recovery + 0287 LibraE RMA 1002 MT25400 Family [ConnectX-2 Virtual Function] 1003 MT27500 Family [ConnectX-3] 1014 04b5 PCIe3 40GbE RoCE Converged Host Bus Adapter for Power @@ -21817,6 +21928,7 @@ a2de BF4 Family Crypto disabled [BlueField-4 SoC Crypto disabled] a2df BF4 Family integrated network controller [BlueField-4 integrated network controller] b200 ArcusE + b201 LibraE c2d1 BlueField DPU Family Auxiliary Communication Channel [BlueField Family] c2d2 MT416842 BlueField SoC management interfac c2d3 MT42822 BlueField-2 SoC Management Interface @@ -21890,6 +22002,7 @@ 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5041 WD Blue SN580 NVMe SSD (DRAM-less) + 5042 WD Black SN770M NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -21911,6 +22024,10 @@ 117c 0022 Celerity FC-42XS Fibre Channel Adapter 117c 0025 Celerity FC-44ES Fibre Channel Adapter 117c 0026 Celerity FC-42ES Fibre Channel Adapter + 0500 Infiniium Memory Controller Interface + 0501 Infiniium Acquisition System Interface + 0507 Infiniium Acquisition System (80000 series) + 0508 Infiniium Acquisition Support 0b01 82350B PCI GPIB 1100 E8001-66442 PCI Express CIC 1218 82351A PCI Express GPIB @@ -21951,7 +22068,6 @@ 15d8 Cybernetics Technology Co Ltd 15d9 Super Micro Computer Inc 1b64 SCC-B8SB80-B1 - 1b67 AOC-S3916L-H16iR-32DD 1b9d Supermicro AOC-S3816L-L16IR 1c6e Supermicro AOC-SLG4-2H8M2 15da Cyberfirm Inc @@ -22610,6 +22726,9 @@ 7054 APA7-504 Reconfigurable Artix-7 52,160 Cell FPGA module 24 LVDS channels 7072 AP731 Multi-function I/O Module with 12-bit DAC 7073 AP730 Multi-function I/O Module 16 Digital I/O 8 Differential Analog In 4 Analog Out + 7731 APZU-301 Zynq Ultrascale+ Module 28 TTL channels + 7733 APZU-303 Zynq Ultrascale+ Module 20 TTL & 3 RS485/422 channels + 7734 APZU-304 Zynq Ultrascale+ Module 14 LVDS channels 16da Advantech Co., Ltd. 0011 INES GPIB-PCI 16df PIKA Technologies Inc. @@ -22710,6 +22829,7 @@ 13c8 AEP SureWare Runner 1000V3 # nee Fujitsu Siemens Computers GmbH 1734 Fujitsu Technology Solutions + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1735 Aten International Co. Ltd. 1737 Linksys 0029 WPG54G ver. 4 PCI Card @@ -22732,6 +22852,7 @@ 1745 ViXS Systems, Inc. 2020 XCode II Series 2100 XCode 2100 Series + 1043 48c9 My Cinema PE6200 Analoog 1749 RLX Technologies 174b PC Partner Limited / Sapphire Technology 174d WellX Telecom SA @@ -22988,6 +23109,7 @@ 0006 LENSE30512GMSP34MEAT3TA 3181 ThinkCentre M75n IoT 402b Intel 82599ES 10Gb 2-port Server Adapter X520-2 + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 17ab Phillips Components 17af Hightech Information System Ltd. 17b3 Hawking Technologies @@ -23009,20 +23131,30 @@ 0002 AGN300 802.11 a/b/g True MIMO Wireless Card 1385 6d00 WPNT511 RangeMax 240 Mbps Wireless CardBus Adapter 1737 0054 WPC54GX4 v1 802.11g Wireless-G Notebook Adapter with SRX400 + 0104 APQ8096 PCIe Root Complex [Snapdragon 820] 0105 MSM8998 PCIe Root Complex + 0106 SDM850 PCIe Root Complex [Snapdragon 850] + 0107 SDM850 PCIe Root Port [Snapdragon 850] 0108 SM8150 PCIe Root Complex 0109 SA8195P PCIe Root Complex + 010b SM8250 PCIe Root Complex [Snapdragon 865/870 5G] + 010c SM8350 PCIe Root Complex [Snapdragon 888] 010e SC8280XP PCI Express Root Port + 0110 SM8475 PCIe Root Complex [Snapdragon 8+ Gen 1] 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] + 0304 SDX24 [Snapdragon X24 4G] + 0306 SDX55 [Snapdragon X55 5G] 0400 Datacenter Technologies QDF2432 PCI Express Root Port 0401 Datacenter Technologies QDF2400 PCI Express Root Port 1000 QCS405 PCIe Root Complex 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter - 1108 IPQ95xx/97xx PCI Express Root Port + 1107 WCN785x Wi-Fi 7(802.11be) 320MHz 2x2 [FastConnect 7800] + 105b e0f7 High Band Simultaneous Wireless Network Adapter + 1108 IPQ95xx/97xx PCIe Root Port 1109 QCN62xx/92xx Wireless Network Adapter 17cc NetChip Technology, Inc 2280 USB 2.0 @@ -23319,6 +23451,7 @@ 0701 RT2760 Wireless 802.11n 1T/2R 1737 0074 WMP110 v2 802.11n RangePlus Wireless PCI Adapter 0781 RT2790 Wireless 802.11n 1T/2R PCIe + 11ad 7600 HP WN7600R 1814 2790 RT2790 Wireless 802.11n 1T/2R PCIe 3060 RT3060 Wireless 802.11n 1T/1R 1186 3c04 DWA-525 Wireless N 150 Desktop Adapter (rev.A1) @@ -23371,6 +23504,7 @@ 08b0 MVC200-DC 1846 Alcatel-Lucent 1849 ASRock Incorporation + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 184a Thales Computers 1100 MAX II cPLD 1850 Advantest Corporation @@ -23919,10 +24053,12 @@ 1043 1477 N56VZ 10a0 QCA8172 Fast Ethernet 10a1 QCA8171 Gigabit Ethernet + 2010 QCA8175 card reader controller 2048 Attansic L2 Fast Ethernet 2060 AR8152 v1.1 Fast Ethernet 2062 AR8152 v2.0 Fast Ethernet 1043 8468 Eee PC 1015PX + 3010 QCA8175 SD controller # E2200, E2201, E2205 e091 Killer E220x Gigabit Ethernet Controller e0a1 Killer E2400 Gigabit Ethernet Controller @@ -23985,7 +24121,7 @@ 16ff OX16C954 HOST-B 1987 Phison Electronics Corporation 5007 E7 NVMe Controller - 5008 E8 PCIe3 NVMe Controller + 5008 E8 PCIe3 x2 NVMe Controller 5012 E12 NVMe Controller 5013 PS5013-E13 PCIe3 NVMe Controller (DRAM-less) 5015 PS5015-E15 PCIe3 NVMe Controller (DRAM-less) @@ -23994,6 +24130,7 @@ 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) 5026 PS5026-E26 PCIe5 NVMe Controller + 5027 PS5027-E27T PCIe4 NVMe Controller (DRAM-less) 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24458,41 +24595,57 @@ 1af5 Netezza Corp. 1afa J & W Electronics Co., Ltd. 1b00 Montage Technology Co., Ltd. + c001 CXL Memory Expander Controller M88MX5891 + 1ff9 00a2 CXL Memory Expander + 1ff9 00a4 CXL Memory Expander 1b03 Magnum Semiconductor, Inc, 6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder 7000 D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder 1b08 MSC Technologies GmbH 1b0a Pegatron + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1b13 Jaton Corp 1b1a K&F Computing Research Co. 0e70 GRAPE 1b1c Corsair 1b21 ASMedia Technology Inc. - 0611 ASM1061 SATA IDE Controller - 0612 ASM1062 Serial ATA Controller + 0611 ASM1061 Serial ATA Controller + 0612 ASM1061/ASM1062 Serial ATA Controller 1849 0612 Motherboard + 0622 ASM106x Serial ATA AHCI Controller + 0624 ASM106x SATA/RAID Controller 0625 106x SATA/RAID Controller - 1040 ASM1040 XHCI Controller + 1040 ASM1040 SuperSpeed USB Host Controller + 1041 ASM1041 SuperSpeed USB Host Controller 1042 ASM1042 SuperSpeed USB Host Controller 1043 1059 K53SM motherboard 1043 8488 P8B WS Motherboard 1849 1042 Motherboard + 1064 ASM1064 Serial ATA Controller 1080 ASM1083/1085 PCIe to PCI Bridge 1849 1080 Motherboard 1142 ASM1042A USB 3.0 Host Controller + 1164 ASM1164 Serial ATA AHCI Controller 1166 ASM1166 Serial ATA Controller 1182 ASM1182e 2-Port PCIe x1 Gen2 Packet Switch 1b21 118f ASM1182e 2-Port PCIe x1 Gen2 Packet Switch 1184 ASM1184e 4-Port PCIe x1 Gen2 Packet Switch 1849 1184 ASM1184e 4-Port PCIe x1 Gen2 Packet Switch 1187 ASM1187e 7-Port PCIe x1 Gen2 Packet Switch + 118f ASM1187e 7-Port PCIe x1 Gen2 Packet Switch 1242 ASM1142 USB 3.1 Host Controller 1343 ASM1143 USB 3.1 Host Controller + 1806 ASM1806 4-Port PCIe x2 Gen2 Packet Switch 1812 ASM1812 6-Port PCIe x4 Gen2 Packet Switch + 1824 ASM1824 12-Port PCIe x8 Gen2 Packet Switch 2142 ASM2142/ASM3142 USB 3.1 Host Controller 1462 7a72 H270 PC MATE + 2806 ASM2806 4-Port PCIe x2 Gen3 Packet Switch + 2812 ASM2812 6-Port PCIe x4 Gen3 Packet Switch 2824 ASM2824 PCIe Gen3 Packet Switch 3042 ASM3042 USB 3.2 Gen 1 xHCI Controller + 3142 ASM3142 USB 3.2 Gen 2x1 xHCI Controller + 3241 ASM3241 USB 3.2 Gen 2 Host Controller 3242 ASM3242 USB 3.2 Host Controller 1b26 Netcope Technologies, a.s. c132 COMBO-LXT155 @@ -24862,7 +25015,13 @@ 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. + 2170 CH351 PCIe Parallel Port Adapter + 2273 CH351 PCIe Dual Port Serial Adapter + 3050 CH382L PCIe Parallel Port Adapter + 3250 CH384 Dual Port Serial and Parallel Port Adapter 3252 CH382 PCIe Dual Port Serial Adapter +# Device ID reused: CH352 is for PCI bus, CH382 for PCIe. + 3253 CH352/CH382 PCI/PCIe Dual Port Serial Adapter 1c09 CSP, Inc. 4254 10G-PCIE3-8D-2S 4255 10G-PCIE3-8D-Q @@ -24889,6 +25048,7 @@ 0020 FD2110 0021 FD722 0022 FD788 + 0023 FD722-M2 1c28 Lite-On IT Corp. / Plextor 0122 M6e PCI Express SSD [Marvell 88SS9183] # previously Fiberblaze @@ -24917,6 +25077,7 @@ a000 FBC2CGG3 Capture 2x40Gb [Mango_02] a001 FBC2CGG3 Capture 2x100Gb [Mango_02] a003 FBC2CGG3 Capture 16x10Gb [Mango] + a006 FBC2CGG3 Capture 2x100Gb [Mango] a007 FBC2CGG3 Capture 2x40Gb [Mango] a008 FBC2CGG3 Capture 2x25Gb [Mango] a009 FBC2CGG3 Capture 16x10Gb [Mango] @@ -24929,6 +25090,8 @@ a013 FB2CGHH Capture 2x25Gb [Tivoli] a014 FB2CGHH Capture 8x10Gb [Tivoli] a015 FB2CGHH Capture 2x100Gb [Tivoli] + a016 FB2CG Capture 8x25Gb [Savona] + a017 FB2CGHH Capture 8x25Gb [Tivoli] a017 # Used on V120 VME Crate Controller 1c32 Highland Technology, Inc. 1c33 Daktronics, Inc @@ -25144,16 +25307,19 @@ 33f4 IM2P33F4 NVMe SSD (DRAM-less) 33f8 IM2P33F8 series NVMe SSD (DRAM-less) 41c3 SM2P41C3 NVMe SSD (DRAM-less) + 41c8 SM2P41C8 NVMe SSD (DRAM-less) 5236 XPG GAMMIX S70 BLADE NVMe SSD - 5350 XPG GAMMIX S50 NVMe SSD - 5762 FALCON NVMe SSD + 5350 XPG GAMMIX S50, S50 Lite NVMe SSD +# PREMIUM NVMe SSD for PlayStation 5 + 5370 GAMMIX S70 BLADE, PS5 PREMIUM NVMe SSD + 5762 FALCON, GAMMIX S41, SPECTRIX S40G NVMe SSD (DRAM-less) 5763 XPG GAMMIX S5 NVMe SSD (DRAM-less) - 5766 ADATA XPG GAMMIXS1 1L Media (256 GB SSD) + 5766 XPG GAMMIXS1 1L, XPG GAMMIX S5, LEGEND 710 / 740, SWORDFISH NVMe SSD (DRAM-less) 612a LEGEND 750 NVMe SSD (DRAM-less) - 613a LEGEND 840 NVMe SSD (DRAM-less) + 613a ATOM 50, LEGEND 840 NVMe SSD (DRAM-less) 621a LEGEND 850 NVMe SSD (DRAM-less) 622a LEGEND 960 NVMe SSD - 624a LEGEND 700 NVMe SSD (DRAM-less) + 624a LEGEND 700, XPG GAMMIX S20 NVMe SSD (DRAM-less) # 1TB 627a LEGEND 800 NVMe SSD (DRAM-less) # 500GB @@ -25260,6 +25426,7 @@ 7164 NeuronDevice (Trainium) 1d0f 0000 Trainium 7264 NeuronDevice (Inferentia2) + 7364 NeuronDevice (Trainium2) 8061 NVMe EBS Controller cd01 NVMe SSD Controller ec20 Elastic Network Adapter (ENA) @@ -25275,55 +25442,67 @@ 0714 ZX-100/ZX-200 PCI Express Root Port 0715 ZX-100/ZX-200 PCI Express Root Port 0716 ZX-D PCI Express Root Port - 0717 KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 0718 KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 0719 KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port + 0717 KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port + 0718 KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port + 0719 KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port 071a KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 071b KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 071c KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port + 071b KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port + 071c KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port 071d KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 071e KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port + 071e KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port 071f ZX-200 Upstream Port of PCI Express Switch 0720 ZX-200 PCIE RC6 controller 0721 ZX-200 Downstream Port of PCI Express Switch 0722 ZX-200 PCIE P2C bridge 0731 KH-40000 PCI Express Root Port - 0732 KH-40000 PCI Express Root Port + 0732 KH-40000/KX-7000 PCI Express Root Port + 0733 KX-7000 PCIE Express Root Port + 0734 KX-7000 PCIE Express Root Port + 0735 KX-7000 PCIE Express Root Port + 0736 KX-7000 PCIE Express Root Port + 0737 KX-7000 PCIE Express Root Port + 0738 KX-7000 PCIE Express Root Port + 0739 KX-7000 PCIE Express Root Port + 073a KX-7000 PCIE Express Root Port + 073b KX-7000 PCIE Express Root Port 1000 ZX-D Standard Host Bridge - 1001 ZX-D/ZX-E/KH-40000 Miscellaneous Bus + 1001 ZX-D/ZX-E/KH-40000/KX-7000 Miscellaneous Bus 1003 ZX-E Standard Host Bridge 1005 KH-40000 Standard Host Bridge 1006 KX-6000G Standard Host Bridge + 1007 KX-7000 Standard Host Bridge 3001 ZX-100 Standard Host Bridge 300a ZX-100 Miscellaneous Bus - 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Universal PCI to USB Host Controller - 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Enhanced PCI to USB Host Controller - 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge - 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge - 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 DRAM Controller - 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Power Management Controller - 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 I/O APIC - 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Scratch Device - 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Universal PCI to USB Host Controller + 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Enhanced PCI to USB Host Controller + 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Host Bridge + 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Host Bridge + 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 DRAM Controller + 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Power Management Controller + 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 I/O APIC + 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Scratch Device + 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Host Bridge 31b8 ZX-100/ZX-D PCI to PCI Bridge - 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 High Definition Audio Controller + 3200 KX-7000 Host Bridge + 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 High Definition Audio Controller 345b ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Miscellaneous Bus 3a02 ZX-100 C-320 GPU 3a03 ZX-D C-860 GPU - 3a04 ZX-E C-960 GPU + 3a04 KX-6000 C-960 GPU + 3a05 KX-7000 C-1190 GPU 3b01 KH-40000 OPI Controller *** 1253 LINES SKIPPED *** From nobody Mon Mar 18 14:40:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TyyF63ym2z5DrWr; Mon, 18 Mar 2024 14:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TyyF63TDrz4TXt; Mon, 18 Mar 2024 14:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AfP0Trp4M8I9WT7sFzIgZzLZe9bnSUKap6tcmMP1C8M=; b=kgtXbBMjrD8D3M/Md65Uc0MuAl4dcrd7JCydMlXSeiMvXVIjjTNkVeMsXyfnCWmdCt+aiA JJa3TRC3zGP7Qw3lNq1yOwtQKe8zYcAp+9p79k9JGARxwvNQFfBrvRxNd82lMJCYmrQlhO xLSVMSytKcSqA1fV6iYMWrIpAm9nFcX5iqsNR4bEMNUMpXQYcc9mngrsCNBFa/uWpKFEdj 5Kx4532FbFyxCoizDmz4vw12JAtQtW9/rnvRAL9U3Q19jv5FJd7bqYARHG9ijgJDsd8sXh iY5KV+zUpeYBYIYJG30d54/7AfTVVQYHlMVcIvPYcXpgnV2TGB6ZycDRzppp5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772810; a=rsa-sha256; cv=none; b=p8GX2vhzGswiMwT9cUsWpetxbrYoL27TkWz8OrPvtdWsOVJtmIblbUKYN4EEyCx0368R4/ flMRY1/PuqcsvC8U4tgnCNAJDurkYiT5xPZ+DQF2Bd8zcj9jeNLlzsJjtVDcOc0H3wmCaJ pSFTSeP6ZEZd/F/G7m3+dlvo1kOEAgipmDdXbnSdO7YQzKOsNUUNK6ArkJoSA/S2pZFE3r nTnsqHuS6im9FBRuKVp6j8CEDBy18uKenh5fFV78VxSLAf+i08U5xNJRvFAWinud0KUR4R /oTiTHTLwz4M4G94Ox1yyKh1egT/48BSDSv+GK+u2e5got2IQWE4zI1TOoFS+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AfP0Trp4M8I9WT7sFzIgZzLZe9bnSUKap6tcmMP1C8M=; b=VWC1tg6IXKNZ6FHDcAPBFlpr6aOExGHIfqbfnnXDnlM9e2gUWeUB9iFQlEH37pgOlhjFs5 gKeUBPoM3uoASkeB5Pv/2yFVoFQZTcMFsu/4tg3M4eLooWs5sqJCRQLmNon4rU7zS7RPZ8 VD13t0yIYcEh6VA7SBPny9eCY0PlDZ5pWv9Dyg9cBpUMiwvdXZyM2aaAwzeCKqfwqZ3oP6 JHQAdQhGNN1Uon2+UU5h3noetVk+ZdALgt0toSX+ID8L/S0/zdPF5fLr01QPupHz9HI2qc oWhelSqCX5E3A+YgqM6LbXmIHkVKAFeIsN2xxwcPpYjhyUQH5dhBP21kq+fC1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TyyF62z1dzRbl; Mon, 18 Mar 2024 14:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IEeAnv071082; Mon, 18 Mar 2024 14:40:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEeAZT071072; Mon, 18 Mar 2024 14:40:10 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:40:10 GMT Message-Id: <202403181440.42IEeAZT071072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 104328e63034 - stable/14 - timerfd_create: accept CLOCK_UPTIME/CLOCK_BOOTTIME List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 104328e63034f34a7961c0ebfb2dfdf78717982d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=104328e63034f34a7961c0ebfb2dfdf78717982d commit 104328e63034f34a7961c0ebfb2dfdf78717982d Author: Baptiste Daroussin AuthorDate: 2024-03-06 14:11:32 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:39:52 +0000 timerfd_create: accept CLOCK_UPTIME/CLOCK_BOOTTIME This is a common use case when using timerfd_create to actually use it with CLOCK_BOOTTIME on linux which is CLOCK_UPTIME for us. Note that currently on freebsd CLOCK_BOOTTIME is CLOCK_UPTIME, but the semantic is supposed to be different, this has to be fixed later. Tested with the fnott notification software Reviewed by: des, imp Differential Revision: https://reviews.freebsd.org/D44253 (cherry picked from commit cf742faa39a58a9b43b671c66097e6880459d4ae) (cherry picked from commit 0ecf0b26a750582b804e238e6446db55188d7fdc) --- sys/kern/sys_timerfd.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index d9c0e189baf2..80d1e9f4bfb2 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -431,8 +431,20 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) AUDIT_ARG_VALUE(clockid); AUDIT_ARG_FFLAGS(flags); - if (clockid != CLOCK_REALTIME && clockid != CLOCK_MONOTONIC) + switch (clockid) { + case CLOCK_REALTIME: + /* FALLTHROUGH */ + case CLOCK_MONOTONIC: + /* FALLTHROUGH */ + case CLOCK_UPTIME: + /* + * CLOCK_BOOTTIME should be added once different from + * CLOCK_UPTIME + */ + break; + default: return (EINVAL); + } if ((flags & ~(TFD_CLOEXEC | TFD_NONBLOCK)) != 0) return (EINVAL); From nobody Mon Mar 18 15:53:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TyzsW2gXjz5Dyk4; Mon, 18 Mar 2024 15:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TyzsV6zWVz4cf8; Mon, 18 Mar 2024 15:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9qcZuR7pH+P0BN3IlxzHT2ZjGZqBCHQKefzugKaloI=; b=xYY+rXXg0jfQl58BAacT+jM+Mx/a/kVnk2PStx8qvBP5fjEO+VOy2zMgOpXAcD2pa0ONBi 6XMbx5VZvZb0PR6NTwYCKvWvL4EiEgeCi9glLX4ib+jhVlwPF4hhGA6od6nc6i4Oz0eUR4 RUC1AJi+GP0p2G1zPQsKkEXilDqLiuUK7BEngy/HEhRFgNexgzCIYbjam/s7m8epwB2H8D sVti99Nrcqvu+kWVxXIFfhe5IQpOl6fwMbkvNN+f/VD1MvKeKgY04iqZfFxOje2f/UOHBk UdHaEdVSPetmPz5SsQb+UBG0stGcDMkX73vxUiTxqKqsWHCsi02fdC8TzTN/aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777199; a=rsa-sha256; cv=none; b=gTZxzUa4jH4xeWBJXg3gZ+ksiqsrZu4aUdL8epms47Gf3fcG5nqYM9Lyg3lexS1HJ/4QYp 3TUt9atPyyvXkKAhcxu+vWZMw9FvvuCVfDuQdNnFesXCSDxSqu2yet6s0y5CyZLKk+J1gD R2jxZbKai6X3z371mtaM9GxLIWVfR4rnNQICHc9+9NxT9NcT0dAgDy12GipVgKFOJUEoT5 MSHWan4S2DntY1OEJIoOeIbytTKtFVlYgVq1u0tb2uCV1zP62W1CRr/aUMrBlIKhaKbDzY vD53rTV7iHYQyb0KyUwGYMRx3/ruj3y1miiDKkuE9faecmGpVw7+bu7GhRPMRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9qcZuR7pH+P0BN3IlxzHT2ZjGZqBCHQKefzugKaloI=; b=e5h/2JO43uaNg11YIsk/TcqXJG5YHp74DmBl8jLZ4dEISC0AKtENbQcgNM5lAHGpqFe18L dQ6bgURhQLSP+JI5gmzdJFyD0dwmpjwWRf1nZcsETSRrN1feSYiUIzsKldB2KWuIFh3ZVx K+ZLebh9Uf3h2HcWpJ3s0RyBbpJVLUygDg4XwXYZQIhRJwPMru0Bcy/7V1KbP7HMAsOYg0 Er+m0Zy3wmEi4xnlfNHevZif7iZwbcCZcOs9ExRyekS3gIWrq+c/qeapWwbU2DqwvjAUMy ZyJ2Lb837EhBGnVVbAjYMguXWQIwrRDIZseAyAwKqm9djrbouO+l97+xhShPUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TyzsV5JXlzTr2; Mon, 18 Mar 2024 15:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrIfr001184; Mon, 18 Mar 2024 15:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrI16001181; Mon, 18 Mar 2024 15:53:18 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:18 GMT Message-Id: <202403181553.42IFrI16001181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a7b90458a293 - stable/14 - rtld: add some dlopen tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7b90458a2931366faa24deee914c3fb75f8ed1b Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b90458a2931366faa24deee914c3fb75f8ed1b commit a7b90458a2931366faa24deee914c3fb75f8ed1b Author: Kyle Evans AuthorDate: 2024-02-13 15:38:02 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:57 +0000 rtld: add some dlopen tests dlopen_basic just tests that libthr.so can be dlopen()ed, which will just serve as a sanity check that "libthr.so" is a thing that can be dlopened in case we get a weird failure in dlopen_recursing. dlopen_recursing tests a regression reported after the libsys split, where some dlopen() may cause infinite recursion and a resulting crash. This case is inspired by bdrewery's description of what seemed to be causing his issue. The corresponding fix landed in commit 968a18975ad ("rtld: ignore load_filtees() calls if we already [...]") Reviewed by: kib (cherry picked from commit c5796f1572c82b88e8b6a2810c92f30e5ac3e118) --- libexec/rtld-elf/tests/Makefile | 2 ++ libexec/rtld-elf/tests/dlopen_test.c | 52 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index 06e143a441a1..e380e9850fc1 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -13,6 +13,8 @@ ATF_TESTS_C+= ld_preload_fds SRCS.$t= $t.c common.c .endfor +ATF_TESTS_C+= dlopen_test + WARNS?= 3 .include diff --git a/libexec/rtld-elf/tests/dlopen_test.c b/libexec/rtld-elf/tests/dlopen_test.c new file mode 100644 index 000000000000..ab1e8da1cb41 --- /dev/null +++ b/libexec/rtld-elf/tests/dlopen_test.c @@ -0,0 +1,52 @@ +/*- + * + * Copyright (C) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +#include + +ATF_TC_WITHOUT_HEAD(dlopen_basic); +ATF_TC_BODY(dlopen_basic, tc) +{ + void *hdl, *sym; + + hdl = dlopen("libthr.so", RTLD_NOW); + ATF_REQUIRE(hdl != NULL); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym != NULL); + + dlclose(hdl); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym == NULL); +} + +ATF_TC_WITHOUT_HEAD(dlopen_recursing); +ATF_TC_BODY(dlopen_recursing, tc) +{ + void *hdl; + + /* + * If this doesn't crash, we're OK; a regression at one point caused + * some infinite recursion here. + */ + hdl = dlopen("libthr.so", RTLD_NOW | RTLD_GLOBAL); + ATF_REQUIRE(hdl != NULL); + + dlclose(hdl); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dlopen_basic); + ATF_TP_ADD_TC(tp, dlopen_recursing); + + return atf_no_error(); +} From nobody Mon Mar 18 15:53:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TyzsX124Cz5F01b; Mon, 18 Mar 2024 15:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TyzsW71sYz4cNh; Mon, 18 Mar 2024 15:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1TLFUiHca2AX4oZ2icnoHFAKnZJwCmhLw9ZUpCZ4io=; b=s5DnvyiIQDr0VxekhECykIl3D+tA6Jswp2XQZDucvu+fcIE5u423mUE7dZ5OJNobBGIyr9 dGF/zql1sMvP+hoZvhsPD6KDb7CQEVmhb7uJnErKreFzdUhPvId/qTvnslJ56z2Tuwe0OH /h7jky4eyBznW2dezvrF0ClUniWMYEGcyfkfYpz+MsSwt820rBoOaZ57hDW3uj5Q0cZPPL awu3K16FplTDcL9bwsQh/He9OgTczyb81hpvj4qXhUkVa9iRuzxGZYDe188Z+svC5jFApk m6OavaeEgKo9sdp5kMYMKH4wPPr43p8q3Msy8jgYsQHyhjcXcF1V1B7WUXW29A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777200; a=rsa-sha256; cv=none; b=RndDd3ffg/Qy3E9g85iZgzdRGWcVqt7ZIHiEvW43PdPRrw2F+LLsvlEYcgKfGjE3C+0mzl b8YBXkskcDqxC6eXMjbOI0Fgw4t63adzWOPVuX9SAz9+seOAf2xkLPBEgvjtUCBMr4eKLe WGuKnTyxgN5Pk1Hp59qxxkoYuVdjkuRi2PjpCl7HMTCuilBksvJonAmk1XIPFEWHrUYZS2 TX5szB15io7pPkHGLlFVakCPLLNYCPu80SwMEZIai3QxVnHlCr3aMkncWywqnELg0eu+9D sT0tCApZax3NyN+vlgJtAT1d6O/enzKQ/EPAnVY+RqtiRUDJRjJFeu3YZHYztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1TLFUiHca2AX4oZ2icnoHFAKnZJwCmhLw9ZUpCZ4io=; b=YPI1ITeglJORY6DagleyiyqXr3pjfqDAwkEJprx9JU6ca3S+6OgstwTuKKQMQKPJ65RYF0 JFnxAyY+nqJIgeTud7fxdGOaJbe/dznsc8UlPeYamjKiYyZu6TMcu59av0kVcfehQr1jUs FodhoRvOXfoxhOQWnIfhpE44MsRzCSHmodSwYC5yckQFEnmEOklgKJjmqBPvvo8QaHgYd/ Ta08kBkSMqo8AK2I61bdcezch7aHSuz5AqOloE81a3o384xnVg+gn9waiGlqo4AfFmbP2s ykPAsEiFN+9MadppLMmOS7JbJ25pDi5qccpMpp5+lBI8zbBIDFSjlGjeDS19QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TyzsW6fMzzTrK; Mon, 18 Mar 2024 15:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrJul001242; Mon, 18 Mar 2024 15:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrJc0001239; Mon, 18 Mar 2024 15:53:19 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:19 GMT Message-Id: <202403181553.42IFrJc0001239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 416547ba79c3 - stable/14 - kern: poll: tap out the pollfd array on successful return List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 416547ba79c3dec8e69502174abecf33dbf74606 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=416547ba79c3dec8e69502174abecf33dbf74606 commit 416547ba79c3dec8e69502174abecf33dbf74606 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:57 +0000 kern: poll: tap out the pollfd array on successful return We do this in kern_poll() to include freebsd32 but exclude the linux compat layer. The ABI should be the same, but the POLL constants are probably different or should be assumed so. Reviewed by: bapt, jhb (cherry picked from commit b5d2165b9046572c9361a8e8b09323a6001ac586) --- sys/kern/sys_generic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index b569a9f808d5..d0d0b1efa354 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1608,6 +1608,11 @@ kern_poll(struct thread *td, struct pollfd *ufds, u_int nfds, error = kern_poll_kfds(td, kfds, nfds, tsp, set); if (error == 0) error = pollout(td, kfds, ufds, nfds); +#ifdef KTRACE + if (error == 0 && KTRPOINT(td, KTR_STRUCT_ARRAY)) + ktrstructarray("pollfd", UIO_USERSPACE, ufds, nfds, + sizeof(*ufds)); +#endif out: if (nfds > nitems(stackfds)) From nobody Mon Mar 18 15:53:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TyzsY2KlZz5Dyk8; Mon, 18 Mar 2024 15:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TyzsY1GPVz4cNk; Mon, 18 Mar 2024 15:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RFEo53vlkebyx6uFISo6mMrZTYalj4Ghx5Vs5KGAzzs=; b=LpziFKDUJDgYhrNJKXj9KRIluME2rH2TGE7Q6vu+Rf7guImNKsKViNO0QWkCzj3EbL/sct PmHKXvmKmgtdTkqyA8jBuNmFZVMhMbEUH6vPJp1F7nRn/4BburaMbdKXtruLCnT//qhmjF QWNlbe0EhA8PEXRTaMffSkFXNftutknhhnpQCPU+XlkaHdP990U1jAxZsD+9wcJEiCGAo+ IrQmip11OzNIHp86omdAaqGLGOq85g0CIW972vCDTaokBy9ufhP5XkZlv1gXXvNn0L82Kg lDDwrC/FFTQf7hUwny0ZvDrNkt4q8gSLMvjZ9RkuDTF+Y4FJChqkMxlhofOKug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777201; a=rsa-sha256; cv=none; b=eq/hSrn3LQioFTHcRxY1P5aWV6k3vISuiQrsWwqdtg2PlxvwZ16xdZGVIkuc8xq2Q48mFD bAADQDtWwnr93g7LR4lNs8Oz0w5TN/WDzgUS1RS2gYq/9dqSFR9fjw9ODGFha6LhvCKpwq Fov2LGIh9cQCWNHcv/hl6eIGgcWcfLtzYL8I9NMojtbr+2aqrcwKtAfGDvYv8XnVlgFgVY cZSm3PKJkqw7QXlJXJWpW1g5ZRu3oD85PH6t0egZMTgQOa0QR19LrKndIfmpCRJqCkbLdm 4OZswCvasmw7EOKqzwU7u4UtKyegDJtp20w1W5RzK4Q4C2jRyh2es9gBjtEWaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RFEo53vlkebyx6uFISo6mMrZTYalj4Ghx5Vs5KGAzzs=; b=e38yMKC8r7QL3ANb1OgivrB6vrUtv873+xKgaXA4rQpxnOqEIFqWC6oDaaa88ue8CuPgKN Wjw7fAQ8JJgA/+56zGbNpLo43Dj3WAHksU5iNF6Nl3Y8ZwKNgLyTbCCsdwno8Qfj9pWXOM kEBwYQkLB7EoxtaPACl/L/1oDCuwomP8Anf08CWDxlPRnwOD4ugJBoQ5wbbeZlMzHmHlsQ tjgpt6BYVwQasITZyeb2QzsyRD/bLvUVYBjLq0FJD1EldXGzB2gmKV1SKyj9nQylgwXYHP F0/GBMwp9uxrFhvZ2zDTilSq/B4Nm8LtqrPyFK+3ks5zbnY4wHgfHHbJwYmWeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TyzsY0bbJzTPP; Mon, 18 Mar 2024 15:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrKb9001300; Mon, 18 Mar 2024 15:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrKjB001297; Mon, 18 Mar 2024 15:53:20 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:20 GMT Message-Id: <202403181553.42IFrKjB001297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b983d4f63cb5 - stable/14 - kdump: decode pollfd struct arrays coming from poll(2) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b983d4f63cb5f8bd3955c092b4d166c4d0bd972d Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b983d4f63cb5f8bd3955c092b4d166c4d0bd972d commit b983d4f63cb5f8bd3955c092b4d166c4d0bd972d Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:58 +0000 kdump: decode pollfd struct arrays coming from poll(2) We'll handle these just as we do kevents, one per line with subsequent lines indented sufficiently to distinguish them from the upcoming return value. Sample, with indentation stripped and revents changed to '...' in the first one to keep the line length down: CALL poll(0x820610560,0x3,0) STRU struct pollfd[] = { { fd=0, events=0x1, revents=0x11<...> { fd=1, events=0x4, revents=0x4} { fd=-1, events=0x4, revents=0} } RET poll 2 Reviewed by: bapt, jhb (cherry picked from commit 02c57f7b48772c5ec4e3a0a3405273b387b9bb08) --- usr.bin/kdump/kdump.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 078b8a364db8..d69c019bd6be 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -58,6 +58,7 @@ static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93"; #include #include #include +#include #include #include #include @@ -122,6 +123,7 @@ void ktrcapfail(struct ktr_cap_fail *); void ktrfault(struct ktr_fault *); void ktrfaultend(struct ktr_faultend *); void ktrkevent(struct kevent *); +void ktrpollfd(struct pollfd *); void ktrstructarray(struct ktr_struct_array *, size_t); void ktrbitset(char *, struct bitset *, size_t); void ktrsyscall_freebsd(struct ktr_syscall *ktr, register_t **resip, @@ -2221,10 +2223,23 @@ ktrkevent(struct kevent *kev) printf(", data=%#jx, udata=%p }", (uintmax_t)kev->data, kev->udata); } +void +ktrpollfd(struct pollfd *pfd) +{ + + printf("{ fd=%d", pfd->fd); + printf(", events="); + print_mask_arg0(sysdecode_pollfd_events, pfd->events); + printf(", revents="); + print_mask_arg0(sysdecode_pollfd_events, pfd->revents); + printf("}"); +} + void ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) { struct kevent kev; + struct pollfd pfd; char *name, *data; size_t namelen, datalen; int i; @@ -2306,6 +2321,11 @@ ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) kev.udata = (void *)(uintptr_t)kev32.udata; ktrkevent(&kev); #endif + } else if (strcmp(name, "pollfd") == 0) { + if (ksa->struct_size != sizeof(pfd)) + goto bad_size; + memcpy(&pfd, data, sizeof(pfd)); + ktrpollfd(&pfd); } else { printf(" }\n"); return; From nobody Mon Mar 18 15:53:22 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TyzsZ51txz5F07y; Mon, 18 Mar 2024 15:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TyzsZ21Tdz4cfT; Mon, 18 Mar 2024 15:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WW/DDlmXtZHPTmJ4G1SLgwuHKUlAsF9rIfYJmMNRR/k=; b=eYiMCJ7aW6TVu+JzkwxD3YgIr6Dl+IIfBPfe9nBuxJy/r3vAcdDUMKYBFKP9iyN861IQCR ptoj2+DtTko1y2wEVlCwFosUlLIkFsbBhue958VOszihBiwbY3FgqihH6XtU6wrFN1ayG4 KZxYzgxMM4itXM9TXpG75GmarMkdPyKncTNJzVz5GimXCBG+XCIq2CWIsIQ8mwva/Qz/7D LHVPIXqXOZH8mJIGbke9MTPhmDgKqMyPu8NXg+htUqLPFzYHLhqi4tUPF2o3IXxQ97Zq8+ aDIZjBkyUJOAxYLMaW7zoGpy8TZDrlmvRNtwdcEZdf+JbSeX+kAPpNfnQuq5LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777202; a=rsa-sha256; cv=none; b=nqWu6gPkrVO8st3P8x+iCOurhoTfW1i1qCrCkcRLnhoD90ZccIRWb52iiQlAikvhNbN7DF iEr/ZnzkXwWieuwN5uR0m9AH5FamEMooyqXThtBEDUMlVhphZcPfZW+xmImT1QrWIbWHfg WnWhYmzQIiqADh8dEq4fSosYgHaDa/TI8jNyv8vNDUzFiy14cdcRMSKdg9k/HkKd0vbp0/ Est4gPK+9Hj/jU6Iw8oCsPx2Ub5fyLJ7AZXNS+hNxIVIQj3idrzEGFdG9XrmNOREDGyjdW AOXzWuoaKoJIqByeFWcFswMku0ubqYu7Mbgem8AtyutIhDB31kfqDB2nGl0t2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WW/DDlmXtZHPTmJ4G1SLgwuHKUlAsF9rIfYJmMNRR/k=; b=eEDWLdse21h46dkkWH/a3GckLMdw/NeQ+DpWT1I8lwbg4Pr0N565N19Hre/363Vby5yYkr VGCsa5qMeA+/JB4Uzu2ULdQzNU10N1B7WU+ltW+rLYfYlEnDxa51xCZE6OonQzVrXYM0ue V3gjKf8nKFjvfOP83j6Yajjr5VE5kNzZF9ET7RsE/Pv0mkJtplrwKr/Q+XT/vxSUPtGs9f FqER5FnB9eMYPjb66fAo2PQ5kQZsO2MsvYp/fzkuPos8dTfcpc7BwlOByoQc+gP8ZJYsHD +PdOSdDogun6YbByGxWQXmywN+aAS9T3Zb3ot1NTeuvQDAcNg+Mi1qsbi6pHFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TyzsZ1dsKzSjb; Mon, 18 Mar 2024 15:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrMj3001351; Mon, 18 Mar 2024 15:53:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrMc5001348; Mon, 18 Mar 2024 15:53:22 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:22 GMT Message-Id: <202403181553.42IFrMc5001348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 160788caa3c9 - stable/14 - ktrace: log genio events on failed write List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 160788caa3c9cac5f21d70962ce330e18a4fe9d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=160788caa3c9cac5f21d70962ce330e18a4fe9d5 commit 160788caa3c9cac5f21d70962ce330e18a4fe9d5 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:07 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:58 +0000 ktrace: log genio events on failed write Visibility into the contents of the buffer when a write(2) has failed can be immensely useful in debugging IPC issues -- pushing this to discuss the idea, or maybe an alternative where we can set a flag like KTRFAC_ERRIO to enable it. When a genio event is potentially raised after an error, currently we'll just free the uio and return. However, such data can be useful when debugging communication between processes to, e.g., understand what the remote side should have grabbed before closing a pipe. Tap out the entire buffer on failure rather than simply discarding it. Reviewed by: kib, markj (cherry picked from commit 47ad4f2d45e406c6316909bc12bc760b2fdd6afb) --- sys/kern/kern_ktrace.c | 2 +- sys/kern/sys_generic.c | 3 ++- sys/kern/uipc_syscalls.c | 3 ++- sys/netinet/sctp_syscalls.c | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 75b81457402b..4c1936edc301 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -769,7 +769,7 @@ ktrgenio(int fd, enum uio_rw rw, struct uio *uio, int error) int datalen; char *buf; - if (error) { + if (error != 0 && (rw == UIO_READ || error == EFAULT)) { freeuio(uio); return; } diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index d0d0b1efa354..f3fd39079a82 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -579,7 +579,8 @@ dofilewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, cnt -= auio->uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = cnt; + if (error == 0) + ktruio->uio_resid = cnt; ktrgenio(fd, UIO_WRITE, ktruio, error); } #endif diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index c7c2e6544902..85b2214eaeb9 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -791,7 +791,8 @@ kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(s, UIO_WRITE, ktruio, error); } #endif diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index a5e4fa8f9603..d67e260b6f99 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -290,7 +290,8 @@ sys_sctp_generic_sendmsg(struct thread *td, struct sctp_generic_sendmsg_args *ua td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(uap->sd, UIO_WRITE, ktruio, error); } #endif /* KTRACE */ @@ -404,7 +405,8 @@ sys_sctp_generic_sendmsg_iov(struct thread *td, struct sctp_generic_sendmsg_iov_ td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(uap->sd, UIO_WRITE, ktruio, error); } #endif /* KTRACE */ From nobody Mon Mar 18 15:53:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tyzsc1Z0fz5Dyd7; Mon, 18 Mar 2024 15:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyzsb5mNLz4ccS; Mon, 18 Mar 2024 15:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjornkipEQhW2wRL6Jn1tHMxLwGZq/Xo1PytZEcGoQ0=; b=oSYWFdEOmTTI0aXS7fDPJJSMMy/l50OI6+iE2KrW1A1tgbovwOrcgMNf2KLwKH/nbGGbzu QCJlZbltyJq2JOT2+0+xHy3Z2ZARJMDVz7zRW+K3yc2lpPQGP9F97dBkuJp83JuQUb/xfR 448OxAIUCFASUlDrFKQx36kQhEptgh20nGOQ5dkIixbV7rmZ+djQxmfrNXGtMHwQIpIQfI 17LwabAbQC5sqZR6lkjwXr9XnFrq0OznKuGkj7feOS0QCS+U4S3/K6e14yBxvs6TuupHYx Vu33h/zC8+0rkfkyNSIyjkZ+LTQChcFWzTMbZGWDtew7wbSqu5WIli2QI4iOWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777203; a=rsa-sha256; cv=none; b=Z0XZF58B+aPkMeD0fR4VZHkjlO8cYhPkB9kn14v/5OWDTKAJz3Uo0S6QL70lONUn5qOzf+ jMU44OW8ZroJWS6yQflYa5+S0KuY5Fimz5lBEZnSr7dfaLwwS/EkOQVged0aNuVigXevGn 2isVBPId2/vCnGFi4Y7FzBhWdnPpJQAEmT0Mu1RQdGrya2gMLVCx0cwcw3Dfz0ipF6qfk9 cOSCWZilQ+JJbw+5QkKK4uW5n3wcGKvi1Yjxu3b+WO9FglJTCy5x290A9cyxeBUnziVbW2 XVU7FVqd1yaed6VV/NU0YcGaZVUjIGDXYWs/RxrW57J6eRhmvYmH41WtO66RQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjornkipEQhW2wRL6Jn1tHMxLwGZq/Xo1PytZEcGoQ0=; b=cKfdHnUeSAzujmQw03fmAwnWPNqicCkxaiiLzcmYDVLu7nhs7FWgKNeMqzwSS7HPVRg6R3 FVqqvOWtJUkHJiD8MfO2nX81bk5WR6zoTPcOd1OZUjv+3P8MRwojmBj9de+4ukOQjMDgS+ Px18srAeSz5TmywAFYDJetyyjEHL/IYYDqWzT4TQUozi4UgdHwEImkMVS3iyZiYuOk03Jw XncK1hD3C/CRJ6xS4DFj3ozrwJ5pgeRL4fShLAGJuBTl0VnhCVg/FX+k7kJRsCXXZnWnl8 Uv8POfI37aPJzRajkoU6Q/9ZRp9v5NuDQgnfj60t2pfuVVeXlVhRh8qMfWA3Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tyzsb2hpQzT9L; Mon, 18 Mar 2024 15:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrN0R001399; Mon, 18 Mar 2024 15:53:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrNAl001396; Mon, 18 Mar 2024 15:53:23 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:23 GMT Message-Id: <202403181553.42IFrNAl001396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: efb74e16ddc0 - stable/14 - libsysdecode: add a decoder for pollfd events List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efb74e16ddc0ba0864abc9b7f284e17f72d40e78 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=efb74e16ddc0ba0864abc9b7f284e17f72d40e78 commit efb74e16ddc0ba0864abc9b7f284e17f72d40e78 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:58 +0000 libsysdecode: add a decoder for pollfd events We'll use this in another change to read pollfd arrays coming from a successful poll(2) operation. Reviewed by: bapt, jhb (cherry picked from commit bd23e71f91ceec5dfdffc28bbd0020849fdd20b4) --- lib/libsysdecode/Makefile | 1 + lib/libsysdecode/flags.c | 8 ++++++++ lib/libsysdecode/mktables | 1 + lib/libsysdecode/sysdecode.h | 1 + lib/libsysdecode/sysdecode_mask.3 | 12 +++++++++++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index e1d6c7e02ff0..504701ee99a2 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -93,6 +93,7 @@ MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \ sysdecode_mask.3 sysdecode_msync_flags.3 \ sysdecode_mask.3 sysdecode_open_flags.3 \ sysdecode_mask.3 sysdecode_pipe2_flags.3 \ + sysdecode_mask.3 sysdecode_pollfd_events.3 \ sysdecode_mask.3 sysdecode_reboot_howto.3 \ sysdecode_mask.3 sysdecode_rfork_flags.3 \ sysdecode_mask.3 sysdecode_semget_flags.3 \ diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c index 33c778c391ee..32829d35dbe0 100644 --- a/lib/libsysdecode/flags.c +++ b/lib/libsysdecode/flags.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -565,6 +566,13 @@ sysdecode_pipe2_flags(FILE *fp, int flags, int *rem) return (print_mask_0(fp, pipe2flags, flags, rem)); } +bool +sysdecode_pollfd_events(FILE *fp, int flags, int *rem) +{ + + return (print_mask_int(fp, pollfdevents, flags, rem)); +} + const char * sysdecode_prio_which(int which) { diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index bf0dc34511d3..beb18e97f898 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -114,6 +114,7 @@ gen_table "mountflags" "MNT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/ gen_table "msyncflags" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" gen_table "nfssvcflags" "NFSSVC_[A-Z0-9]+[[:space:]]+0x[0-9]+" "nfs/nfssvc.h" gen_table "pathconfname" "_PC_[A-Z4_]+[[:space:]]+[0-9]+" "sys/unistd.h" +gen_table "pollfdevents" "POLL[A-Z]+[[:space:]]+" "sys/poll.h" gen_table "prio" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" gen_table "procctlcmd" "PROC_[A-Z_]+[[:space:]]+[0-9]" "sys/procctl.h" "PROC_TRACE_CTL_" gen_table "ptraceop" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/ptrace.h" diff --git a/lib/libsysdecode/sysdecode.h b/lib/libsysdecode/sysdecode.h index 4c091bb14343..8dc0bbea6f0d 100644 --- a/lib/libsysdecode/sysdecode.h +++ b/lib/libsysdecode/sysdecode.h @@ -83,6 +83,7 @@ const char *sysdecode_nfssvc_flags(int _flags); bool sysdecode_open_flags(FILE *_fp, int _flags, int *_rem); const char *sysdecode_pathconf_name(int _name); bool sysdecode_pipe2_flags(FILE *_fp, int _flags, int *_rem); +bool sysdecode_pollfd_events(FILE *fp, int flags, int *rem); const char *sysdecode_prio_which(int _which); const char *sysdecode_procctl_cmd(int _cmd); const char *sysdecode_ptrace_request(int _request); diff --git a/lib/libsysdecode/sysdecode_mask.3 b/lib/libsysdecode/sysdecode_mask.3 index 171a086a5079..efcab331fe29 100644 --- a/lib/libsysdecode/sysdecode_mask.3 +++ b/lib/libsysdecode/sysdecode_mask.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 3, 2022 +.Dd February 29, 2024 .Dt sysdecode_mask 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Nm sysdecode_msync_flags , .Nm sysdecode_open_flags , .Nm sysdecode_pipe2_flags , +.Nm sysdecode_pollfd_events , .Nm sysdecode_reboot_howto , .Nm sysdecode_rfork_flags , .Nm sysdecode_semget_flags , @@ -96,6 +97,8 @@ .Ft bool .Fn sysdecode_pipe2_flags "FILE *fp" "int flags" "int *rem" .Ft bool +.Fn sysdecode_pollfd_events "FILE *fp" "int flags" "int *rem" +.Ft bool .Fn sysdecode_reboot_howto "FILE *fp" "int howto" "int *rem" .Ft bool .Fn sysdecode_rfork_flags "FILE *fp" "int flags" "int *rem" @@ -191,6 +194,13 @@ and .Dv F_SETFL .Xr fcntl 2 commands. +.It Fn sysdecode_pollfd_events +The +.Fa events +and +.Fa revents +members of a +.Vt struct pollfd . .It Fn sysdecode_sctp_nxt_flags The .Fa nxt_flags From nobody Mon Mar 18 15:53:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tyzsd0Ds3z5Dyd8; Mon, 18 Mar 2024 15:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyzsc5xGwz4cnK; Mon, 18 Mar 2024 15:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OtYW7qDic2/EI3/el1QjXyu2PBHl71svyKS5jFjDyvk=; b=rQTZ9fyjjPsOqOe+5JwpTZK63nhw1MLo7T4IGFqRhnEqRKDNbCM7yLwLnFkPWngsD4+iDR MyOJrK6tK6XD/PqgwgQ1cRfDIC585yUIRzlNBbggxj4s2UbwjNqEcxi9NXAP14CocaFRcB vXEwTqeuxDFJ6JPEwkrFsJ6UIEGzSNv1YwvNg5JEXdXVDccLtJCUw8Mrs/Dloe6Lv3/edo VMs3VClumO0h+Q2HcW1Uo5lOFJR6XWe/K7OBsvXuftuFFKscBVCRIzfE1sugFMKzfQBNFf GnYMV2sJFXNiLDKQ1eJijt+yxPcoaPpPTu8n386ZdkmUuY2ln8jcpr2VemDT3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777204; a=rsa-sha256; cv=none; b=fHQEQfKV7n7j2GN7KdfJGgUXgX3i9ZLBARibQQm5Ie11ePBx1fHig5N9OvAOxFgH50Z7X4 nLBA5tY4yLsx0QSdwT45X4yjzY8RKWZ1oWVWffwAOTCdrF+qFg8ONwXiGWNb6srLk5a4Al rs8UHwPAi7FZyBdTFflQzbR3t691cxdWBonxA7PZTA2sd1Z/L/Jk5xFxsfrGzavvxeTrow NcxGzmfLIrHMdmKElqvcaRpq2/r4ZgEnOth29R6QTEA0fJ5IVebI053a+L0JoN1/hQ/rvT 5VicGZMtb/FCrcWwBhl5AeBnnclLMXGXPzc7rwhTT1Tr7shSMv3wbXOlNg8o4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OtYW7qDic2/EI3/el1QjXyu2PBHl71svyKS5jFjDyvk=; b=bR+RJFq0Jb7r/W2A99BUUjuZ0PZ0wXadpQGQOfbJCyb6Ep7xmRhCBSlnpEfBcjOaAHI+YM k1soa9qh+UcC319pbWSJ1MC39YOKZE2DCmYh6IvEuBC19SlC+q/RtVsV+l9ETwcA6Hx/wm YSxMZrM7uNkEmU7JT+9D5cvShKKjuojn2+0e6kOb0JeYd+QE6538wdoViUW5SLQnjdjqIb vbeQTjogK7pSPb3wMqqPEAR5HQ/ILQiJ0gdc4CL5vk/Je/V/e65EY1lvqHthQcSrDs7Y1y gA9xZSb4Wh6ms/nhYdDh/gY16TSqLqheNZOp9jo3ekEb3uKyFPUyyXORZvutEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tyzsc3VYMzSyN; Mon, 18 Mar 2024 15:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrOtp001456; Mon, 18 Mar 2024 15:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrOCK001453; Mon, 18 Mar 2024 15:53:24 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:24 GMT Message-Id: <202403181553.42IFrOCK001453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 97bfe58ddc60 - stable/14 - crunchgen: slap a dependency on the generated makefile for .lo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 commit 97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:59 +0000 crunchgen: slap a dependency on the generated makefile for .lo crunchgen generates a foo.lo for each binary it will end up crunching into the final product. While they have a dependency on the libs that are used to link them, nothing will force relinking if the set of libs needed to link them is changed. Because of this, incremental builds may not be possible if one builds a version of, e.g., rescue/ with a broken set of libs specified for a project -- a subsequent fix won't be rolled in cleanly, it will require purging the rescue/ objdir. This is a bit crude, but the foo.mk we generate doesn't actually get regenerated all that often in practice, so a spurious relink for the vast majority of crunched objects won't actually happen all that often. Reviewed by: bapt, emaste, imp (cherry picked from commit 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f) --- usr.sbin/crunch/crunchgen/crunchgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 7b5f892cffbe..996db29dee8e 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1115,8 +1115,8 @@ prog_makefile_rules(FILE *outmk, prog_t *p) "int _crunched_%s_stub(int argc, char **argv, char **envp)" "{return main(argc,argv,envp);}\" >%s_stub.c\n", p->ident, p->ident, p->name); - fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)", - p->name, p->name, p->ident); + fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS) %s", + p->name, p->name, p->ident, outmkname); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From nobody Mon Mar 18 16:15:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tz0Lc0NMsz5F1mg; Mon, 18 Mar 2024 16:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tz0Lb5lW3z4gY1; Mon, 18 Mar 2024 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l/BYiOuLU67P7q5Hnh0Wa6hViuh6+S+3YdnYcTwUiS0=; b=S89IRxNQ0XRIRsNZjWumkyyMpRqJqawMji/KgRN1hbjSH0e6hczp4IqNZQpbZ0QZJ8YjHs V21V6YbaOG/eEp8D6kSFYs3R0vi6zfiSW7YGnzHiVAWmXr/AQTes/Ynybgu4fAeE392APk JnqDJQGXUxIVGKwzT3+m69dddriGy7bbSUn3zwoNFyOR2GpKV2Sy8JH0d+0NxrISqlyXl0 IrlvPsDC8PeGNnlzzhFzOLPQfgJGXjilg8MCK5hM99x2QTUw+IY+1MdpT2nU4j9kzeFwHx W5PJBh2xDdZIQKnHPJodUY7/rgl8O0j1dZzCmGgyTWo6m6xTjUjzUCL7XRnkQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710778503; a=rsa-sha256; cv=none; b=lBywaaP/jhOTCtY6N08HnRSbgh5W5ijmSu9hMFlC1KzFPEdpvEGmHtcBSFtXju+hX8vnxC JNrwoX8KhwZZT4Z+WY0RWJrTIChSl51dg62V+9wEi+abc4lT05MBWz3DILyo39T2beON+V ssQKC4aiNGwKzpwrV4WdZAQwj/i0gaa2Zl9HF8cqq2MF9B2sDp5lPatBbYBeyFF8u+0T56 4Jl8tWRwwmahyEsA0FIb2NaWG+d3op3KDmJEEy14inAjDlk59atcM9pyGSKPZmhsxTZZBa b6/pE/uHyh/j4pXXLqopL5VmMGatIdeHOhmeKUA6wEyGmtEnQBUBVoyUmdtAWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l/BYiOuLU67P7q5Hnh0Wa6hViuh6+S+3YdnYcTwUiS0=; b=JWx/jtpXXDp3S7rJHTd46aAWYe/7ho9InC4leKsAU3KDx9nIHIb0MLNf1YLMYoHduxVmmK J9FWQNzaK7gLWrQKplmnIuNAdjyeHqXfAfegyYxGnpzH2l4sjou3/9EzXuwfJ9eJYlRRLI s/6zZ++dCdwffdCS2F1fCShlM+aH8L9N5Vyx0E1T0guGAcwIQPIvBeoW2gyHEgsFueaemO ouycWiIfRGcOoLHEq+XuIIclnUS7r1Xe6bVVz/4ojcSl3l5PgsMaXei4YfhBLRZmFHZPqu 4acrxrwa5KFmif2GiFQ5KtFiwEpVkFFS9PB2trioV5uA3a2dNaEinbKvKxo8WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tz0Lb5LZ1zW3c; Mon, 18 Mar 2024 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IGF3Ir036155; Mon, 18 Mar 2024 16:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGF3De036152; Mon, 18 Mar 2024 16:15:03 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:15:03 GMT Message-Id: <202403181615.42IGF3De036152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: d45714ade3de - stable/14 - netlink: fix route protocol constant values to match Linux List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d45714ade3de0db24cb313c84674c2a8573f4690 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d45714ade3de0db24cb313c84674c2a8573f4690 commit d45714ade3de0db24cb313c84674c2a8573f4690 Author: Marek Zarychta AuthorDate: 2024-03-11 15:50:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 16:14:45 +0000 netlink: fix route protocol constant values to match Linux Although these particular constants aren't supported, the incorrect values break bird 2.15 operation. PR: 277618 Reported by: Ondrej Zajicek (cherry picked from commit 16f8d8829472dfdf6b3b2bb21d652f0bafefccbc) --- sys/netlink/route/route.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h index 9247a59855bb..1d4149e23d2f 100644 --- a/sys/netlink/route/route.h +++ b/sys/netlink/route/route.h @@ -282,8 +282,8 @@ struct rtvia { NL_RTAX_RTO_MIN = 13, /* not supported */ NL_RTAX_INITRWND = 14, /* not supported */ NL_RTAX_QUICKACK = 15, /* not supported */ - NL_RTAX_CC_ALGO = 15, /* not supported */ - NL_RTAX_FASTOPEN_NO_COOKIE = 16, /* not supported */ + NL_RTAX_CC_ALGO = 16, /* not supported */ + NL_RTAX_FASTOPEN_NO_COOKIE = 17, /* not supported */ __NL_RTAX_MAX }; #define NL_RTAX_MAX (__NL_RTAX_MAX - 1) From nobody Mon Mar 18 16:15:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tz0MC3vGsz5F1pP; Mon, 18 Mar 2024 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tz0MC3QpLz4gp6; Mon, 18 Mar 2024 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T0ALIwwUHvkCpTGIsdrazsnyx5itAN2mvgWNjdxhJo=; b=Oe4TY6jia+0iN7HYtt7eG9X+jF9Z18BUoHxLeMerk6t8aYB3uglbOtcHTeXYjZi72OUOdy 5+NX0hXVd4fj+b94NVsqL1YtB9Xi8MzeFL6Y7chfNQxcYbg4TZ8e67t2CwI7/6vs+fLoBh khxTcpihJXNBpfzbzkLA5mpJOS0rzmTkFBfhozwNTw2LeSNlAvfZmLteCEJ9ogVZcvdUn1 r1XL3GmTjn3ekYagHb0Y/yBkfCJs9U19s8z5F/SD6WqQrXOzP4ci6lnhu2m0xQj8dKZHb/ c6qsvvb/7+2nbrrDl0Jo3TUx4DlnlgGPuQbjkf8jhsdXP5LTNpfTX4DtdXqQ4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710778535; a=rsa-sha256; cv=none; b=G7f6tf3BCQh0YFva82FONoLim5XD9merejrYFF7UyCb6iLcKEUpysLhW+G1R0v2B8BAAHx 6calpizA0swVId3oub7JFnA1CIXl5hN4WdvWxEhpDDiRF27eDcnRi4FqGAeRmjnU4tqFGo 4A2zgC0z0mdL57g6RbpUVVQI4M/w3SuS7blIpMMhTFvN1Lwv5vql/xvEhzqmZNJFxbEKOV VREGkv9vAoCEdVhpuEonITQpwjQVYjbogOKp3troDggET6COO7UHFivCiiQ+Q7cJe/um2H vsaOm/INRkhoDv3Bm//Emfv5y4Rn8ycl9ipjL/G8w151FogjHFMwk+RNzo3CUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T0ALIwwUHvkCpTGIsdrazsnyx5itAN2mvgWNjdxhJo=; b=wjCk+NIAmF0u1xmI160sC/nPXbSqFZtc8Z/xs80PDZ0LYjAeaEj5sFw1R/ST9aNxhp44qn ho3XKCQy8/yHTlzt0Ac0UlLaoUZ/hg0BCMR0YLnXTKjKE3mZjSVHPdzbCSvCZgtglAEnxW KPrCrqMS5HBnl2VbHCgxOs6P6sFhoaZJzUHtAUq3SDojOM5Bgiqfd/5mxEAlQ+Kd4ZLSgt N4iE3cklveQPZckWLbwxsxVe0DEHiEyWklpDaTJZ5eLY5tRgKgAoJ5aINm2KyK0q6BLKt/ lvvFjlhY8tv3f8v3DfB0XGtTzD4fgQItSiU2R52mMp0DBAZGcRfrMlENWnfaNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tz0MC32clzW5v; Mon, 18 Mar 2024 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IGFZ0l036366; Mon, 18 Mar 2024 16:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGFZVx036363; Mon, 18 Mar 2024 16:15:35 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:15:35 GMT Message-Id: <202403181615.42IGFZVx036363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: e5c1ba936955 - stable/13 - netlink: fix route protocol constant values to match Linux List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e5c1ba936955d6f74de988db38d6f215e26492cf Auto-Submitted: auto-generated The branch stable/13 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c1ba936955d6f74de988db38d6f215e26492cf commit e5c1ba936955d6f74de988db38d6f215e26492cf Author: Marek Zarychta AuthorDate: 2024-03-11 15:50:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 16:15:28 +0000 netlink: fix route protocol constant values to match Linux Although these particular constants aren't supported, the incorrect values break bird 2.15 operation. PR: 277618 Reported by: Ondrej Zajicek (cherry picked from commit 16f8d8829472dfdf6b3b2bb21d652f0bafefccbc) --- sys/netlink/route/route.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h index 9247a59855bb..1d4149e23d2f 100644 --- a/sys/netlink/route/route.h +++ b/sys/netlink/route/route.h @@ -282,8 +282,8 @@ struct rtvia { NL_RTAX_RTO_MIN = 13, /* not supported */ NL_RTAX_INITRWND = 14, /* not supported */ NL_RTAX_QUICKACK = 15, /* not supported */ - NL_RTAX_CC_ALGO = 15, /* not supported */ - NL_RTAX_FASTOPEN_NO_COOKIE = 16, /* not supported */ + NL_RTAX_CC_ALGO = 16, /* not supported */ + NL_RTAX_FASTOPEN_NO_COOKIE = 17, /* not supported */ __NL_RTAX_MAX }; #define NL_RTAX_MAX (__NL_RTAX_MAX - 1) From nobody Tue Mar 19 06:51:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzMpP4qFbz5Dgjr; Tue, 19 Mar 2024 06:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzMpP4Nwlz49sZ; Tue, 19 Mar 2024 06:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6NGNsJJExa3FI5NY2r80MAsnyTswA1xIuZS3UonBeg=; b=QD3LQp/2R5c7JagM0X57zg6E9habiEj/k7nUSxvOC/03HCMlhJDMTjcza/l9yRHJvrkEbv CKGfisinYSuBelhAd2e7MyBn6ZgVe5Kl1VH3q5Fmok4lETDMjaGQLrXZmB2q/Kd8mShn1Y BQs7ZkJcFUY+Q4PlIjvCCZ9o/tFVOaVVUKgKcCa1NeolKvbj3pvIKyo51BroVQxSZdThqg dWsG6BhPE94d7INwFrhcTbtf9N8azzQeqlw9BDiXU/gh54C77y4A80Xafkgt1rMnXvPI4r NS4c7Te0EBvIcvUUwts3yK/jISsL28qWdawONggPFmY7IhHPND9DfRCwEt1EuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831117; a=rsa-sha256; cv=none; b=rUDX1SN4enrqPPKQ4X05jrll4aOKR0uLO1ZZoWBykxpDkc+fz/Sjmp8mZrhKq53diXLRAB PMZ1R3q55ZBmeAuevSpQ92pXLZ6i78v3FjdvJz5q/dNwCfmre+CouX4k/UYaNuGldyzr31 ApWMMHUYHiiqCygM+pmXeL6OGYM4ciY5lcHoRgkUzmaQsGoK+F1WasornyZ4cuD7q1sbIA k2ZjqAsPO+V/PLM+Up/BXGT2/oCDvfZnN9QIWxfViNZwUXxoYaryhjpTdbpKinDLkDRR05 zbMIvDY+P+oYT44pH1bUul3W4TKpAO5Qm2xOGzaAhkewMqJdZPzDT8xAsUacww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6NGNsJJExa3FI5NY2r80MAsnyTswA1xIuZS3UonBeg=; b=jRjq0bmwPT5spQZQqqAWhf2A9UFRCAzabWBqQgT/hZay9CVwmsJMZQSKpAKh7i94QbhYmp TBcZxSO7ZVAjGADg5WqbY0ofDNcqBlCp7joO2kVxXF8f2cVwfWu7BDEVkLRAVvhEYf3zvl kPWEYwWeaaFB9GJjPcw+9APt7i5ONHGSOpLZugrKwoXEfxTJ0c5WnFBhIriYW8z51bIFEo vj1GiEeyTBlkhIQLmnDW7/CGe2ZvYlSdhbgWOoqGfEIfeDH+NCy2AHtVpj4I+SdBTq3mGm jPIqsTY7qpXcF0WwdxDRm8yiKcRe/SHHcn7PVrtsAtBasWz8TdVmVOrdoNFtYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzMpP3j4Rzx9F; Tue, 19 Mar 2024 06:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42J6pvP8022210; Tue, 19 Mar 2024 06:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6pvHi022207; Tue, 19 Mar 2024 06:51:57 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:51:57 GMT Message-Id: <202403190651.42J6pvHi022207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c7f1512739c7 - stable/14 - MFC: mkimg(1): process non-seekable output gracefully List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c7f1512739c729cd82042cf229a3ab7c56920b70 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f1512739c729cd82042cf229a3ab7c56920b70 commit c7f1512739c729cd82042cf229a3ab7c56920b70 Author: Eugene Grosbein AuthorDate: 2024-03-12 15:55:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:51:13 +0000 MFC: mkimg(1): process non-seekable output gracefully mkimg may make severe load only to fail in the end if output is non-seekable pipe, socket or FIFO unless output format is raw disk image. Check it out and fail early. Make it clear in the manual. (cherry picked from commit 7f0dc6e2cdfa0317c9917dd46e9da9d3897a8fbb) --- usr.bin/mkimg/mkimg.1 | 3 ++- usr.bin/mkimg/mkimg.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index 28ed0ca03ccf..333b8b8a5ecb 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 28, 2024 +.Dd March 12, 2024 .Dt MKIMG 1 .Os .Sh NAME @@ -64,6 +64,7 @@ The image file is a raw disk image by default, but the format of the image file can be specified with the .Ar format argument. +Most formats require seekable output, except of raw disk image. .Pp The disk image can be made bootable by specifying the scheme-specific boot block contents with the diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index bcf500cd675f..f3bb9cb05708 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -556,6 +556,7 @@ mkimg(void) int main(int argc, char *argv[]) { + const char *format_name; int bcfd, outfd; int c, error; @@ -700,6 +701,7 @@ main(int argc, char *argv[]) errc(EX_DATAERR, error, "boot code"); } + format_name = format_selected()->name; if (verbose) { fprintf(stderr, "Logical sector size: %u\n", secsz); fprintf(stderr, "Physical block size: %u\n", blksz); @@ -710,10 +712,20 @@ main(int argc, char *argv[]) fprintf(stderr, "Partitioning scheme: %s\n", scheme_selected()->name); fprintf(stderr, "Output file format: %s\n", - format_selected()->name); + format_name); fputc('\n', stderr); } +#if defined(SPARSE_WRITE) + /* + * sparse_write() fails if output is not seekable so fail early + * not wasting some load unless output format is raw + */ + if (strcmp("raw", format_name) && + lseek(outfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) + errx(EX_USAGE, "%s: output must be seekable", format_name); +#endif + error = image_init(); if (error) errc(EX_OSERR, error, "cannot initialize"); From nobody Tue Mar 19 06:53:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzMqn50pxz5Dh0F; Tue, 19 Mar 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzMqn4VJDz4Bq0; Tue, 19 Mar 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivHNyxflLr+zUunaiJQ3XpPnXqrhhqEBpjXVMN4AHBc=; b=FRHrgAH0TEKW8DdnNyJzsI9cYmUvk4YMy6ZG2LCpazA+m77uwBKZ4+JmPAmJzZwzi+BTOM YXC+eUnnocUld5oeT7dFyxvuvGD++QwT9oxyufkFec3AHlmjIirMwtyo4IgKL6QRG/yNNB YjUVSqMyIIlB/uEDBOX0dPNtgwx8fwRRFPSKQ1WQu9ddAcekXeRluB5RnJouSqq5lipSUK 1CMJ7151hCHLZHND0d9BivAjg7eViwZeLnXAaA9Nz6hsVL5sSW+RR1w+3qp4hdpmL6ZFge 5U0ulnRZ5kmw3HywbpEeX6i5HFIeddog2h5R99SYPzXC9h4sxFn9W4eB5lDbFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831189; a=rsa-sha256; cv=none; b=qhR8CUPeIqqUGsXTEyiivFGDYj+H8AsMwOm/H4SrXjA3NrNDszdLbYJcQ3PscmkSyvyI3E g51fLJ6nKRQkueQ+9Ay7zWkIucvPKUzIVehbV1NXBFn/HTMeaYOubEIIAGDksDFBZFSgd5 e4d3Ujxz2469MsJ9ZsR0+I34+3tSG+8msItwqrbzkFs2UVqfJvtABuA29Ho2Bss1aTfCTC QoogrEpEey0cDtnMgKcwLgtrn9+lklfrg3x4YD4m9Ev1IA6O6PEmlBcTWJqEFhLKWhNjcK Lst2ej1W2DY6OjjXhZDwBbTobHEy+O62jwzLIUfmQ0pecqEhRv8espS8pir1QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivHNyxflLr+zUunaiJQ3XpPnXqrhhqEBpjXVMN4AHBc=; b=g84858prt2eAA9rNS6dI/mH/T51L7W5XfUCQE25+vNn+oS1mtIcPfWdiBGP+HMMvDSyVhu E3QdVb/gzplhNics1ggqVv5NQ58X0WgiiX26Z+XSzUhS9p8oPE3kpDQrHm4QxwPmiSUai/ yI0nE5wqsVCaDMetiRBFYoo/3/qPYPFssIZiMFXmXtMHBuetVsdGo/UYshlJkaYMk7Pq01 vjkED8/aj6QOhrqt3OuvP0uV5+Gfh3f9xUuqKC8iTbIaRkde2Hu2cMX4fbW1GNiU/gdKTQ kdjmXnobdcjGaywXkTfYw1zB//GUwx6EEjwi2sHha55H4eFHwHl9JioNBlNc5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzMqn45s3zxf0; Tue, 19 Mar 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42J6r9Ob023433; Tue, 19 Mar 2024 06:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6r9FR023430; Tue, 19 Mar 2024 06:53:09 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:53:09 GMT Message-Id: <202403190653.42J6r9FR023430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 229bdf30930b - stable/13 - mkimg(1): MFC: process non-seekable output gracefully List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 229bdf30930b543d31b593c22e0c3d2b061cc5e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=229bdf30930b543d31b593c22e0c3d2b061cc5e2 commit 229bdf30930b543d31b593c22e0c3d2b061cc5e2 Author: Eugene Grosbein AuthorDate: 2024-03-12 15:55:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:53:05 +0000 mkimg(1): MFC: process non-seekable output gracefully mkimg may make severe load only to fail in the end if output is non-seekable pipe, socket or FIFO unless output format is raw disk image. Check it out and fail early. Make it clear in the manual. (cherry picked from commit 7f0dc6e2cdfa0317c9917dd46e9da9d3897a8fbb) --- usr.bin/mkimg/mkimg.1 | 3 ++- usr.bin/mkimg/mkimg.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index 28ed0ca03ccf..333b8b8a5ecb 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 28, 2024 +.Dd March 12, 2024 .Dt MKIMG 1 .Os .Sh NAME @@ -64,6 +64,7 @@ The image file is a raw disk image by default, but the format of the image file can be specified with the .Ar format argument. +Most formats require seekable output, except of raw disk image. .Pp The disk image can be made bootable by specifying the scheme-specific boot block contents with the diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index bcf500cd675f..f3bb9cb05708 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -556,6 +556,7 @@ mkimg(void) int main(int argc, char *argv[]) { + const char *format_name; int bcfd, outfd; int c, error; @@ -700,6 +701,7 @@ main(int argc, char *argv[]) errc(EX_DATAERR, error, "boot code"); } + format_name = format_selected()->name; if (verbose) { fprintf(stderr, "Logical sector size: %u\n", secsz); fprintf(stderr, "Physical block size: %u\n", blksz); @@ -710,10 +712,20 @@ main(int argc, char *argv[]) fprintf(stderr, "Partitioning scheme: %s\n", scheme_selected()->name); fprintf(stderr, "Output file format: %s\n", - format_selected()->name); + format_name); fputc('\n', stderr); } +#if defined(SPARSE_WRITE) + /* + * sparse_write() fails if output is not seekable so fail early + * not wasting some load unless output format is raw + */ + if (strcmp("raw", format_name) && + lseek(outfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) + errx(EX_USAGE, "%s: output must be seekable", format_name); +#endif + error = image_init(); if (error) errc(EX_OSERR, error, "cannot initialize"); From nobody Tue Mar 19 06:55:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzMtf182cz5Dh8l; Tue, 19 Mar 2024 06:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzMtf0dbpz4DVD; Tue, 19 Mar 2024 06:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Je0Id6lOrvGyDgiiZRFwPRkD5Ut1H9XZ2AqMAtCAoK0=; b=bDi725sIZdbrOWs3mhaUBU/l425HP0dZEziUmKPNXuio4D2iHW8ThkDggPBk0daqe/Y9KE shfPHmtNw3nSF000tCnjXpgsUWIfixyKrqWTDk7dPPLxXDBmYES6LEiZ551bgjOKtQ5Ny6 YhZwNgO9q1wVsZl2QzwOlzxvDQndRPq2OQaJBlH+Oz2c6ee/lFsJwrEx9AQ151uYkTLY0a szjnCgTHbariZfLN+r+7YTDmu5xMIqBfi9FQndMeia7O3jEOPaSzOYNlb8DfM4s7vZfoc2 DpWX+JtB7sRo2zv6ltY70K4lk7jTvlhGLmcJRiolFdJXCj4UiihYxq62PxDegw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831338; a=rsa-sha256; cv=none; b=h6tmS6lUmgibP7XgIG/glpOkAAQ6MWVnXz4v0nF01buyLOhEtlqXZ5maroe5aCqx6+uT61 MMB9SH3C3vs5jLRf7He7/dcEQZNaqN5B3aVDQqEIcm0d+uvKTeZ5e4O2APBMoatJN8LDfc 5Z1uWbN0NPgbjWqPLFrGmW+cVrAj2SkP0bp6YNlBLgYrxClyDIkXl3cM51Q6vV+Vk/0QYM QkkvetuogBPrkfm0WePp4amIj8ekDm08meVHvMAMuqrsH95mJFIYubVyrnf5aKEgOGhECr cBG3CEPYK3yICEZneHPiE3Ahz4Amyd8DZkRlq107eZ/QCHCh+jCuouBPuFKJ1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Je0Id6lOrvGyDgiiZRFwPRkD5Ut1H9XZ2AqMAtCAoK0=; b=rTOEjxh0t07Q7qSbBkIYaUHbX1jJeG61HFZwZtV+uln5b4ti2GeOO5qff2tCEvKuyUunET MHvdzISJ/CvU0orjB0sQ3eNwnCCkUvbyOYM+Yhn9wyYEHWo3mO2mVbHUMrKWL2QVq7yJ2n lS52itMrbOWnOZNsL06WkLj9q7Y9E4MR48hlOTePnoxxtyw7z5tw7f4b9gyENtMCEZ2T7I 4vF5dRMa+vLKla9AXEUEHxtFg7+/JgDKN46NqfIHA6JkgZJNN12enl/DTY+zEM69TLusVT GJuKCR8YaUPg50L6QG686j5CAkyc0esQOog6aSKYHz0+LwcFj6GVHWyjDyHimw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzMtd6vhVzx9Q; Tue, 19 Mar 2024 06:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42J6tbj1023968; Tue, 19 Mar 2024 06:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6tbH4023965; Tue, 19 Mar 2024 06:55:37 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:55:37 GMT Message-Id: <202403190655.42J6tbH4023965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 947d9b023137 - stable/14 - MFC: diskinfo(8): introduce new option -l List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 947d9b023137c18d9982509a6575310ea99b2b70 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=947d9b023137c18d9982509a6575310ea99b2b70 commit 947d9b023137c18d9982509a6575310ea99b2b70 Author: Eugene Grosbein AuthorDate: 2024-03-05 17:23:41 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:54:18 +0000 MFC: diskinfo(8): introduce new option -l In modes -p or -s, add an option -l to start each line with a device name separated with a tab. Update the manual page. Add an example to list names with corresponding serial numbers: diskinfo -ls /dev/da? (cherry picked from commit e333110d1de748e50051d1305b5438d1bc54eeb4) --- usr.sbin/diskinfo/diskinfo.8 | 23 ++++++++++++++++++++--- usr.sbin/diskinfo/diskinfo.c | 15 ++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 72fd1df4eb08..970bafd4f8e5 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 4, 2017 +.Dd March 5, 2024 .Dt DISKINFO 8 .Os .Sh NAME @@ -38,10 +38,12 @@ .Op Fl citSvw .Ar disk ... .Nm -.Op Fl p +.Op Fl l +.Fl p .Ar disk ... .Nm -.Op Fl s +.Op Fl l +.Fl s .Ar disk ... .Sh DESCRIPTION The @@ -57,6 +59,13 @@ Print fields one per line with a descriptive comment. Perform a simple measurement of the I/O read command overhead. .It Fl i Perform a simple IOPS benchmark. +.It Fl l +In case of +.Fl p +or +.Fl s +modes prepend each line of an output with a device name using a tab +character as a separator. .It Fl p Return the physical path of the disk. This is a string that identifies the physical path to the disk in the @@ -80,6 +89,14 @@ with the following fields: device name, sectorsize, media size in bytes, media size in sectors, stripe size, stripe offset, firmware cylinders, firmware heads, and firmware sectors. The last three fields are only present if the information is available. +.Sh EXAMPLES +List first ten (at most) +.Xr da 4 +devices with corresponding serial numbers: +.Pp +.Dl diskinfo -ls /dev/da? +.Sh SEE ALSO +.Xr da 4 .Sh HISTORY The .Nm diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index 4cc4517a1f26..f091d0ccfbea 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,11 +58,14 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-cipsStvw] disk ...\n"); + fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + " diskinfo [-l] -p disk ...\n" + " diskinfo [-l] -s disk ...\n" + ); exit (1); } -static int opt_c, opt_i, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; +static int opt_c, opt_i, opt_l, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; static bool candelete(int fd); static void speeddisk(int fd, off_t mediasize, u_int sectorsize); @@ -88,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cipsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -98,6 +101,9 @@ main(int argc, char **argv) opt_i = 1; opt_v = 1; break; + case 'l': + opt_l = 1; + break; case 'p': opt_p = 1; break; @@ -169,6 +175,9 @@ main(int argc, char **argv) goto out; } } else { + if (opt_l && (opt_p || opt_s)) { + printf("%s\t", argv[i]); + } if (opt_p) { if (ioctl(fd, DIOCGPHYSPATH, physpath) == 0) { printf("%s\n", physpath); From nobody Tue Mar 19 06:57:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzMwl6k16z5DhFR; Tue, 19 Mar 2024 06:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzMwl6CFZz4Dk5; Tue, 19 Mar 2024 06:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqe7eUATJ/GaDqrnO8VAN64YgG318iu0JKBKxTdS0nY=; b=Nl5abUzr2aoZy+JlqLd8nmv7AqzHqhvT7wOWUHMZnCm25cI9ghlL/29YijKHaQUqHVATzx r6pYGQhze8RGJpOBDl/xlj2hqu8l/82yfsrdfX2YyRqL+iOIY88WlbyDxzalR3Ef49X5L5 P6EZMtBayS/5TJBZcJpqOR/qG22j7EsF/QSyJSr9X/+ZCZZkoxhYMXx2TZ2fcEt7JK+9kZ OSQsjGSw+SaCBAmLM6IZ6KZzaBW8MKhnlCWR4VhjHQlRbp1vov1yz+4oAEjE5w73BN7gxD DtuGhYUrNE8/v/m+8l2suv28qQEjHatUGnHpjVTTDBuj1doIwf6EJlOo0gJhQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831447; a=rsa-sha256; cv=none; b=AyKzVv3e1kbmqG7s3/vPu2P1+B1m4jCmiHm/3Fats3ZstwtazNq9eHF1nc19P7dGI6Hg2i 3GldgLiQqb0INdOn7/tzWirsYmpzIk47j4usBZ4qd9b4RtxL17zosoFwAzVOeMeYAP4vCh tCKyo+NA6rmbJw2Y+60+SRtG+fCk2TZaJvhNW9nfRLI28jCBoLloCwkMDxcBG+mSI0G7GD F8nq3h2yuWnaKROIZjbYre2D2zt3atLE8/yrw7o0S2Ij77PuUwLZLDxb9ASkbqm22fQysg nTDLk7MHZE/2TsVkit5mUh78CAIPUvZwPqLXQHKdeuV4bfb1u6Ys0PD9J8sM7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqe7eUATJ/GaDqrnO8VAN64YgG318iu0JKBKxTdS0nY=; b=ZP1D0Y2ruyg+plbzHdmU1vtD9xDTESy+xrrW3+PiPCi51D/xmtBY3qWTP5nWKTaL+gGUv4 aY/7bwWCWDXQMa5jXjCSzBZUEeOexddeu38v3F5Cx1FsLGUdnVYxVzJO3Vvjn+waksuk0s 1cjUZmN9yhApbGSSO52s35kO/IDrwDjkPvfChDkCgJSGBcbrlBvMkuXA9gAL6bgHK7I64B 8bqZOzv1eWZVJOUWBxHaroxJdP5eXMxZxs6KfI4TZEjCusY9iCwVqCpIzafK8JADIYHmi/ LgQlkBgatBIoiLNx33IwFh1FbDDbfDTtVEiBj79x/trdF1UlI8Uf6bRPTPoLRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzMwl5l2Tzx9S; Tue, 19 Mar 2024 06:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42J6vR7A024313; Tue, 19 Mar 2024 06:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6vRXD024310; Tue, 19 Mar 2024 06:57:27 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:57:27 GMT Message-Id: <202403190657.42J6vRXD024310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 9fd628361bd8 - stable/13 - diskinfo(8): introduce new option -l List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9fd628361bd86a6bf59166d433646ea1e7831949 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=9fd628361bd86a6bf59166d433646ea1e7831949 commit 9fd628361bd86a6bf59166d433646ea1e7831949 Author: Eugene Grosbein AuthorDate: 2024-03-05 17:23:41 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:56:45 +0000 diskinfo(8): introduce new option -l In modes -p or -s, add an option -l to start each line with a device name separated with a tab. Update the manual page. Add an example to list names with corresponding serial numbers: diskinfo -ls /dev/da? (cherry picked from commit e333110d1de748e50051d1305b5438d1bc54eeb4) --- usr.sbin/diskinfo/diskinfo.8 | 23 ++++++++++++++++++++--- usr.sbin/diskinfo/diskinfo.c | 15 ++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 72fd1df4eb08..970bafd4f8e5 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 4, 2017 +.Dd March 5, 2024 .Dt DISKINFO 8 .Os .Sh NAME @@ -38,10 +38,12 @@ .Op Fl citSvw .Ar disk ... .Nm -.Op Fl p +.Op Fl l +.Fl p .Ar disk ... .Nm -.Op Fl s +.Op Fl l +.Fl s .Ar disk ... .Sh DESCRIPTION The @@ -57,6 +59,13 @@ Print fields one per line with a descriptive comment. Perform a simple measurement of the I/O read command overhead. .It Fl i Perform a simple IOPS benchmark. +.It Fl l +In case of +.Fl p +or +.Fl s +modes prepend each line of an output with a device name using a tab +character as a separator. .It Fl p Return the physical path of the disk. This is a string that identifies the physical path to the disk in the @@ -80,6 +89,14 @@ with the following fields: device name, sectorsize, media size in bytes, media size in sectors, stripe size, stripe offset, firmware cylinders, firmware heads, and firmware sectors. The last three fields are only present if the information is available. +.Sh EXAMPLES +List first ten (at most) +.Xr da 4 +devices with corresponding serial numbers: +.Pp +.Dl diskinfo -ls /dev/da? +.Sh SEE ALSO +.Xr da 4 .Sh HISTORY The .Nm diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index 42227d793e99..0f62817ef1cb 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,11 +58,14 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-cipsStvw] disk ...\n"); + fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + " diskinfo [-l] -p disk ...\n" + " diskinfo [-l] -s disk ...\n" + ); exit (1); } -static int opt_c, opt_i, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; +static int opt_c, opt_i, opt_l, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; static bool candelete(int fd); static void speeddisk(int fd, off_t mediasize, u_int sectorsize); @@ -88,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cipsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -98,6 +101,9 @@ main(int argc, char **argv) opt_i = 1; opt_v = 1; break; + case 'l': + opt_l = 1; + break; case 'p': opt_p = 1; break; @@ -169,6 +175,9 @@ main(int argc, char **argv) goto out; } } else { + if (opt_l && (opt_p || opt_s)) { + printf("%s\t", argv[i]); + } if (opt_p) { if (ioctl(fd, DIOCGPHYSPATH, physpath) == 0) { printf("%s\n", physpath); From nobody Tue Mar 19 16:13:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzcFr11wYz5DlTZ; Tue, 19 Mar 2024 16:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzcFr02hFz4Rw3; Tue, 19 Mar 2024 16:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUzCnjYWd6WNak6uFiHfjap5h1yq/G2XDM5SCj/xnq0=; b=J1gNH2434K+YlYZgw+va31FCmGCjJyIez8ThT+k0oRpPJ70d/jiYi9/910Zw6hOpkiLlF+ oVw8scTcdcIE9XUucdGEriltI+U7OI0BORVlFMkI5VtWY2tuw3mdzP1DH5Q0v5LLbHjfdq tRjoSoSd+d5G7ITC1zqcpImJxALwXQmESDABh7RQBqRAKtuk5AJhufN1u4YsRCWKUY3hQy 3dDe1oiM89J4/21oJOjpOtxPSvGryEL02XJLgjoSDicE8+XlEehcwy1pWfwDjMMKfW+Zrh nxW2X4zqCtYtyN7O9hOVqVywuDYv4LQlp1QBpzuooR8vZoQ3u17p0qzZHEbP1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710864784; a=rsa-sha256; cv=none; b=g7iLYwQVYJTkWyv2hlJ1HWXMvoEo9gt7AtL1gUp4lZujZHAinHDVQBykBfMwgeox8E6fus L0HIHbqUdrzV8Zz/+2f+ZKH1xJ9l+hJwi4IaVsuhh45UOJeqZoTYSsJM0qRUuk7xlYS9pL TIF7sJv4a7oar44FfdF7upJ04mB8UQNziplBozcm8yxEe4dNqiNAuWjbcizTzxY6C2uyT8 ir8ByVyGBZ+iXSPP5Dj5l4zBWvl4rgVMP0Z9rSirlssYku/ifivM5qNTTlPIZioR+ho8aL 5bNi/+GrKy53PTK2QnjAfOeUpFmWtc1ahMNy8is7BERUiX6/1ch/hWQ5FcfYww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUzCnjYWd6WNak6uFiHfjap5h1yq/G2XDM5SCj/xnq0=; b=MEwRyMwLPI/sh4Y1T3At0gy5hbydLGLfcwMjiRJzQo3d+k/Hv3d2IfpmwZJdSOPGB+e+JI hG6E0zQE96CCzfr1f5V+rNuuCtSxphoI9meNNO9eTi++WAdrMF0S18y2SGhDoSEmMiwRUi SiPcYGa0+fIUVSZ1sqLG1/2wLu6UfJLoNRZ4HoHLymRzAugSd5612z/BTDND5VFHL78YyB QX5QEkT7pDDNH4mbqoMPnLkEvz9pS2rwumL4FhRURLlh5DOXsxkVs2l9v5UkliZbLgbTE0 LtuJ1H+w9sQocnHHvj9gDpdf6Vo43/H3lcL/8C8hxFomfbhv8aPiqpNUJNS3Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzcFq6lDDzFKG; Tue, 19 Mar 2024 16:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42JGD3r0069805; Tue, 19 Mar 2024 16:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JGD35H069801; Tue, 19 Mar 2024 16:13:03 GMT (envelope-from git) Date: Tue, 19 Mar 2024 16:13:03 GMT Message-Id: <202403191613.42JGD35H069801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a322c2cd1946 - stable/14 - sqlite3: Vendor import of sqlite3 3.45.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a322c2cd194647a2b03fd73296c3f050d38d1ba3 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a322c2cd194647a2b03fd73296c3f050d38d1ba3 commit a322c2cd194647a2b03fd73296c3f050d38d1ba3 Author: Cy Schubert AuthorDate: 2024-03-12 14:01:21 +0000 Commit: Cy Schubert CommitDate: 2024-03-19 16:12:46 +0000 sqlite3: Vendor import of sqlite3 3.45.1 Release notes at https://www.sqlite.org/releaselog/3_45_1.html. Obtained from: https://www.sqlite.org/2024/sqlite-autoconf-3450100.tar.gz Merge commit '1e59a00476c9801952e7319719fcdb095a0cd007' into main (cherry picked from commit 937a0055858a098027f464abf0b2b1ec5d36748f) --- contrib/sqlite3/configure | 20 ++-- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/sqlite3.c | 220 +++++++++++++++++++++++---------------- contrib/sqlite3/sqlite3.h | 6 +- contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 18 ++-- contrib/sqlite3/tea/configure.ac | 2 +- 7 files changed, 157 insertions(+), 113 deletions(-) diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure index 037050503b74..472e8acd0097 100755 --- a/contrib/sqlite3/configure +++ b/contrib/sqlite3/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3106,7 +3106,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.45.0' + VERSION='3.45.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15314,7 +15314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15373,7 +15373,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac index 984c283a2e1d..3ce8855cc762 100644 --- a/contrib/sqlite3/configure.ac +++ b/contrib/sqlite3/configure.ac @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.45.0, http://www.sqlite.org) +AC_INIT(sqlite, 3.45.1, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c index 6e6dc8a6c8c7..139ee46a6a94 100644 --- a/contrib/sqlite3/sqlite3.c +++ b/contrib/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.45.0. By combining all the individual C code files into this +** version 3.45.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** 1066602b2b1976fe58b5150777cced894af1. +** e876e51a0ed5c5b3126f52e532044363a014. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -43408,11 +43408,16 @@ static int unixFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = unixMapfile(pFd, -1); if( rc!=SQLITE_OK ) return rc; } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; } @@ -50765,6 +50770,11 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = winMapfile(pFd, -1); if( rc!=SQLITE_OK ){ @@ -50773,7 +50783,7 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ return rc; } } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ assert( pFd->pMapRegion!=0 ); *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; @@ -76402,7 +76412,10 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){ } pPage = pCur->pPage; - assert( pPage->isInit ); + if( sqlite3FaultSim(412) ) pPage->isInit = 0; + if( !pPage->isInit ){ + return SQLITE_CORRUPT_BKPT; + } if( !pPage->leaf ){ int idx = pCur->ix; rc = moveToChild(pCur, get4byte(findCell(pPage, idx))); @@ -166812,7 +166825,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* An ORDER/GROUP BY clause of more than 63 terms cannot be optimized */ testcase( pOrderBy && pOrderBy->nExpr==BMS-1 ); - if( pOrderBy && pOrderBy->nExpr>=BMS ) pOrderBy = 0; + if( pOrderBy && pOrderBy->nExpr>=BMS ){ + pOrderBy = 0; + wctrlFlags &= ~WHERE_WANT_DISTINCT; + } /* The number of tables in the FROM clause is limited by the number of ** bits in a Bitmask @@ -184749,6 +184765,8 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeIsdiacritic(int); SQLITE_PRIVATE int sqlite3Fts3ExprIterate(Fts3Expr*, int (*x)(Fts3Expr*,int,void*), void*); +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk); + #endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */ #endif /* _FTSINT_H */ @@ -188471,7 +188489,7 @@ static int fts3ShadowName(const char *zName){ ** Implementation of the xIntegrity() method on the FTS3/FTS4 virtual ** table. */ -static int fts3Integrity( +static int fts3IntegrityMethod( sqlite3_vtab *pVtab, /* The virtual table to be checked */ const char *zSchema, /* Name of schema in which pVtab lives */ const char *zTabname, /* Name of the pVTab table */ @@ -188479,30 +188497,21 @@ static int fts3Integrity( char **pzErr /* Write error message here */ ){ Fts3Table *p = (Fts3Table*)pVtab; - char *zSql; int rc; - char *zErr = 0; + int bOk = 0; - assert( pzErr!=0 ); - assert( *pzErr==0 ); UNUSED_PARAMETER(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, zTabname); - if( zSql==0 ){ - return SQLITE_NOMEM; - } - rc = sqlite3_exec(p->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); - if( (rc&0xff)==SQLITE_CORRUPT ){ - *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", - p->bFts4 ? 4 : 3, zSchema, zTabname); - }else if( rc!=SQLITE_OK ){ + rc = sqlite3Fts3IntegrityCheck(p, &bOk); + assert( rc!=SQLITE_CORRUPT_VTAB || bOk==0 ); + if( rc!=SQLITE_OK && rc!=SQLITE_CORRUPT_VTAB ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS%d table %s.%s: %s", - p->bFts4 ? 4 : 3, zSchema, zTabname, zErr); + p->bFts4 ? 4 : 3, zSchema, zTabname, sqlite3_errstr(rc)); + }else if( bOk==0 ){ + *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", + p->bFts4 ? 4 : 3, zSchema, zTabname); } - sqlite3_free(zErr); + sqlite3Fts3SegmentsClose(p); return SQLITE_OK; } @@ -188533,7 +188542,7 @@ static const sqlite3_module fts3Module = { /* xRelease */ fts3ReleaseMethod, /* xRollbackTo */ fts3RollbackToMethod, /* xShadowName */ fts3ShadowName, - /* xIntegrity */ fts3Integrity, + /* xIntegrity */ fts3IntegrityMethod, }; /* @@ -200087,7 +200096,7 @@ static u64 fts3ChecksumIndex( ** If an error occurs (e.g. an OOM or IO error), return an SQLite error ** code. The final value of *pbOk is undefined in this case. */ -static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk){ int rc = SQLITE_OK; /* Return code */ u64 cksum1 = 0; /* Checksum based on FTS index contents */ u64 cksum2 = 0; /* Checksum based on %_content contents */ @@ -200165,7 +200174,7 @@ static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ sqlite3_finalize(pStmt); } - *pbOk = (cksum1==cksum2); + *pbOk = (rc==SQLITE_OK && cksum1==cksum2); return rc; } @@ -200205,7 +200214,7 @@ static int fts3DoIntegrityCheck( ){ int rc; int bOk = 0; - rc = fts3IntegrityCheck(p, &bOk); + rc = sqlite3Fts3IntegrityCheck(p, &bOk); if( rc==SQLITE_OK && bOk==0 ) rc = FTS_CORRUPT_VTAB; return rc; } @@ -203758,6 +203767,16 @@ static void jsonAppendChar(JsonString *p, char c){ } } +/* Remove a single character from the end of the string +*/ +static void jsonStringTrimOneChar(JsonString *p){ + if( p->eErr==0 ){ + assert( p->nUsed>0 ); + p->nUsed--; + } +} + + /* Make sure there is a zero terminator on p->zBuf[] ** ** Return true on success. Return false if an OOM prevents this @@ -203765,7 +203784,7 @@ static void jsonAppendChar(JsonString *p, char c){ */ static int jsonStringTerminate(JsonString *p){ jsonAppendChar(p, 0); - p->nUsed--; + jsonStringTrimOneChar(p); return p->eErr==0; } @@ -205231,8 +205250,8 @@ static u32 jsonbPayloadSize(const JsonParse *pParse, u32 i, u32 *pSz){ (pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8]; n = 9; } - if( i+sz+n > pParse->nBlob - && i+sz+n > pParse->nBlob-pParse->delta + if( (i64)i+sz+n > pParse->nBlob + && (i64)i+sz+n > pParse->nBlob-pParse->delta ){ sz = 0; n = 0; @@ -205282,6 +205301,7 @@ static u32 jsonTranslateBlobToText( } case JSONB_INT: case JSONB_FLOAT: { + if( sz==0 ) goto malformed_jsonb; jsonAppendRaw(pOut, (const char*)&pParse->aBlob[i+n], sz); break; } @@ -205290,6 +205310,7 @@ static u32 jsonTranslateBlobToText( sqlite3_uint64 u = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; int bOverflow = 0; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205312,6 +205333,7 @@ static u32 jsonTranslateBlobToText( case JSONB_FLOAT5: { /* Float literal missing digits beside "." */ u32 k = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205425,11 +205447,12 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '['); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, ','); } - if( sz>0 ) pOut->nUsed--; + if( j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, ']'); break; } @@ -205438,17 +205461,18 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '{'); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, (x++ & 1) ? ',' : ':'); } - if( x & 1 ) pOut->eErr |= JSTRING_MALFORMED; - if( sz>0 ) pOut->nUsed--; + if( (x & 1)!=0 || j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, '}'); break; } default: { + malformed_jsonb: pOut->eErr |= JSTRING_MALFORMED; break; } @@ -206375,6 +206399,38 @@ jsonInsertIntoBlob_patherror: return; } +/* +** If pArg is a blob that seems like a JSONB blob, then initialize +** p to point to that JSONB and return TRUE. If pArg does not seem like +** a JSONB blob, then return FALSE; +** +** This routine is only called if it is already known that pArg is a +** blob. The only open question is whether or not the blob appears +** to be a JSONB blob. +*/ +static int jsonArgIsJsonb(sqlite3_value *pArg, JsonParse *p){ + u32 n, sz = 0; + p->aBlob = (u8*)sqlite3_value_blob(pArg); + p->nBlob = (u32)sqlite3_value_bytes(pArg); + if( p->nBlob==0 ){ + p->aBlob = 0; + return 0; + } + if( NEVER(p->aBlob==0) ){ + return 0; + } + if( (p->aBlob[0] & 0x0f)<=JSONB_OBJECT + && (n = jsonbPayloadSize(p, 0, &sz))>0 + && sz+n==p->nBlob + && ((p->aBlob[0] & 0x0f)>JSONB_FALSE || sz==0) + ){ + return 1; + } + p->aBlob = 0; + p->nBlob = 0; + return 0; +} + /* ** Generate a JsonParse object, containing valid JSONB in aBlob and nBlob, ** from the SQL function argument pArg. Return a pointer to the new @@ -206431,29 +206487,24 @@ rebuild_from_cache: return p; } if( eType==SQLITE_BLOB ){ - u32 n, sz = 0; - p->aBlob = (u8*)sqlite3_value_blob(pArg); - p->nBlob = (u32)sqlite3_value_bytes(pArg); - if( p->nBlob==0 ){ - goto json_pfa_malformed; - } - if( NEVER(p->aBlob==0) ){ - goto json_pfa_oom; - } - if( (p->aBlob[0] & 0x0f)>JSONB_OBJECT ){ - goto json_pfa_malformed; - } - n = jsonbPayloadSize(p, 0, &sz); - if( n==0 - || sz+n!=p->nBlob - || ((p->aBlob[0] & 0x0f)<=JSONB_FALSE && sz>0) - ){ - goto json_pfa_malformed; - } - if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ - goto json_pfa_oom; + if( jsonArgIsJsonb(pArg,p) ){ + if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ + goto json_pfa_oom; + } + return p; } - return p; + /* If the blob is not valid JSONB, fall through into trying to cast + ** the blob into text which is then interpreted as JSON. (tag-20240123-a) + ** + ** This goes against all historical documentation about how the SQLite + ** JSON functions were suppose to work. From the beginning, blob was + ** reserved for expansion and a blob value should have raised an error. + ** But it did not, due to a bug. And many applications came to depend + ** upon this buggy behavior, espeically when using the CLI and reading + ** JSON text using readfile(), which returns a blob. For this reason + ** we will continue to support the bug moving forward. + ** See for example https://sqlite.org/forum/forumpost/012136abd5292b8d + */ } p->zJson = (char*)sqlite3_value_text(pArg); p->nJson = sqlite3_value_bytes(pArg); @@ -207429,12 +207480,12 @@ static void jsonValidFunc( return; } case SQLITE_BLOB: { - if( (flags & 0x0c)!=0 && jsonFuncArgMightBeBinary(argv[0]) ){ + if( jsonFuncArgMightBeBinary(argv[0]) ){ if( flags & 0x04 ){ /* Superficial checking only - accomplished by the ** jsonFuncArgMightBeBinary() call above. */ res = 1; - }else{ + }else if( flags & 0x08 ){ /* Strict checking. Check by translating BLOB->TEXT->BLOB. If ** no errors occur, call that a "strict check". */ JsonParse px; @@ -207445,8 +207496,11 @@ static void jsonValidFunc( iErr = jsonbValidityCheck(&px, 0, px.nBlob, 1); res = iErr==0; } + break; } - break; + /* Fall through into interpreting the input as text. See note + ** above at tag-20240123-a. */ + /* no break */ deliberate_fall_through } default: { JsonParse px; @@ -207571,7 +207625,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207581,7 +207635,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC); @@ -207691,7 +207745,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207701,7 +207755,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC); @@ -208182,13 +208236,9 @@ static int jsonEachFilter( memset(&p->sParse, 0, sizeof(p->sParse)); p->sParse.nJPRef = 1; p->sParse.db = p->db; - if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){ - if( jsonFuncArgMightBeBinary(argv[0]) ){ - p->sParse.nBlob = sqlite3_value_bytes(argv[0]); - p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); - }else{ - goto json_each_malformed_input; - } + if( jsonFuncArgMightBeBinary(argv[0]) ){ + p->sParse.nBlob = sqlite3_value_bytes(argv[0]); + p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); }else{ p->sParse.zJson = (char*)sqlite3_value_text(argv[0]); p->sParse.nJson = sqlite3_value_bytes(argv[0]); @@ -250497,7 +250547,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a", -1, SQLITE_TRANSIENT); } /* @@ -250528,27 +250578,21 @@ static int fts5IntegrityMethod( char **pzErr /* Write error message here */ ){ Fts5FullTable *pTab = (Fts5FullTable*)pVtab; - Fts5Config *pConfig = pTab->p.pConfig; - char *zSql; - char *zErr = 0; int rc; + assert( pzErr!=0 && *pzErr==0 ); UNUSED_PARAM(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, pConfig->zName); - if( zSql==0 ) return SQLITE_NOMEM; - rc = sqlite3_exec(pConfig->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); + rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, 0); if( (rc&0xff)==SQLITE_CORRUPT ){ *pzErr = sqlite3_mprintf("malformed inverted index for FTS5 table %s.%s", zSchema, zTabname); }else if( rc!=SQLITE_OK ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS5 table %s.%s: %s", - zSchema, zTabname, zErr); + zSchema, zTabname, sqlite3_errstr(rc)); } - sqlite3_free(zErr); + sqlite3Fts5IndexCloseReader(pTab->p.pIndex); + return SQLITE_OK; } diff --git a/contrib/sqlite3/sqlite3.h b/contrib/sqlite3/sqlite3.h index c2d2456dde6f..4fdfde004ebe 100644 --- a/contrib/sqlite3/sqlite3.h +++ b/contrib/sqlite3/sqlite3.h @@ -146,9 +146,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/contrib/sqlite3/sqlite3rc.h b/contrib/sqlite3/sqlite3rc.h index 7459598ae493..561c3e00aeef 100644 --- a/contrib/sqlite3/sqlite3rc.h +++ b/contrib/sqlite3/sqlite3rc.h @@ -1,3 +1,3 @@ #ifndef SQLITE_RESOURCE_VERSION -#define SQLITE_RESOURCE_VERSION 3,45,0 +#define SQLITE_RESOURCE_VERSION 3,45,1 #endif diff --git a/contrib/sqlite3/tea/configure b/contrib/sqlite3/tea/configure index 9992b6434dce..8bd47a5e0187 100755 --- a/contrib/sqlite3/tea/configure +++ b/contrib/sqlite3/tea/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1496,7 +1496,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1795,7 +1795,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9560,7 +9560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9615,7 +9615,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/tea/configure.ac b/contrib/sqlite3/tea/configure.ac index 4df57344bee2..740bd9749d3d 100644 --- a/contrib/sqlite3/tea/configure.ac +++ b/contrib/sqlite3/tea/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([sqlite],[3.45.0]) +AC_INIT([sqlite],[3.45.1]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. From nobody Tue Mar 19 16:13:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzcG96NLKz5Dlsn; Tue, 19 Mar 2024 16:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzcG96DHxz4SZf; Tue, 19 Mar 2024 16:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KhrpxK9oA+Y30m5F3+C2Ln+NoXPPLiOwyRzrQiAwyGA=; b=ldoT5AVbGxBW1ZkhV0GLbl+xkN5p2rjxu+7anw8be1ssAbvBF+s+r1TW5Xdm4AEg3+xDMb J/oH2uz9HzNhxlkc0h4n//g8NF7y76v4en1vlSeeIeMQH343iH4AHiS3gHSeASM9AtIm5f QUYginC/DEWi/IYO7xEHqMu8e3sCFvuE510JoHzXCCVu/53EMtj07THkmvtkl+oGWOaxn7 im6P3KZh9Iz6Z8RL8MsFI05fzUG0bm9N9pptfO1liXkYRDU+yppRpCxK4BOk+HHZrgtFtj e7vXcdZJJbSAJPmKTKR/M4BTvHv4+ohAfqQTcuaK7Dnh58+7myGLC8IaSBd1ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710864801; a=rsa-sha256; cv=none; b=Xw85bCqlRp3lXHl0ciyJYGbVvKCJmziCX97I4xo2II088MUrbYDfHS/Y7fMv8rZDZ3Ynlc fODRL5Ge56uR1Fy7tYUZe5hH+7qNpmkUnvdp1dC+SrUKaaVYVRjXUGY/tVTDZ5p8kcqcDA vKP+dGN4KZ90fmgAidJRRXSgeU5KfP016SmR8z9ObI0ReakrUuS461ToHFWHpGh9HRtYmN j7p+tRqecLHHrAQllcfmgo+rnZAdPfl1cx5CWgVmN3UHrVQWGDuxChlmam9THNDpXQLdkx Yq+FyMXqt+e6zoODb2YpIOAJqYPB5AGYDx2VvDkO0O2kBc3RexylA+rzPqhXhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KhrpxK9oA+Y30m5F3+C2Ln+NoXPPLiOwyRzrQiAwyGA=; b=NKxb2czEAbAjLhmcUNl/624ALw13u72zL1Ten6SAWHEsFHysWf0IOeybdn8bC0env8jeca PugROeJMMr4f9usU1ZMp+dB8FLDNhzXoirTXqy8zNiar6IdMg3exMTX16s6F/KtnjJKlNh xlXhIQ2VPhOdpAE5iXuIaGml631O4YOK7PpXtZgSVHlUKJXWi6IPj1rktgje9VV262N3zs VWPrl/GDz7u1wyczttW626ZWtp7mZxmGGe5CvwCtDRNYArU0r8/kACHzy1bvMZntirqn/n 33IwBrU6oWe0O6WR4OcVzMkO6jfk6YJnOn/aRmhLpywUdsiPyPRZc26+J/lcug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzcG95rHQzFDG; Tue, 19 Mar 2024 16:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42JGDLG5069968; Tue, 19 Mar 2024 16:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JGDLm9069965; Tue, 19 Mar 2024 16:13:21 GMT (envelope-from git) Date: Tue, 19 Mar 2024 16:13:21 GMT Message-Id: <202403191613.42JGDLm9069965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 6b073e0ec62d - stable/13 - sqlite3: Vendor import of sqlite3 3.45.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b073e0ec62d52ea3aa2a1c8cff2b87b893b8208 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6b073e0ec62d52ea3aa2a1c8cff2b87b893b8208 commit 6b073e0ec62d52ea3aa2a1c8cff2b87b893b8208 Author: Cy Schubert AuthorDate: 2024-03-12 14:01:21 +0000 Commit: Cy Schubert CommitDate: 2024-03-19 16:13:15 +0000 sqlite3: Vendor import of sqlite3 3.45.1 Release notes at https://www.sqlite.org/releaselog/3_45_1.html. Obtained from: https://www.sqlite.org/2024/sqlite-autoconf-3450100.tar.gz Merge commit '1e59a00476c9801952e7319719fcdb095a0cd007' into main (cherry picked from commit 937a0055858a098027f464abf0b2b1ec5d36748f) --- contrib/sqlite3/configure | 20 ++-- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/sqlite3.c | 220 +++++++++++++++++++++++---------------- contrib/sqlite3/sqlite3.h | 6 +- contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 18 ++-- contrib/sqlite3/tea/configure.ac | 2 +- 7 files changed, 157 insertions(+), 113 deletions(-) diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure index 037050503b74..472e8acd0097 100755 --- a/contrib/sqlite3/configure +++ b/contrib/sqlite3/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3106,7 +3106,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.45.0' + VERSION='3.45.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15314,7 +15314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15373,7 +15373,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac index 984c283a2e1d..3ce8855cc762 100644 --- a/contrib/sqlite3/configure.ac +++ b/contrib/sqlite3/configure.ac @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.45.0, http://www.sqlite.org) +AC_INIT(sqlite, 3.45.1, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c index 6e6dc8a6c8c7..139ee46a6a94 100644 --- a/contrib/sqlite3/sqlite3.c +++ b/contrib/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.45.0. By combining all the individual C code files into this +** version 3.45.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** 1066602b2b1976fe58b5150777cced894af1. +** e876e51a0ed5c5b3126f52e532044363a014. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -43408,11 +43408,16 @@ static int unixFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = unixMapfile(pFd, -1); if( rc!=SQLITE_OK ) return rc; } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; } @@ -50765,6 +50770,11 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = winMapfile(pFd, -1); if( rc!=SQLITE_OK ){ @@ -50773,7 +50783,7 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ return rc; } } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ assert( pFd->pMapRegion!=0 ); *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; @@ -76402,7 +76412,10 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){ } pPage = pCur->pPage; - assert( pPage->isInit ); + if( sqlite3FaultSim(412) ) pPage->isInit = 0; + if( !pPage->isInit ){ + return SQLITE_CORRUPT_BKPT; + } if( !pPage->leaf ){ int idx = pCur->ix; rc = moveToChild(pCur, get4byte(findCell(pPage, idx))); @@ -166812,7 +166825,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* An ORDER/GROUP BY clause of more than 63 terms cannot be optimized */ testcase( pOrderBy && pOrderBy->nExpr==BMS-1 ); - if( pOrderBy && pOrderBy->nExpr>=BMS ) pOrderBy = 0; + if( pOrderBy && pOrderBy->nExpr>=BMS ){ + pOrderBy = 0; + wctrlFlags &= ~WHERE_WANT_DISTINCT; + } /* The number of tables in the FROM clause is limited by the number of ** bits in a Bitmask @@ -184749,6 +184765,8 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeIsdiacritic(int); SQLITE_PRIVATE int sqlite3Fts3ExprIterate(Fts3Expr*, int (*x)(Fts3Expr*,int,void*), void*); +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk); + #endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */ #endif /* _FTSINT_H */ @@ -188471,7 +188489,7 @@ static int fts3ShadowName(const char *zName){ ** Implementation of the xIntegrity() method on the FTS3/FTS4 virtual ** table. */ -static int fts3Integrity( +static int fts3IntegrityMethod( sqlite3_vtab *pVtab, /* The virtual table to be checked */ const char *zSchema, /* Name of schema in which pVtab lives */ const char *zTabname, /* Name of the pVTab table */ @@ -188479,30 +188497,21 @@ static int fts3Integrity( char **pzErr /* Write error message here */ ){ Fts3Table *p = (Fts3Table*)pVtab; - char *zSql; int rc; - char *zErr = 0; + int bOk = 0; - assert( pzErr!=0 ); - assert( *pzErr==0 ); UNUSED_PARAMETER(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, zTabname); - if( zSql==0 ){ - return SQLITE_NOMEM; - } - rc = sqlite3_exec(p->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); - if( (rc&0xff)==SQLITE_CORRUPT ){ - *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", - p->bFts4 ? 4 : 3, zSchema, zTabname); - }else if( rc!=SQLITE_OK ){ + rc = sqlite3Fts3IntegrityCheck(p, &bOk); + assert( rc!=SQLITE_CORRUPT_VTAB || bOk==0 ); + if( rc!=SQLITE_OK && rc!=SQLITE_CORRUPT_VTAB ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS%d table %s.%s: %s", - p->bFts4 ? 4 : 3, zSchema, zTabname, zErr); + p->bFts4 ? 4 : 3, zSchema, zTabname, sqlite3_errstr(rc)); + }else if( bOk==0 ){ + *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", + p->bFts4 ? 4 : 3, zSchema, zTabname); } - sqlite3_free(zErr); + sqlite3Fts3SegmentsClose(p); return SQLITE_OK; } @@ -188533,7 +188542,7 @@ static const sqlite3_module fts3Module = { /* xRelease */ fts3ReleaseMethod, /* xRollbackTo */ fts3RollbackToMethod, /* xShadowName */ fts3ShadowName, - /* xIntegrity */ fts3Integrity, + /* xIntegrity */ fts3IntegrityMethod, }; /* @@ -200087,7 +200096,7 @@ static u64 fts3ChecksumIndex( ** If an error occurs (e.g. an OOM or IO error), return an SQLite error ** code. The final value of *pbOk is undefined in this case. */ -static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk){ int rc = SQLITE_OK; /* Return code */ u64 cksum1 = 0; /* Checksum based on FTS index contents */ u64 cksum2 = 0; /* Checksum based on %_content contents */ @@ -200165,7 +200174,7 @@ static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ sqlite3_finalize(pStmt); } - *pbOk = (cksum1==cksum2); + *pbOk = (rc==SQLITE_OK && cksum1==cksum2); return rc; } @@ -200205,7 +200214,7 @@ static int fts3DoIntegrityCheck( ){ int rc; int bOk = 0; - rc = fts3IntegrityCheck(p, &bOk); + rc = sqlite3Fts3IntegrityCheck(p, &bOk); if( rc==SQLITE_OK && bOk==0 ) rc = FTS_CORRUPT_VTAB; return rc; } @@ -203758,6 +203767,16 @@ static void jsonAppendChar(JsonString *p, char c){ } } +/* Remove a single character from the end of the string +*/ +static void jsonStringTrimOneChar(JsonString *p){ + if( p->eErr==0 ){ + assert( p->nUsed>0 ); + p->nUsed--; + } +} + + /* Make sure there is a zero terminator on p->zBuf[] ** ** Return true on success. Return false if an OOM prevents this @@ -203765,7 +203784,7 @@ static void jsonAppendChar(JsonString *p, char c){ */ static int jsonStringTerminate(JsonString *p){ jsonAppendChar(p, 0); - p->nUsed--; + jsonStringTrimOneChar(p); return p->eErr==0; } @@ -205231,8 +205250,8 @@ static u32 jsonbPayloadSize(const JsonParse *pParse, u32 i, u32 *pSz){ (pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8]; n = 9; } - if( i+sz+n > pParse->nBlob - && i+sz+n > pParse->nBlob-pParse->delta + if( (i64)i+sz+n > pParse->nBlob + && (i64)i+sz+n > pParse->nBlob-pParse->delta ){ sz = 0; n = 0; @@ -205282,6 +205301,7 @@ static u32 jsonTranslateBlobToText( } case JSONB_INT: case JSONB_FLOAT: { + if( sz==0 ) goto malformed_jsonb; jsonAppendRaw(pOut, (const char*)&pParse->aBlob[i+n], sz); break; } @@ -205290,6 +205310,7 @@ static u32 jsonTranslateBlobToText( sqlite3_uint64 u = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; int bOverflow = 0; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205312,6 +205333,7 @@ static u32 jsonTranslateBlobToText( case JSONB_FLOAT5: { /* Float literal missing digits beside "." */ u32 k = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205425,11 +205447,12 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '['); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, ','); } - if( sz>0 ) pOut->nUsed--; + if( j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, ']'); break; } @@ -205438,17 +205461,18 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '{'); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, (x++ & 1) ? ',' : ':'); } - if( x & 1 ) pOut->eErr |= JSTRING_MALFORMED; - if( sz>0 ) pOut->nUsed--; + if( (x & 1)!=0 || j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, '}'); break; } default: { + malformed_jsonb: pOut->eErr |= JSTRING_MALFORMED; break; } @@ -206375,6 +206399,38 @@ jsonInsertIntoBlob_patherror: return; } +/* +** If pArg is a blob that seems like a JSONB blob, then initialize +** p to point to that JSONB and return TRUE. If pArg does not seem like +** a JSONB blob, then return FALSE; +** +** This routine is only called if it is already known that pArg is a +** blob. The only open question is whether or not the blob appears +** to be a JSONB blob. +*/ +static int jsonArgIsJsonb(sqlite3_value *pArg, JsonParse *p){ + u32 n, sz = 0; + p->aBlob = (u8*)sqlite3_value_blob(pArg); + p->nBlob = (u32)sqlite3_value_bytes(pArg); + if( p->nBlob==0 ){ + p->aBlob = 0; + return 0; + } + if( NEVER(p->aBlob==0) ){ + return 0; + } + if( (p->aBlob[0] & 0x0f)<=JSONB_OBJECT + && (n = jsonbPayloadSize(p, 0, &sz))>0 + && sz+n==p->nBlob + && ((p->aBlob[0] & 0x0f)>JSONB_FALSE || sz==0) + ){ + return 1; + } + p->aBlob = 0; + p->nBlob = 0; + return 0; +} + /* ** Generate a JsonParse object, containing valid JSONB in aBlob and nBlob, ** from the SQL function argument pArg. Return a pointer to the new @@ -206431,29 +206487,24 @@ rebuild_from_cache: return p; } if( eType==SQLITE_BLOB ){ - u32 n, sz = 0; - p->aBlob = (u8*)sqlite3_value_blob(pArg); - p->nBlob = (u32)sqlite3_value_bytes(pArg); - if( p->nBlob==0 ){ - goto json_pfa_malformed; - } - if( NEVER(p->aBlob==0) ){ - goto json_pfa_oom; - } - if( (p->aBlob[0] & 0x0f)>JSONB_OBJECT ){ - goto json_pfa_malformed; - } - n = jsonbPayloadSize(p, 0, &sz); - if( n==0 - || sz+n!=p->nBlob - || ((p->aBlob[0] & 0x0f)<=JSONB_FALSE && sz>0) - ){ - goto json_pfa_malformed; - } - if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ - goto json_pfa_oom; + if( jsonArgIsJsonb(pArg,p) ){ + if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ + goto json_pfa_oom; + } + return p; } - return p; + /* If the blob is not valid JSONB, fall through into trying to cast + ** the blob into text which is then interpreted as JSON. (tag-20240123-a) + ** + ** This goes against all historical documentation about how the SQLite + ** JSON functions were suppose to work. From the beginning, blob was + ** reserved for expansion and a blob value should have raised an error. + ** But it did not, due to a bug. And many applications came to depend + ** upon this buggy behavior, espeically when using the CLI and reading + ** JSON text using readfile(), which returns a blob. For this reason + ** we will continue to support the bug moving forward. + ** See for example https://sqlite.org/forum/forumpost/012136abd5292b8d + */ } p->zJson = (char*)sqlite3_value_text(pArg); p->nJson = sqlite3_value_bytes(pArg); @@ -207429,12 +207480,12 @@ static void jsonValidFunc( return; } case SQLITE_BLOB: { - if( (flags & 0x0c)!=0 && jsonFuncArgMightBeBinary(argv[0]) ){ + if( jsonFuncArgMightBeBinary(argv[0]) ){ if( flags & 0x04 ){ /* Superficial checking only - accomplished by the ** jsonFuncArgMightBeBinary() call above. */ res = 1; - }else{ + }else if( flags & 0x08 ){ /* Strict checking. Check by translating BLOB->TEXT->BLOB. If ** no errors occur, call that a "strict check". */ JsonParse px; @@ -207445,8 +207496,11 @@ static void jsonValidFunc( iErr = jsonbValidityCheck(&px, 0, px.nBlob, 1); res = iErr==0; } + break; } - break; + /* Fall through into interpreting the input as text. See note + ** above at tag-20240123-a. */ + /* no break */ deliberate_fall_through } default: { JsonParse px; @@ -207571,7 +207625,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207581,7 +207635,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC); @@ -207691,7 +207745,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207701,7 +207755,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC); @@ -208182,13 +208236,9 @@ static int jsonEachFilter( memset(&p->sParse, 0, sizeof(p->sParse)); p->sParse.nJPRef = 1; p->sParse.db = p->db; - if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){ - if( jsonFuncArgMightBeBinary(argv[0]) ){ - p->sParse.nBlob = sqlite3_value_bytes(argv[0]); - p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); - }else{ - goto json_each_malformed_input; - } + if( jsonFuncArgMightBeBinary(argv[0]) ){ + p->sParse.nBlob = sqlite3_value_bytes(argv[0]); + p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); }else{ p->sParse.zJson = (char*)sqlite3_value_text(argv[0]); p->sParse.nJson = sqlite3_value_bytes(argv[0]); @@ -250497,7 +250547,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a", -1, SQLITE_TRANSIENT); } /* @@ -250528,27 +250578,21 @@ static int fts5IntegrityMethod( char **pzErr /* Write error message here */ ){ Fts5FullTable *pTab = (Fts5FullTable*)pVtab; - Fts5Config *pConfig = pTab->p.pConfig; - char *zSql; - char *zErr = 0; int rc; + assert( pzErr!=0 && *pzErr==0 ); UNUSED_PARAM(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, pConfig->zName); - if( zSql==0 ) return SQLITE_NOMEM; - rc = sqlite3_exec(pConfig->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); + rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, 0); if( (rc&0xff)==SQLITE_CORRUPT ){ *pzErr = sqlite3_mprintf("malformed inverted index for FTS5 table %s.%s", zSchema, zTabname); }else if( rc!=SQLITE_OK ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS5 table %s.%s: %s", - zSchema, zTabname, zErr); + zSchema, zTabname, sqlite3_errstr(rc)); } - sqlite3_free(zErr); + sqlite3Fts5IndexCloseReader(pTab->p.pIndex); + return SQLITE_OK; } diff --git a/contrib/sqlite3/sqlite3.h b/contrib/sqlite3/sqlite3.h index c2d2456dde6f..4fdfde004ebe 100644 --- a/contrib/sqlite3/sqlite3.h +++ b/contrib/sqlite3/sqlite3.h @@ -146,9 +146,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/contrib/sqlite3/sqlite3rc.h b/contrib/sqlite3/sqlite3rc.h index 7459598ae493..561c3e00aeef 100644 --- a/contrib/sqlite3/sqlite3rc.h +++ b/contrib/sqlite3/sqlite3rc.h @@ -1,3 +1,3 @@ #ifndef SQLITE_RESOURCE_VERSION -#define SQLITE_RESOURCE_VERSION 3,45,0 +#define SQLITE_RESOURCE_VERSION 3,45,1 #endif diff --git a/contrib/sqlite3/tea/configure b/contrib/sqlite3/tea/configure index 9992b6434dce..8bd47a5e0187 100755 --- a/contrib/sqlite3/tea/configure +++ b/contrib/sqlite3/tea/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1496,7 +1496,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1795,7 +1795,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9560,7 +9560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9615,7 +9615,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/tea/configure.ac b/contrib/sqlite3/tea/configure.ac index 4df57344bee2..740bd9749d3d 100644 --- a/contrib/sqlite3/tea/configure.ac +++ b/contrib/sqlite3/tea/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([sqlite],[3.45.0]) +AC_INIT([sqlite],[3.45.1]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. From nobody Wed Mar 20 00:53:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tzqpl2V7gz5Fw2D; Wed, 20 Mar 2024 00:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tzqpl1yjRz4VNg; Wed, 20 Mar 2024 00:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQnzs623cxozRNtpygC0TKafRdyutxFlWvRDah9Bk64=; b=MEksaQqFvzbhEc0gBkbT5Rb8gqGxlysQBFdcUglvzLcnqK02qVoP5HUyEMwZ6TvpOJavXX mYyOpa/a6tfW6rgy2HZAGPoNurfYdeinZhqIZaNDGKKSF7OAVmkFKdZNPOfGhuJlU6vxuq OO6bUgRLS+GfGlzomh3+/w/pM27m+n7lI8b9J8D7PGQPh9AJpXgD+sIUK3lY2tgc9FDCMM hnkoLugyTrz3DDNqgMA8FwzeyPa0EWFzhd7tM4QLLr3B50JNtOI/gqeGyepkzRq4rf2ZER U+CoEJYWop5DfO7GHD2FgLqG5SkukLWxKpy+mPfmrFXWQ/7CayyTC7zTyTnGXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710896031; a=rsa-sha256; cv=none; b=c7yPOMxhlTC5h9fVlxOblVgbtjgt5ou0iuoTGnWuTk2DkTjr22APzJ+zfqT1qsB9Rv8abJ Un/dODDgk4vn+EmsX3XNmiKZ7PMHNH9rxRvkbLD1zEhAEXrkjS3DhHy/OK6eYVkpBMzYg7 fU3QDwrRcNS0xF1YkQ2laffUOhDCqjO6NUWIncKuVaAxvDd/Tn+i9dTIamhWSzOIHaG7CW LkXbaPqvRhV62cgmjKGr+ZIlOulDCLlihwESutH37zpVvGcs9UIHmy2tizOMIY6twn5450 ww0pPcWndwFdkT4Yz0DKTgSg4OI5a61bntqBvnCLkhyRjw3T06Mmn4YE9BV49Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQnzs623cxozRNtpygC0TKafRdyutxFlWvRDah9Bk64=; b=BoSFkjuw+bwow2Od3dFv+sf0VhLHG4GcvomxGU4WL78ABzO8tCd+WVxPYSkw4lv4Q95H6f Em0WbhafvsxGTrHyMn6B0iU9Yl+F/HM7osizC214nTntVh9SpsvV6Khg4EnE7HCBmEZ9Di PTIAC0wr2oOZagGWALbJIfmYRVm0HVISbwwfKsXA20Gu7gjveQqUW2RKiUvehePF8+HGNz oHbucOlXaFZaGIJvcVnFQJnsNMfjjsd1J1wQPJdiupej4Rs4wEhspf38kouCm/rnC/PiDq XYpMU7DhNbLATKC6a9tTNBbPNUxPIb6IYYZMAaCv95wt/ygV6I/KGH9Ce9at6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tzqpl1YgQzVyQ; Wed, 20 Mar 2024 00:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42K0rpJ1047964; Wed, 20 Mar 2024 00:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K0rpYd047961; Wed, 20 Mar 2024 00:53:51 GMT (envelope-from git) Date: Wed, 20 Mar 2024 00:53:51 GMT Message-Id: <202403200053.42K0rpYd047961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 87c7f74ff4da - stable/14 - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 87c7f74ff4dac9b3bb4138216292e68871acb0c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87c7f74ff4dac9b3bb4138216292e68871acb0c5 commit 87c7f74ff4dac9b3bb4138216292e68871acb0c5 Author: Konstantin Belousov AuthorDate: 2024-03-13 11:54:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 00:53:28 +0000 netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env (cherry picked from commit 220ee18f196482c534a659d1eb50db26c54ca7d0) --- sys/netinet/tcp_var.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 4be7fc1baad5..8e2a17204ae3 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -816,11 +816,13 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define ENTER_RECOVERY(t_flags) t_flags |= (TF_CONGRECOVERY | TF_FASTRECOVERY) #define EXIT_RECOVERY(t_flags) t_flags &= ~(TF_CONGRECOVERY | TF_FASTRECOVERY) -#if defined(_KERNEL) && !defined(TCP_RFC7413) +#if defined(_KERNEL) +#if !defined(TCP_RFC7413) #define IS_FASTOPEN(t_flags) (false) #else #define IS_FASTOPEN(t_flags) (t_flags & TF_FASTOPEN) #endif +#endif #define BYTES_THIS_ACK(tp, th) (th->th_ack - tp->snd_una) From nobody Wed Mar 20 00:54:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzqqG4S34z5FwGV; Wed, 20 Mar 2024 00:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzqqG3Yf6z4W3J; Wed, 20 Mar 2024 00:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2I8AF/wTJBv8JcPNXI5KZgvHHwgirN9fhjRxPqdi1PU=; b=wMIfgzyPsx5d+6+6y7kGpLunKPpgCeSKcIkj8RONtAZDDClwan8A+c/GwJjzVw31nfVUWh L83W9GPCLN/3D3prwans8i6OHxtAtbj0NEFSgCtlD07VyNnERekgMDC0MA5+9ZuNlUug1V isMxCG8Wtn4t6WkERIJAnUtkJO6qewaKrmd+0mxvZ0ALpL00A4B8EAPh4WzLYLS0mrSyoq UI/2VrUL7Tl9bFNRsExAwjTs3TosXWlvr1AjKd4IAkXwJ77mZqCifefUIes+f3KmYw8E8z OJe2g2hS81wjdLhBDQOYTB6X3H9vbBYmxYnczwelxDarCWnZFp4esaDonE9D5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710896058; a=rsa-sha256; cv=none; b=g43vI9X7ahcsIsI34C3lYSMoo8r/mo3Tfz6IHleLZSqR21wN7wgTqhykrZ2EYjru5rEzy4 Z5XsaIV+27DN0pD3qLbWnolO7vPUqf9Cs3sU+EAkq8fLYCIL0/iZzDiN2LZvUkguMACsIR fXEwRNaGC1RVo8FiswQ9eKsBs74r6+S/kan5wW5ZgjXzRzGjRFquRSBmdKewERLBK9Y7pG QQvcOsdZOnmBFD9rL+P7YeM+5nafH8qOCyG39sgQZ5YxkoBeHo5J/KmBgjQ0LP2g+cZrSl QDScIR/x7BEaGAPbW2cmypDEnhb4KDgQOvJPXrz0Reut5YZ93ErXmAnpgudfWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2I8AF/wTJBv8JcPNXI5KZgvHHwgirN9fhjRxPqdi1PU=; b=CgVK3ThIYFO9ME8Nl3+8G0glutI0NsNAu5X0vpb62Sc8DAkJL5MGIl4FqFpP0dyIAywy/x dg+yJ5+hGR3i+unvJ+JiuHO5BxccboCMakWAXniKFn6vSQmTHzW6H/w0RQ34jr49yMzEET Wa1OOxisMveN45a5T6FnquxIfbcPapSJlZYkNPKpitIvE8UHypSwQxXfgtgit5emOCYzA/ Rc6UZpXAEwpbhBk35sR0DNIV9DuAMq1qDRl+X1KPuOs/3mE4qXB7b+urWHDhmow2jaleRr KuSM8HMlaUszRCBtZi5+0FeYt66x6s/FAZC/V9Q+RWomzlPrsOZ0Y7KyjR2oVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzqqG393TzWJ9; Wed, 20 Mar 2024 00:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42K0sICe048173; Wed, 20 Mar 2024 00:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K0sIpC048170; Wed, 20 Mar 2024 00:54:18 GMT (envelope-from git) Date: Wed, 20 Mar 2024 00:54:18 GMT Message-Id: <202403200054.42K0sIpC048170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6fd2c94c8a04 - stable/13 - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6fd2c94c8a04814fb9258c1a6181923e141ac9ca Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6fd2c94c8a04814fb9258c1a6181923e141ac9ca commit 6fd2c94c8a04814fb9258c1a6181923e141ac9ca Author: Konstantin Belousov AuthorDate: 2024-03-13 11:54:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 00:53:59 +0000 netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env (cherry picked from commit 220ee18f196482c534a659d1eb50db26c54ca7d0) --- sys/netinet/tcp_var.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index c3d28f1ad6e1..6815c6533073 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -431,11 +431,13 @@ TAILQ_HEAD(tcp_funchead, tcp_function); #define ENTER_RECOVERY(t_flags) t_flags |= (TF_CONGRECOVERY | TF_FASTRECOVERY) #define EXIT_RECOVERY(t_flags) t_flags &= ~(TF_CONGRECOVERY | TF_FASTRECOVERY) -#if defined(_KERNEL) && !defined(TCP_RFC7413) +#if defined(_KERNEL) +#if !defined(TCP_RFC7413) #define IS_FASTOPEN(t_flags) (false) #else #define IS_FASTOPEN(t_flags) (t_flags & TF_FASTOPEN) #endif +#endif #define BYTES_THIS_ACK(tp, th) (th->th_ack - tp->snd_una) From nobody Wed Mar 20 21:25:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V0M7K0WFKz5F0JF; Wed, 20 Mar 2024 21:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0M7K054zz4X4K; Wed, 20 Mar 2024 21:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710969901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hbn+HBvWso0QqEVbgIxu4cZddo7T4WlgCCHZZrj6seo=; b=ucmZKyhlHUR+Y7Um3WlUwnZbG0BsxscWAQ8jLwp+YtUHTRdgUc4q1irMDYLafLiMvosfji QKI4cn03VgBLQS23RbyZa7NZJDmF1n9fVb5xygBwctP20lq2+fljOgl82ce51iL55w30LP Ww76vmGWjHJ49kMPiEhlkJjMKIhVUyUDWEG1WEKZ4NxYuLSiUsryHPv08QLV4kg8f9l7lu Eeg2HSKNGEWxu+cBicSEsPuBIgwIexgkBYfUJTralVmuPWzx2UqHHrQ3vEaDjIa038Lt58 RWzWDlThJp6Yk4W8X5po1uMKSLHNUZia3Z2F3lnpCpTPAyvZtQFFVn7cEE+n6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710969901; a=rsa-sha256; cv=none; b=KIkjkg66BS4xvHZgIq+oAOD/ygXMRJFQHIH6/gVpw9D/FO1nsLmXQAt7E5G91nsiaLNXec absnMV/0nMZhY2SVFQ9z6cyR9BYec66SXnscUkhTllqhgEZPF8734vS/nWlgUlI5ZiCJTJ DnjWf5+19KfYuZHidHtG0S5BaKtbDt7Tv2WjCEfzlsrPz6Cjmq5L7XdHRpQCKUWAhWrho4 QJz7QcnBlJz+fTvgHOxKHVGv3JgDnFUxpHSFn6KUHd03RTmUO/e+tfJ/uUgpbVWFEpie8T jIu7eYf6+pOKfPlutZAJb38DweHf0zVamOjf5+if+IiF2cqach87w/C7UX6sXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710969901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hbn+HBvWso0QqEVbgIxu4cZddo7T4WlgCCHZZrj6seo=; b=Sv6cp+4MDPTfzREeNktuYrTMCVLy1p7NqnZdw5HhgsmnHaf5IOOheenCkdgCyZO9qm3tcE GFpsclxqc/KyHGQ953qAIERfCaI2NfMC2CaqO8JeWu18EicRTeBj35TSXektDUEXvHI9YU g2/C02nMg+U37Eed/LO1kGQW4k8SIoBrQ1l5F++Fd5WZ6L3R43m4fkd05R56sTWEPK3jt+ Q3jX/ebtsPgemHXKzm5VzS1hIhF+MgcmLDnqBa67zC0QgJ0KLpsy+dIqO0fC2UDirL5nW9 UAz/827Hdp/RysoLeUYPJ68fImuCBKlRJbEImcEG/a8xkDmFo5Nh/AtcB49kbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V0M7J6nglz16Vm; Wed, 20 Mar 2024 21:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42KLP0CQ029917; Wed, 20 Mar 2024 21:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KLP0TO029914; Wed, 20 Mar 2024 21:25:00 GMT (envelope-from git) Date: Wed, 20 Mar 2024 21:25:00 GMT Message-Id: <202403202125.42KLP0TO029914@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Silvers Subject: git: 083608e4669e - stable/13 - UFS: panic rather than forcibly unmount the root fs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 083608e4669e0eb3d31d4e7d9ced00ae822807e6 Auto-Submitted: auto-generated The branch stable/13 has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=083608e4669e0eb3d31d4e7d9ced00ae822807e6 commit 083608e4669e0eb3d31d4e7d9ced00ae822807e6 Author: Chuck Silvers AuthorDate: 2023-08-10 16:55:47 +0000 Commit: Chuck Silvers CommitDate: 2024-03-20 20:25:49 +0000 UFS: panic rather than forcibly unmount the root fs If the root fs is forcibly unmounted then basically every process will die with a SEGV as soon as it tries to run again because libc.so is gone, which leaves the system basically hung. It seems better to just panic instead, so let's do that. PR: 276944 Requested-by: karels Reviewed-by: imp, mckusick, karels Sponsored-by: Netflix Differential Revision: https://reviews.freebsd.org/D41387 (cherry picked from commit 60a41168d195cc09f7351c2c2bcafc389ed52406) --- sys/ufs/ffs/ffs_vfsops.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index a7c619fe98ef..433df476f563 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -324,6 +324,9 @@ ffs_fsfail_cleanup_locked(struct ufsmount *ump, int error) mtx_assert(UFS_MTX(ump), MA_OWNED); if (error == ENXIO && (ump->um_flags & UM_FSFAIL_CLEANUP) == 0) { ump->um_flags |= UM_FSFAIL_CLEANUP; + if (ump->um_mountp == rootvnode->v_mount) + panic("UFS: root fs would be forcibly unmounted"); + /* * Queue an async forced unmount. */ From nobody Thu Mar 21 03:49:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V0Wfw4BBdz5FhsK; Thu, 21 Mar 2024 03:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0Wfw3PWgz4MPS; Thu, 21 Mar 2024 03:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710992968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a7fWlD8TTpJapOq9py635K6iLs9w9qvIpb0UwE41w0=; b=uhsw7kDd527CdtfDGcGERfOTKslMuqUs4dhJRbwYaYArxe06hAl4SBNxllaLbmMEkqTUyS aB6DbdEMEge0J6dat0WbGV8XeRBdQSp6q4qKdErEjyRJg+BSg2NR5iXFc4eoba+oehcFcu X+FI5pNnciSaf6Bcf11VmgxcXV68NTdjXst1TffesQFu09z52mmUOaBTPyWFkwGavNTRhJ ZngKdApGKl1HOKHzsOCKYLCsPVnS+SUzojyF0O/S4x3gV9m7Fqc2TaR0G2Z+DTgvm3hWia agbsyaB0sUlxHpojKWuC76i7EfIcmBnIiYISjmkwe1IycE76hw+LkimgVvmzkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710992968; a=rsa-sha256; cv=none; b=V1RpkaupGihbi/Jo5HQoJvKtfSj3SueUEsisZTDw9C+Fkpxdzyg6IooczSylsfsbDKK6fq gsUx0Axwsv0X3mVeCqv+jOpOx533jmmOPkYnRBynKGYSSGh2m1H0UqWvvj7gtWxaL/2diW OnQ8MZ55I5bWtPCmqsKdEG1EABd54L4DJ4PiouNBWXGCdsBwUS0f7RnWr0XNXA67A8ZT63 SLBPhxuOxMQ++MvROR8ywKZXEsAsCOfjmzdY+hAr4Pou0dmCJ7c3vJcCJ5eucxtwtsPzku EAaAE2kkC9VPY6GYgSGZyno158p+WvCr+syFh7WHi4U3bC0MsNzxj6qE615IEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710992968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a7fWlD8TTpJapOq9py635K6iLs9w9qvIpb0UwE41w0=; b=iousMFkHoEvghLYCwT6oict+SiGM+F+lk8ZygzEuNh9Uxkntay84BN0eURSetdVqNJy4nm 49GEUqoO69AZX8Biqm4Jq+s2n+o3eEHJeop1U3I8ntXNtXJ+y0gQs525jqonGSOicZ65KK IEn7jlmX+7OHh46T3dmC2wJzW+lbOxvYSS9gMmPATnDYlUqitzkVf2mnyvgSaWcovnMsJW IwhaZqV7gpmvmQzVOX2MzisyiZjG4ktwwOIpe2sR4Dwt+I+CxpG40TAG5sZqtzUuVz+DHX 9QGsIyBN/lcTaVVPM6lc5399asIM266Spd1LGZpN6xGEy6f3dTGMQyO3CE9cIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V0Wfw30X5zK4n; Thu, 21 Mar 2024 03:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42L3nSaj072105; Thu, 21 Mar 2024 03:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L3nS7X072102; Thu, 21 Mar 2024 03:49:28 GMT (envelope-from git) Date: Thu, 21 Mar 2024 03:49:28 GMT Message-Id: <202403210349.42L3nS7X072102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 984caafec11e - stable/14 - zlib: use more memory for a small deflate speedup. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 984caafec11e2b9b044d23dda23a67270f6108ea Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=984caafec11e2b9b044d23dda23a67270f6108ea commit 984caafec11e2b9b044d23dda23a67270f6108ea Author: Xin LI AuthorDate: 2024-02-19 23:01:04 +0000 Commit: Xin LI CommitDate: 2024-03-21 03:49:04 +0000 zlib: use more memory for a small deflate speedup. The LIT_MEM option uses slightly more memory (for base gzip(1), about 16kiB; according to the author, about 6% for default deflate settings) for a small speedup. The performance gain is more noticeable for input data with higher entropy and less significant for data that is highly compressible, such as source code and logs. (cherry picked from commit aea57ebcb1b053370ea1f0e29cdc666291bc5d5e) --- sys/contrib/zlib/deflate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/zlib/deflate.h b/sys/contrib/zlib/deflate.h index 300c6ada62b8..df76fc6fc5d1 100644 --- a/sys/contrib/zlib/deflate.h +++ b/sys/contrib/zlib/deflate.h @@ -25,7 +25,7 @@ /* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at the cost of a larger memory footprint */ -/* #define LIT_MEM */ +#define LIT_MEM /* =========================================================================== * Internal compression state. From nobody Thu Mar 21 03:50:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V0Wh30J87z5FhqT; Thu, 21 Mar 2024 03:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0Wh26rSpz4N3y; Thu, 21 Mar 2024 03:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710993027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aJlHgeN+IwPRuhQVlTWf9lbM1Ztp8n32mJzJU+jPmg=; b=JAVi9jTuDpDED73G/GIFXJtg9QlKmRmXWAZjz5jgmK5ELIkLCE0gY+Rn31Yv72QVYiSZw9 sh3JBpXewhkOdsuvCr9p5nCnGAI2x6AgClTva/IcMrNV4/T250nw399JYci/EPSvUssNIW 6ln+J4U4LZfwz+D727J+O8nhb32GCS4On6KCQRlMyS58oMvPD8XPeg2lLhG6mhvojnyUsB dKxXhb/KMDvPFGgwMIJRCyNcBwerqkRzrUf5KrVay5mxlq0JrXap27DKgqbsXjVxk8uPme 6Z3Xupjkzv8xd55sDhTkcvHHN5LZS/NIy7pMAc7YJ2JzHJVtd15PHQjttArztg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710993027; a=rsa-sha256; cv=none; b=TiDle21pUjUjQi86MylNW8RmTQ7M9cDjtGDW3BuZoGBUeknHOGwsDVnWLxge2PwSiymHzU lucbxeDnu1MfrQJXUA3o7pAZvBlaO7VrsFSB69fWprAHUhpnKzgUVgfceEKRhBvRdGWr2Q qTD/TNgd3zeJlnEViTWkYKG1kTadH7gFKLqD7+UnDqF8ZA/178H/C75NK4QNVIKnCaln6S VxTl6y7mNqp7RBDBZuuOaYlthS44gMZn1ZVjInXhUn2t55CtPmaTVuIehqKqxHqvwUUzuF Wrt8XVw77NCReqvQahgZPSmaQ9zINUCCfAH6hFoY5VopECXIQxI44+fhGEXYvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710993027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aJlHgeN+IwPRuhQVlTWf9lbM1Ztp8n32mJzJU+jPmg=; b=u4KN9opUUPJfHCc4HrNbte6YZU2fWR7wX8N6HzaG7BqCXbiqYrWn+THdAz7tcbeIiuqcRw vUB0DcDnNUDVdO4RmqMVZlhFO1WVqIipxljIDj3Hggmb1ukeUELypjQaiQsNAAlJsx16WK qiHoJWjhsSTOc//NSid/Rn1w+do/AtP8CdXklwavjh35liRWSJ899Uw/j0d8nbWUikc/8s KSnBHPSyAB3qovQiCgBKywsAoYnQUlwFH5k3WcMGehHob9abke3ULlU/ZglFrEBvP5uqWj wtHzzxwSv0Oi9T7iXYC46YBGozVl58N5g3+ICEZx36DJtnRvEOyFWZt0mnqVwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V0Wh26SCRzJMV; Thu, 21 Mar 2024 03:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42L3oQ0U080966; Thu, 21 Mar 2024 03:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L3oQ2x080963; Thu, 21 Mar 2024 03:50:26 GMT (envelope-from git) Date: Thu, 21 Mar 2024 03:50:26 GMT Message-Id: <202403210350.42L3oQ2x080963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 66844fdbaea0 - stable/13 - zlib: use more memory for a small deflate speedup. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 66844fdbaea091e732c5839791a0f85a32379518 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=66844fdbaea091e732c5839791a0f85a32379518 commit 66844fdbaea091e732c5839791a0f85a32379518 Author: Xin LI AuthorDate: 2024-02-19 23:01:04 +0000 Commit: Xin LI CommitDate: 2024-03-21 03:50:02 +0000 zlib: use more memory for a small deflate speedup. The LIT_MEM option uses slightly more memory (for base gzip(1), about 16kiB; according to the author, about 6% for default deflate settings) for a small speedup. The performance gain is more noticeable for input data with higher entropy and less significant for data that is highly compressible, such as source code and logs. (cherry picked from commit aea57ebcb1b053370ea1f0e29cdc666291bc5d5e) --- sys/contrib/zlib/deflate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/zlib/deflate.h b/sys/contrib/zlib/deflate.h index 300c6ada62b8..df76fc6fc5d1 100644 --- a/sys/contrib/zlib/deflate.h +++ b/sys/contrib/zlib/deflate.h @@ -25,7 +25,7 @@ /* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at the cost of a larger memory footprint */ -/* #define LIT_MEM */ +#define LIT_MEM /* =========================================================================== * Internal compression state. From nobody Thu Mar 21 05:51:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V0ZMv181Hz5FCV3; Thu, 21 Mar 2024 05:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0ZMv0hvvz4YbM; Thu, 21 Mar 2024 05:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/GYeiH4YhsrFmZd2NV9duSSwtoPuWXZ41ImTQiLGRDw=; b=ZVu79ceLa11mqf5Fg2ZtxH/otN3LqW5HjHU0Ebzie5tE10cp7DPiIHfzzEpvr7Dhy2HwB1 90GwQ2Al39Q2KqXHpOYV9tD1qlqwHDLO3KaDW0dLmEm7L0vJQtqVYwyhixKRNaHerLr5d1 FWve5QkEWA2YvVtbe+AU8dsk8YtsBHA/hNQPDEaVRpNX055sK5vdKZ5pn2Bey2B4O5a1We YSWxM81YjC9HxCrcGeNQn8KVGbicspBvqHgKqT1tuhgQ6t1/q4li8xFC3nTleqBB50hGuk Qc3oYdIbMHdHuY8vS2dgm4nSOIQu/lVtfQGtTzMb+jsO/ZYOEqvHU+FDkra3bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711000299; a=rsa-sha256; cv=none; b=fHMoWaCf8RfB+AO+xPgQjSRgUPH0kD940+qGA0j+CKw3SpasG9sDsikUP1WsEryNhJKNE2 2TTYbNm71+zNNMpUSwr+khX3tN5HowR9mINEOJOZ6eZRkkEDhG4Vk8PmP+h1V/28M6L+FP 4Mj1u3RnBWA3YHuVbOM4IEoWGXBoY9GSfoXwBmZuW9aQqbML5oqKvv49EECX6iUFNHfBhP W6m/WhEBJkq4vtXXvgBavKxIrlgtgDrnDn3dBlNStYSmT10IUmMpM758bnYYBtxqaUghXh L416J4S7uXKAGlStoNxYJIA3G7WS3CUJOUAkK2QmidvMNeN5DX7tUzeTt0GwkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/GYeiH4YhsrFmZd2NV9duSSwtoPuWXZ41ImTQiLGRDw=; b=aSkL8afPus52dL5sQDjqm1Uq4CV6/+0Oa3SuJcoI+jgWz4XGJZiDyfUaZF5A6CQUGsepzM uAd2+3dmGkizsx9ym8TScJpzjQhqdFddE7OMWqAevxGsW8iQnjpyAHVNDpvrFHKa/+/A2y y6Ir3pPSDAwgIPtFOhXSI1NPE8xa5gap/dg8KllLaGA91yvi0RiNe4AfMMvX5EbWXJMkTL N9EBNC1XG/l79HsHFZJCEcUo0RCqzwgDDKSeCkUpVMudCyZKe7+KWErYe406OuzJiCbCEc +7qos5TeJXQ1vux0X6hnZxQql1m532+Hoqo2OYkPHFUzhe2IFEdYSVg9vj9w0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V0ZMv0JQqzN4k; Thu, 21 Mar 2024 05:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42L5pc6m084214; Thu, 21 Mar 2024 05:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L5pcux084211; Thu, 21 Mar 2024 05:51:38 GMT (envelope-from git) Date: Thu, 21 Mar 2024 05:51:38 GMT Message-Id: <202403210551.42L5pcux084211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8f13a2c52504 - stable/14 - OpenBSM: Remove $FreeSBD$ tags from the configuration files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f13a2c52504a504686ed20c70869f254491ce98 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f13a2c52504a504686ed20c70869f254491ce98 commit 8f13a2c52504a504686ed20c70869f254491ce98 Author: Gordon Bergling AuthorDate: 2024-03-14 06:02:44 +0000 Commit: Gordon Bergling CommitDate: 2024-03-21 05:51:30 +0000 OpenBSM: Remove $FreeSBD$ tags from the configuration files In e61dc6cac4001f1abfc48ee27e4e623c2c044fa8 the configuration files were taken off the vendor branch to help mergemaster comparing them. Since mergemaster will be deprecated and $FreeBSD$ tags aren't used anymore, remove them. While here, sync audit_filter with upstream commit 5e6da76 (typo). Reviewed by: imp Approved by: imp Differential Revision: https://reviews.freebsd.org/D44318 (cherry picked from commit 6a6ec90681cf30eac2512ab96362a35e259fab62) --- contrib/openbsm/etc/audit_class | 3 --- contrib/openbsm/etc/audit_control | 3 --- contrib/openbsm/etc/audit_event | 5 +---- contrib/openbsm/etc/audit_filter | 3 --- contrib/openbsm/etc/audit_user | 3 --- contrib/openbsm/etc/audit_warn | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class index 47868b17d5da..4fdb14efeea0 100644 --- a/contrib/openbsm/etc/audit_class +++ b/contrib/openbsm/etc/audit_class @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# 0x00000000:no:invalid class 0x00000001:fr:file read 0x00000002:fw:file write diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control index d71b9a817452..aec726820f1e 100644 --- a/contrib/openbsm/etc/audit_control +++ b/contrib/openbsm/etc/audit_control @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# dir:/var/audit dist:off flags:lo,aa diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event index be3557597eee..31b4adc221a6 100644 --- a/contrib/openbsm/etc/audit_event +++ b/contrib/openbsm/etc/audit_event @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, # and programs, such as the kernel, may need to be recompiled to recognize @@ -442,7 +439,7 @@ 43079:AUE_CAPGET:capget(2):pc 43080:AUE_CAPSET:capset(2):pc 43081:AUE_PIVOT_ROOT:pivot_root(2):pc -43082:AUE_RTPRIO::rtprio(2):pc +43082:AUE_RTPRIO:rtprio(2):pc 43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad 43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad 43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad diff --git a/contrib/openbsm/etc/audit_filter b/contrib/openbsm/etc/audit_filter index d0dc1c0baa5c..8e3fa719d232 100644 --- a/contrib/openbsm/etc/audit_filter +++ b/contrib/openbsm/etc/audit_filter @@ -1,5 +1,2 @@ -# -# $FreeBSD$ -# # modulename:various arguments here # diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user index 035066228e91..303b0c137efd 100644 --- a/contrib/openbsm/etc/audit_user +++ b/contrib/openbsm/etc/audit_user @@ -1,4 +1 @@ -# -# $FreeBSD$ -# root:lo:no diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn index 4b8498ea4144..8feb0fa4954f 100644 --- a/contrib/openbsm/etc/audit_warn +++ b/contrib/openbsm/etc/audit_warn @@ -1,6 +1,3 @@ #!/bin/sh -# -# $FreeBSD$ -# logger -p security.warning "audit warning: $@" From nobody Thu Mar 21 05:51:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V0ZNH2Bvmz5FCV5; Thu, 21 Mar 2024 05:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0ZNH1nH9z4Ykg; Thu, 21 Mar 2024 05:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pt/NRYVxoe05B8LiVrwxCM7Qc+8IQ8UAjypTuAgTZm8=; b=EMUC2236N2+9M6qfhzez85s6w9brdULs8WTtuCF2hU39JJYZfAabRRI+1K/AOMd3jiXtCr t7C6UraFJu1b+vaRwTxpL7H3Ab5NBBp4vFvxX+ouJs6WvvJrOhDURK+p+DROap3FbEp+oC b0kZJztTedaZhUDGMzb1vurK8iW0tZmg6iBWLp5hWbBYzEYQonRLXrKrz7J5ZaQ+manQSU C3knveMwm64+WJvb99D1FWAr5wCWdyWSqi4yrvXyqGgOLNhRpQQt1UhW6iDVK8qm5oIXG7 lOJJN9PyGWEHAfnN1xshXJAzltgMS/+Dpod86veIAzlZ6Mc1b8R1vKvYraIeLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711000319; a=rsa-sha256; cv=none; b=QiVcwCdcsTCuI++MfGUYTWpCk9ZYeonDW8LUdQmJQK0zr5dUUzny2f5ZtRyNELdEJgSXHU WG7NJZZD7xwUYa4AirzNjQ4LqLV/wj4WjaKibIrLOa4hAhS8JWSDfDioEcKrIgYwH8Q5Uy hbRnq2FPqOO25KsAerImbT/V6tZZSgglbeVL+kDP3A6f+4lYXgc/zyqGV037EmftkSp0wV Yrj4dzxdRt1s9Nctup2sr8Sz75hCYakwejG3MT3AiIAThMVkJF0/eif+j9MUl28i/6urnC tUUVxEDNtGWhb8p2NymkJtRLgtDbUCQ8Ouc489oaWSSJzOluvuc8ChQZFn7JCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pt/NRYVxoe05B8LiVrwxCM7Qc+8IQ8UAjypTuAgTZm8=; b=IvhJJhICzFkdvAEGDQvcXKHzseKTlSKJwA7ZUdfb/SO61PLwSg6plvXzDR2nP7iRbSt9be o042mOBJs9sep5mGb0wmeybP1O/EVh0Vd3CbkLjUxXGuNr5UASosFkh3ik5ahMcbOvEH6M Nv1HnJViO6/H/dSSa0Y7oo7TUKNmmwhXTXL6SQn2kYRH1CBoXTV0FrVrQh8fVFR1rgT6q1 KEeDaRHxCFfgakgJhJUEsJjTVsaVWnxbHLZKhemUNfhz/8jmM5wV10tt/CrnLlBPs7o1py 01RXMgwkFk3hTxobZ9MWcHlYYoN0xJ7aAcHb1E3c+M+t6Y6gQrBtjPZ0QePcOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V0ZNH1NmjzN4n; Thu, 21 Mar 2024 05:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42L5pxg2086956; Thu, 21 Mar 2024 05:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L5pxwK086953; Thu, 21 Mar 2024 05:51:59 GMT (envelope-from git) Date: Thu, 21 Mar 2024 05:51:59 GMT Message-Id: <202403210551.42L5pxwK086953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 550eedaee1c7 - stable/13 - OpenBSM: Remove $FreeSBD$ tags from the configuration files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 550eedaee1c7c28234c87d7703c0aaa4432ffc92 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=550eedaee1c7c28234c87d7703c0aaa4432ffc92 commit 550eedaee1c7c28234c87d7703c0aaa4432ffc92 Author: Gordon Bergling AuthorDate: 2024-03-14 06:02:44 +0000 Commit: Gordon Bergling CommitDate: 2024-03-21 05:51:52 +0000 OpenBSM: Remove $FreeSBD$ tags from the configuration files In e61dc6cac4001f1abfc48ee27e4e623c2c044fa8 the configuration files were taken off the vendor branch to help mergemaster comparing them. Since mergemaster will be deprecated and $FreeBSD$ tags aren't used anymore, remove them. While here, sync audit_filter with upstream commit 5e6da76 (typo). Reviewed by: imp Approved by: imp Differential Revision: https://reviews.freebsd.org/D44318 (cherry picked from commit 6a6ec90681cf30eac2512ab96362a35e259fab62) --- contrib/openbsm/etc/audit_class | 3 --- contrib/openbsm/etc/audit_control | 3 --- contrib/openbsm/etc/audit_event | 5 +---- contrib/openbsm/etc/audit_filter | 3 --- contrib/openbsm/etc/audit_user | 3 --- contrib/openbsm/etc/audit_warn | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class index 47868b17d5da..4fdb14efeea0 100644 --- a/contrib/openbsm/etc/audit_class +++ b/contrib/openbsm/etc/audit_class @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# 0x00000000:no:invalid class 0x00000001:fr:file read 0x00000002:fw:file write diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control index d71b9a817452..aec726820f1e 100644 --- a/contrib/openbsm/etc/audit_control +++ b/contrib/openbsm/etc/audit_control @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# dir:/var/audit dist:off flags:lo,aa diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event index be3557597eee..31b4adc221a6 100644 --- a/contrib/openbsm/etc/audit_event +++ b/contrib/openbsm/etc/audit_event @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, # and programs, such as the kernel, may need to be recompiled to recognize @@ -442,7 +439,7 @@ 43079:AUE_CAPGET:capget(2):pc 43080:AUE_CAPSET:capset(2):pc 43081:AUE_PIVOT_ROOT:pivot_root(2):pc -43082:AUE_RTPRIO::rtprio(2):pc +43082:AUE_RTPRIO:rtprio(2):pc 43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad 43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad 43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad diff --git a/contrib/openbsm/etc/audit_filter b/contrib/openbsm/etc/audit_filter index d0dc1c0baa5c..8e3fa719d232 100644 --- a/contrib/openbsm/etc/audit_filter +++ b/contrib/openbsm/etc/audit_filter @@ -1,5 +1,2 @@ -# -# $FreeBSD$ -# # modulename:various arguments here # diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user index 035066228e91..303b0c137efd 100644 --- a/contrib/openbsm/etc/audit_user +++ b/contrib/openbsm/etc/audit_user @@ -1,4 +1 @@ -# -# $FreeBSD$ -# root:lo:no diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn index 4b8498ea4144..8feb0fa4954f 100644 --- a/contrib/openbsm/etc/audit_warn +++ b/contrib/openbsm/etc/audit_warn @@ -1,6 +1,3 @@ #!/bin/sh -# -# $FreeBSD$ -# logger -p security.warning "audit warning: $@" From nobody Fri Mar 22 09:14:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Gq64DkVz5G94S; Fri, 22 Mar 2024 09:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Gq63mGcz4XBG; Fri, 22 Mar 2024 09:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9P/EtchLKWkuCQq8N7xpC6PHZX2gCPAWXMQwFt7qnMI=; b=tgVVDw8YfyoTtRoHdKYxaf5KZZ8PzwvxHkkb/gGATwXE9eYVyiQU6GPp9TLnwO+/NVwjN6 eYnxE9ijmqy3EWIf7OLOok/2V+rWb+Ghjg0bfMWzJ5P81CKjqUPsHDnfz7pe9SKclRUJE4 VyG+BrQBcbqqno4qHWOvPC1yDHsfvOOtKgwP413OnlBK26f81LJ/HoO28AHYac960ZZTWb 5PFgS/jmh6NW3xs7GiO+eq0tjxQdeySIvlhSTlg/ZB1Zo5L5BrTUf1BugeapxOuwLnH5A7 pCYECTzhmYqCGnNhoLLngNMk+GxEIsS5QX1aJdpcLrmCAWa9jdHquhLsNFlfuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098850; a=rsa-sha256; cv=none; b=vZA04e2i+0WaV8QX7Rdvc9ZQbY5n9+f40L3d2yBvpyHYVX++JjwBMnZteOc8MGzweuF8+x oQI7hHCcl3c68xMUWEdHh7lzh0a0/XfW/lDiuxo+C5shm5CH2ftS/uReB9HNsHxVIJIgKx 6qUnB3hyFp5Yh2mZi86w1AB4xy8/0MGeFd9+2N1RydwLByILtEubSyWEDJBArT1CvLU+bq uERARQjLrKTQwMtLVnEQ6vbSquD5ULi57jqxym7ISIvoiDqwXy0zF6FZEtsGyf919iHyd5 T6bxGQM2Aa5+IznckvKosjl1330LftkQQeLJn4OgaKjHAQGMLz1i1HE+Y/Y/gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9P/EtchLKWkuCQq8N7xpC6PHZX2gCPAWXMQwFt7qnMI=; b=joQBem9zZUIDLLkWwM81srKPikCkKcPt4bFOwb/GUAj9nXrDapaL1JS/WI/qSgmmYNRBiw zSjFEcl8nH0cuzR6/+lGKp6aqvhddhXkbcUDUD70bi7fdTUr7weAf3Tct87jJ4P0wtwNty YQp33/35n2Ul6B9qSSWv47Gy0xndQxEXGA8/a/Z+X8/mBGzuCF92mntSr3H08CqEIB3UpP DOUqEIo6u2hsWEAEr9/FGzcuUSfrfvhTv9XI6fbz94kiJZYmCiw9V6G2UKdS3wchBJxe6Y ++urPndNe5jFZN3bZJn6LaAaBK9zKNch4N1U8tRDIV6IA7b8aKEK+6cas0Hezw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Gq63MR1z1CY9; Fri, 22 Mar 2024 09:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9EA3o061400; Fri, 22 Mar 2024 09:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9EA4m061397; Fri, 22 Mar 2024 09:14:10 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:14:10 GMT Message-Id: <202403220914.42M9EA4m061397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 98a973168369 - stable/14 - bectl: Use geopt() and drop mention of -?. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 98a9731683696b615b5a94a483aa73a9b418791d Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=98a9731683696b615b5a94a483aa73a9b418791d commit 98a9731683696b615b5a94a483aa73a9b418791d Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:03 +0000 bectl: Use geopt() and drop mention of -?. MFC after: 3 days PR: 272260 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44405 (cherry picked from commit e819534f15308c92afd19166254604995766ce32) --- sbin/bectl/bectl.8 | 9 ++++----- sbin/bectl/bectl.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 19cd867df56b..b511d5a637b6 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd October 5, 2023 +.Dd March 18, 2024 .Dt BECTL 8 .Os .Sh NAME @@ -23,7 +23,7 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm -.Op Fl h\&? +.Op Fl h .Nm .Op Fl r Ar beroot .Cm activate @@ -117,10 +117,9 @@ flag to work. .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo -.Fl h | -.Fl \&? +.Fl h .Xc -Print usage information. +Print usage information and exit. .It Xo .Cm activate .Op Fl t | Fl T diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 05ed8d6be5bd..7632540aa7ad 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -65,7 +65,7 @@ usage(bool explicit) fp = explicit ? stdout : stderr; fprintf(fp, "%s", - "Usage:\tbectl {-h | -? | subcommand [args...]}\n" + "Usage:\tbectl {-h | subcommand [args...]}\n" #if SOON "\tbectl [-r beroot] add (path)*\n" #endif @@ -546,27 +546,31 @@ main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root; - int rc; + char *root = NULL; + int opt, rc; - cmd = NULL; - root = NULL; - if (argc < 2) - return (usage(false)); - - if (strcmp(argv[1], "-r") == 0) { - if (argc < 4) - return (usage(false)); - root = strdup(argv[2]); - command = argv[3]; - argc -= 3; - argv += 3; - } else { - command = argv[1]; - argc -= 1; - argv += 1; + while ((opt = getopt(argc, argv, "hr:")) != -1) { + switch (opt) { + case 'h': + exit(usage(true)); + case 'r': + root = strdup(optarg); + break; + default: + exit(usage(false)); + } } + argc -= optind; + argv += optind; + + if (argc == 0) + exit(usage(false)); + + command = *argv; + optreset = 1; + optind = 1; + /* Handle command aliases */ if (strcmp(command, "umount") == 0) command = "unmount"; @@ -574,9 +578,6 @@ main(int argc, char *argv[]) if (strcmp(command, "ujail") == 0) command = "unjail"; - if ((strcmp(command, "-?") == 0) || (strcmp(command, "-h") == 0)) - return (usage(true)); - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:14:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Gq75GnVz5G8gD; Fri, 22 Mar 2024 09:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Gq74kj2z4X7t; Fri, 22 Mar 2024 09:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ody84Jt7z6YAtVl1RKZCbCQOfPRRbHFewezjILrP9I8=; b=urg5un4RDEe16YIVzaS/dTMyEn6H1DoW9m7qWpN7UnuwwsBCsZpF6FceFs9C6ok58W5dzQ W0UuqLSAlqO9j0yApqmzlhCPMZh+r1qevOKJCRmXISJbR8XJTsdQQrw3mRyvixKdpXQzc8 v1WFLNnsIA9XafFfpgfYMYUlyp/Nc+b5scClE6VpZnClYzUHDR/uNZjNnZKKP5QyG7irkA 36L/n/qXzREst9w550hpTzIBLdd7v+69E9HZ1hAVeEcACcklaqLe3OiCOhPuy+tkWxO/Dw WoWt1GXdV43aYRcBhec/A16fG1IdKFU/YyAOWDB+1nWs09EUEMEBQNkLHQoDWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098851; a=rsa-sha256; cv=none; b=YqsAvP/RXMuvcu7ovbJPG0gsEVBD2fMZl55TDHaNlCgwWB/dm+/xKcvodSIzbh2mUKfk/0 anRKh46yuOOYtzdYgZpXIpt0nmnV5kx59VDWZX6rbOIqJwNXyKmBpmAOCnFnX2WiLLaY8W HWL1m+v44Tb7Rps5+M/jmS7a86pGOhzx0ofusS7CoFc3oCvwLwTm6S1zMa62Jl3383B/sW MjhcmMsMa7asNXhGPGKnvf6SmGvQ3d5qf6XBcawHt2X+8i21wpsuwDlLpOhx8ngxQNiV3I L6gELUNXhxMTwN1kaw1nF7YNa/81n7r+L1P3JZlFl7j1AMbbNro1/Tski2s7iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ody84Jt7z6YAtVl1RKZCbCQOfPRRbHFewezjILrP9I8=; b=Z+Mm1iEpiVCiFXq34box42ujH9zkf5lufrUsPJVTn3mDFN3TZZIRRzKmP9gP6jriP0OtOB tNzk7CBOGPhR+I10K5OyQWphlMMUgz31AQ2hhl4F8u0nazNFDzCe/Yccsm+wf1hZdICkM8 1b3oIXvT83Hx8in0jWG2Fk4Zt7pLQ6af6Gro9Qn6Eaifrq7tHWYN6E4MC4rWHRBNABhF8A 3talYig9ZB2w3t6bQxGOJKxxSf0Rpifc5jzrB8X7QQzbXOnTJKAsdgUkUafztfsOySk+OP qfYuzKpxGJAt/8BuIvSMnDPNpbnBlKraG+KUtla8Yh/NXHNAKZBScNHjbC6kBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Gq74KVSz1CQg; Fri, 22 Mar 2024 09:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9EBmx061442; Fri, 22 Mar 2024 09:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9EBto061439; Fri, 22 Mar 2024 09:14:11 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:14:11 GMT Message-Id: <202403220914.42M9EBto061439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d5d2452bf536 - stable/14 - bectl: Simplify command aliases. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d5d2452bf53639ee4ce0570c61e863c03483048b Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d5d2452bf53639ee4ce0570c61e863c03483048b commit d5d2452bf53639ee4ce0570c61e863c03483048b Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:03 +0000 bectl: Simplify command aliases. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44406 (cherry picked from commit a46217ce7d161ce563374899df4d94b6d000138f) --- sbin/bectl/bectl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 7632540aa7ad..63c3bb369b56 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -115,7 +115,9 @@ static struct command_map_entry command_map[] = { "mount", bectl_cmd_mount, false }, { "rename", bectl_cmd_rename, false }, { "unjail", bectl_cmd_unjail, false }, + { "ujail", bectl_cmd_unjail, false }, { "unmount", bectl_cmd_unmount, false }, + { "umount", bectl_cmd_unmount, false }, { "check", bectl_cmd_check, true }, }; @@ -571,13 +573,6 @@ main(int argc, char *argv[]) optreset = 1; optind = 1; - /* Handle command aliases */ - if (strcmp(command, "umount") == 0) - command = "unmount"; - - if (strcmp(command, "ujail") == 0) - command = "unjail"; - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:14:12 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Gq91Pt0z5G94Y; Fri, 22 Mar 2024 09:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Gq85kpdz4X1Z; Fri, 22 Mar 2024 09:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i7SVNbylh8DJcHHB/Df0k7EsgrNCCMxRmPQWeU1n5IE=; b=IMAnsyBz0ntx4LGCg7tz0JFph1jV3v/ZIt4TtetXfvtVT3/g0nwsQQwNnTr4r7Kq+3XdEB nsfBPZhGZAMe0klzi5427GeziFdJhLNLNiJP+qGoaAPauvcUBPwXri90WT3gTDGQ/jV1dI H4v40k97bXZ8cqD+EsKki2ormcetfVKodn4XZzJSwJn2gaq/BhmMbNqXBETCudVKfQxNbi z+qE/PRBvq8/GODipZh0+HY73MsHKxoCE29f1ex73IRJNG85q8GqyEbsbd/0GBi+0AUYd2 EWNYg/2KFtEtm9KbOQR8zwYHtovHI1dmYuQ/PonjGzOXh1yErJkkNCPQKXhMMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098852; a=rsa-sha256; cv=none; b=ES15Ec+VAuUMiOU5TvYh1Icrq77XeB2/PRPKuiuvw+lOuEYqpHYMCsHCpIrKJiANVA5enZ u1INJ+9QR4+tUUT2KptbMZABHzKjinlZutNkrgc/Bi2EVTwvIGxHUVkf0UNu9z3G4Lk4nm IyJuWgULnoeWRV2lIezbkWsm2jRLlbWw0VXj8sZPXGMFO6+4j2JQg8+iY55hNiVCP8RJTr GwMuv9ID1CtqxQrHy+p3FpWTKG2Y2VyW6Mbb+VDct/uFemkqoftHviB+Y0dJ0sgqzSO7n2 ms3GF0D7s9Qp+hvHU56gMdTbZRe//PM0hFwtJg6L1im2SQDUUOMYdR1nBLaEOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i7SVNbylh8DJcHHB/Df0k7EsgrNCCMxRmPQWeU1n5IE=; b=FlBsQylcgOJk2FiBK2Hxq+5aAGMU6b8BQLLTry2RXuUsnELIedCWXKOe4z5sHJrB07YQNZ gZCqriRZj4JNbX21wf6Amzt0Xxk68C3hL2o0keAhHeB15B4xrLA1ocvQWVCuETJjSvZtf9 kC1x/T+nWeipF5pz9tUcx0HJgFFRtS2MJlJ3BQNcJr+a4XcUjRw57K0kD8xrrDXPEHNrKP GyuDkNCDXkGV9mAHgXsRetqtn73IKCJGu6GUWxPGb505TgAmB6veqHbZv9vrn618dxcb11 VaTJaodfQtYg/9iyJjJlsc71HG3UY48sQzLmv8id48tY+4nmxJrIrRZSAMSopw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Gq85LPsz1CDj; Fri, 22 Mar 2024 09:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9ECZG061487; Fri, 22 Mar 2024 09:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9ECea061484; Fri, 22 Mar 2024 09:14:12 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:14:12 GMT Message-Id: <202403220914.42M9ECea061484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f25f14a9396c - stable/14 - libbe: Fix some markup issues. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f25f14a9396ce1378d1ed77e3f137f0c1177d537 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f25f14a9396ce1378d1ed77e3f137f0c1177d537 commit f25f14a9396ce1378d1ed77e3f137f0c1177d537 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:03 +0000 libbe: Fix some markup issues. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44407 (cherry picked from commit ad99fea9045dd3daaeca3d2dd60fffecd2311826) --- lib/libbe/libbe.3 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index de2c29c65268..644b1d71ccd3 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd March 18, 2024 .Dt LIBBE 3 .Os .Sh NAME @@ -178,14 +178,22 @@ If a BE root is supplied, .Nm will only operate out of that pool and BE root. An error may occur if: -.Bl -column -.It /boot and / are not on the same filesystem and device, -.It libzfs fails to initialize, -.It The system has not been properly booted with a ZFS boot +.Bl -bullet +.It +.Pa /boot +and +.Pa / +are not on the same filesystem and device, +.It +libzfs fails to initialize, +.It +The system has not been properly booted with a ZFS boot environment, -.It Nm +.It +.Nm fails to open the zpool the active boot environment resides on, or -.It Nm +.It +.Nm fails to locate the boot environment that is currently mounted. .El .Pp @@ -226,9 +234,8 @@ function creates a snapshot of .Fa be_name named .Fa snap_name . -A +A value of .Dv NULL -.Fa snap_name may be used, indicating that .Fn be_snaphot should derive the snapshot name from the current date and time. @@ -520,7 +527,7 @@ The function will free the property list. .Sh DIAGNOSTICS Upon error, one of the following values will be returned: -.Bl -dash -offset indent -compact +.Bl -bullet -offset indent -compact .It BE_ERR_SUCCESS .It From nobody Fri Mar 22 09:15:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Gr62Ts4z5G8jl; Fri, 22 Mar 2024 09:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Gr61xfKz4XsY; Fri, 22 Mar 2024 09:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHXV0dLfbJ/DPR/6zZef6I/6dOTLV45DfhChs4DKRZo=; b=cWZOtBBmRZxT5K3sMLbl44j7kY7HbauEbneV7COQtpzdqddhRlSVdTUN0xYNx2m+BwEdlX 0S9CCxJ3NunBWstzOnedZRsjvXnNlw4KEEKXvvmO7WWah6Kt7JRJdozvUu+O4BQJA5CjVY wai63MHY9ctq71wnUuk0831EP+aSGKHx2/cAS7W3DU+t4CIEVn8JLGFCx6tTjfB+YqVIH1 KwNw4ncKq4fP7GCAOINkFxhjckp45aFzZWNZv8zfT9b6QAwWgNFbOS0PVi/0DVMx9eqoO4 3y9Tz7BRPm8zR90YP9/gBgF1tLy5J4+LArIHNhzTPxRSBg4oo5b1Y5Rcmv84Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098902; a=rsa-sha256; cv=none; b=c3oU97NIMb8hCGK92JVGVdUVnZZJb/9U0iOuB6F13uOF2rQgKvmBYj16Znj5nLZPtZ0xmW N9MGUufyJA4P4683gBUBdq9sBXIsAgb52HbX/PtD5Tc0m/19D5KJd+2DMf7KQtGB9Vkr9M Vx6cVFPrVzFnocB7km6UjZ8FrTSeRpzDpyCWcF30Y9jhD/OMurX65AHCDz5k5h8aMVMT5P 9TRb9F6AzpBv8uEFjEQXAgfnWm3enxWAfC2J53GqAmyHFnm5XWV2JXqIxLjIisDLWvhzZ8 gnXSHPjUCRIttGMur/TUc79jiHwWY1gIQU0h3RupbCqFZvQz0zvV/IFrvXBxkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHXV0dLfbJ/DPR/6zZef6I/6dOTLV45DfhChs4DKRZo=; b=MFulN97TRQtlQL/GaxnWUwaM2Z1tq/UWR9VpcdDALn5MwUCYIzkBvok67SXnHU3IoYXPyR 6Piq5+RjhXhOw6YrUQidhdJ8FSEoHdxG4ZPB25WkCCJh5/p74NYM8BVrHB3dvlabO9legz aw1k8U+0i3qi+7HXrJnwGQXZ8IRvTfxK7hsBtziM7nNhTj6fNrp4OqUHUFzIQaFkfJ7rYl EF266TgueHqs4HJMUXorFT43lLndEB0iC6CQB2ytwXS3nEy9vsNnjZHOMEJrzprA01/GR+ PO/y1pMzG2a99UpIYknA4gHhkVkrAW/KsoeK71z4ReSloNHwrnE+dVLQPWPlgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Gr61YBjz1CrR; Fri, 22 Mar 2024 09:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9F2Td061830; Fri, 22 Mar 2024 09:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F2ad061827; Fri, 22 Mar 2024 09:15:02 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:02 GMT Message-Id: <202403220915.42M9F2ad061827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c4de745c330f - stable/13 - bectl: document the -r flag to bectl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c4de745c330f44c94c6b7e56336b266b1af69c17 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c4de745c330f44c94c6b7e56336b266b1af69c17 commit c4de745c330f44c94c6b7e56336b266b1af69c17 Author: Kyle Evans AuthorDate: 2023-04-20 04:55:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: document the -r flag to bectl Independent of all of the commands, bectl itself takes an `-r` flag that specifies the BE root to use. This was originally added to facilitate testing, but it was later discovered to be incredibly useful in other scenarios; e.g., trying to recover some boot environments in rescue media. The "BE root" described here is the parent dataset that holds boot environments, but I've no idea if that's an accepted definition for that dataset. Reviewed by: gallatin, imp, Pau Amma MFC after: 1 week Differential Review: https://reviews.freebsd.org/D39710 (cherry picked from commit 4163bae03051839c739c0133605b4ef494ee8f6a) --- sbin/bectl/bectl.8 | 39 +++++++++++++++++++++++++++++++++++---- sbin/bectl/bectl.c | 30 +++++++++++++++--------------- 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index cb06ad9bcaed..2b2dd02bc8ef 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd March 31, 2022 +.Dd April 26, 2023 .Dt BECTL 8 .Os .Sh NAME @@ -23,54 +23,67 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm +.Op Fl r Ar beroot .Cm activate .Op Fl t | Fl T .Ar beName .Nm +.Op Fl r Ar beroot .Cm check .Nm +.Op Fl r Ar beroot .Cm create .Op Fl r .Op Fl e Brq Ar nonActiveBe | Ar beName Ns Cm @ Ns Ar snapshot .Ar newBeName .Nm +.Op Fl r Ar beroot .Cm create .Op Fl r .Ar beName@snapshot .Nm +.Op Fl r Ar beroot .Cm destroy .Op Fl \&Fo .Ar beName Ns Op Cm @ Ns Ar snapshot .Nm +.Op Fl r Ar beroot .Cm export .Ar sourceBe .Nm +.Op Fl r Ar beroot .Cm import .Ar targetBe .Nm +.Op Fl r Ar beroot .Cm jail .Op Fl bU .Oo Bro Fl o Ar key Ns Cm = Ns Ar value | Fl u Ar key Brc Oc Ns ... .Ar beName .Op Ar utility Op Ar argument ... .Nm +.Op Fl r Ar beroot .Cm list .Op Fl aDHs .Op Fl c Ar property .Op Fl C Ar property .Oo Bro Fl c Ar property | Fl C Ar property Brc Oc .Nm +.Op Fl r Ar beroot .Cm mount .Ar beName .Op Ar mountpoint .Nm +.Op Fl r Ar beroot .Cm rename .Ar origBeName .Ar newBeName .Nm +.Op Fl r Ar beroot .Brq Cm ujail | unjail .Brq Ar jailId | jailName | beName .Nm +.Op Fl r Ar beroot .Brq Cm umount | unmount .Op Fl f .Ar beName @@ -87,6 +100,23 @@ Boot environments allow the system to be upgraded, while preserving the old system environment in a separate ZFS dataset. .Pp +.Nm +itself accepts an +.Fl r +flag specified before the command to indicate the +.Ar beroot +that should be used as the boot environment root, or the dataset whose children +are all boot environments. +Normally this information is derived from the bootfs property of the pool that +is mounted at +.Pa / , +but it is useful when the system has not been booted into a ZFS root or a +different pool should be operated on. +For instance, booting into the recovery media and manually importing a pool from +one of the system's resident disks will require the +.Fl r +flag to work. +.Pp The following commands are supported by .Nm : .Bl -tag -width activate @@ -139,11 +169,13 @@ flag is specified, the new environment will be cloned from the given .Ar nonActiveBe or .Ar beName Ns Cm @ Ns Ar snapshot . -Otherwise, the new environment will be created from the currently booted environment. +Otherwise, the new environment will be created from the currently booted +environment. .Pp If .Nm -is creating from another boot environment, a snapshot of that boot environment will be created to clone from. +is creating from another boot environment, a snapshot of that boot environment +will be created to clone from. .It Xo .Cm create .Op Fl r @@ -274,7 +306,6 @@ is used on next boot once .Pq Em \&T ; or combination of .Pq Em \&NRT . -.Pp .Bl -tag -width indent .It Fl a Display all datasets. diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index a2b300a4bb44..f2ea8b241b14 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -67,23 +67,23 @@ usage(bool explicit) fprintf(fp, "%s", "Usage:\tbectl {-h | -? | subcommand [args...]}\n" #if SOON - "\tbectl add (path)*\n" + "\tbectl [-r beroot] add (path)*\n" #endif - "\tbectl activate [-t] beName\n" - "\tbectl activate [-T]\n" - "\tbectl check\n" - "\tbectl create [-r] [-e {nonActiveBe | beName@snapshot}] beName\n" - "\tbectl create [-r] beName@snapshot\n" - "\tbectl destroy [-Fo] {beName | beName@snapshot}\n" - "\tbectl export sourceBe\n" - "\tbectl import targetBe\n" - "\tbectl jail [-bU] [{-o key=value | -u key}]... beName\n" + "\tbectl [-r beroot] activate [-t] beName\n" + "\tbectl [-r beroot] activate [-T]\n" + "\tbectl [-r beroot] check\n" + "\tbectl [-r beroot] create [-r] [-e {nonActiveBe | beName@snapshot}] beName\n" + "\tbectl [-r beroot] create [-r] beName@snapshot\n" + "\tbectl [-r beroot] destroy [-Fo] {beName | beName@snapshot}\n" + "\tbectl [-r beroot] export sourceBe\n" + "\tbectl [-r beroot] import targetBe\n" + "\tbectl [-r beroot] jail [-bU] [{-o key=value | -u key}]... beName\n" "\t [utility [argument ...]]\n" - "\tbectl list [-aDHs] [{-c property | -C property}]\n" - "\tbectl mount beName [mountpoint]\n" - "\tbectl rename origBeName newBeName\n" - "\tbectl {ujail | unjail} {jailID | jailName | beName}\n" - "\tbectl {umount | unmount} [-f] beName\n"); + "\tbectl [-r beroot] list [-aDHs] [{-c property | -C property}]\n" + "\tbectl [-r beroot] mount beName [mountpoint]\n" + "\tbectl [-r beroot] rename origBeName newBeName\n" + "\tbectl [-r beroot] {ujail | unjail} {jailID | jailName | beName}\n" + "\tbectl [-r beroot] {umount | unmount} [-f] beName\n"); return (explicit ? 0 : EX_USAGE); } From nobody Fri Mar 22 09:15:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Gr73SF6z5G9Cv; Fri, 22 Mar 2024 09:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Gr72x1hz4Xvq; Fri, 22 Mar 2024 09:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5g/3F4m+kyriV31egIqwxFoo+B78Cs9FrInJLNKaTo=; b=x+muIrASmcZU4a18+x6lz+bV14jboQskYoGMYuQivtjJSQZBVjoGjSIPFUyaR8aUYmAfvO AyTFFqACJsQ7t5byhknywmJkmVabqgH/mk0y/kDZWskrweqN82Ed44HK6uPO1XdYovbVP6 6/SZo/HQu4EYuBURJZo40ZkbnkLlUOFdMWLyMPCmrDGOz0RwlHLYf9fvh3bqMhCCHsuKfA Nqj/O6dlCu5uAYcZsj7lxyms+hcbgSYPgWt/Jw2xT1UWL7fS0Ws2wwgUcs1zhZjUIlEJdO 1uJJqzhkQz+LQpmf+VZbaXL8bhp4qXYoleMKoee65pxsTYBtWkZUWfc0I+ghvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098903; a=rsa-sha256; cv=none; b=CooTTImHQd19dmQemvUd6j3GkxVrNGa1KwUlhHgkpucIWOAg5HVJ2fxoIblQVqybVehw8T FBGnwSkWV6ch2OCKbRukq11piFv+K2m4HaQtCP4Ltwn5Oji8HmESjnx2B+5dtpGbky71jI wtI0tAXHkoyAPI7OjeFWIf/pa/l0Cy6Q8ofkItofdx957cNNQnP0WB7ZeOLmd5yrlxXujD rHFZeOarX5STCEyx8QsragYG3abWuRh8JeaMULSKgH73HmTpCGh5qUlC7Zuz0elDeC2fWA 24ctPNOtiaFtJ0a7lI0oeHEkcbLD8GCoM7e6oKLppwXTcw1XuzjGWDlK1GyF5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5g/3F4m+kyriV31egIqwxFoo+B78Cs9FrInJLNKaTo=; b=c4B4nRSTxURWYhCX5GMbTyoxFoy66IXx78EgOO6E2InHu8Kf2NWDd19vlTRGgWtoUbOdjt 7DZ9kugfSfOKI81ZiksMPxXsSHuZWRWFrxJZ/lAD14P18enXO9CO5P9VYo9fAHxIe4WXfe oe+po0k89W/a4DfXQ/NP4ZPVYd+V8947eJsT7H3I+DPDHL+3P7ubXNX5rVoFTvBUNr2i4E clGW1sXcSpWdYdJNAwl4qQqSIM60rLL29kL01otldTA6aWmnVXXwJ1pzow3k5UqzUsQtiP nA1cibsM3YgebREDYKz2YbC9xhxpnUoiVX5j4hzF/P3yPC2qUlmo3kCy1kytHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Gr72XZzz1CrS; Fri, 22 Mar 2024 09:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9F3lK061869; Fri, 22 Mar 2024 09:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F3Hs061866; Fri, 22 Mar 2024 09:15:03 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:03 GMT Message-Id: <202403220915.42M9F3Hs061866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 20d97b6cbd74 - stable/13 - bectl(8): clarifications, expansion List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20d97b6cbd7487eb930190e7a8d2d09f0f38a20e Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=20d97b6cbd7487eb930190e7a8d2d09f0f38a20e commit 20d97b6cbd7487eb930190e7a8d2d09f0f38a20e Author: Graham Perrin AuthorDate: 2023-06-28 02:05:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl(8): clarifications, expansion Reviewed-by: imp Pull-request: https://github.com/freebsd/freebsd-src/pull/728 (cherry picked from commit 6927176113ee775983952edb3c201fed6be318d3) --- sbin/bectl/bectl.8 | 68 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 2b2dd02bc8ef..45c676a7876c 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd April 26, 2023 +.Dd June 28, 2023 .Dt BECTL 8 .Os .Sh NAME @@ -23,6 +23,8 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm +.Op Fl h\&? +.Nm .Op Fl r Ar beroot .Cm activate .Op Fl t | Fl T @@ -87,18 +89,14 @@ .Brq Cm umount | unmount .Op Fl f .Ar beName -.Pp -.Nm -.Op Fl h\&? .Sh DESCRIPTION The .Nm command is used to setup and interact with ZFS boot environments, which are bootable clones of datasets. .Pp -Boot environments -allow the system to be upgraded, while preserving the old system environment in -a separate ZFS dataset. +A boot environment allows the system to be upgraded, while preserving the +pre-upgrade system environment. .Pp .Nm itself accepts an @@ -117,10 +115,13 @@ one of the system's resident disks will require the .Fl r flag to work. .Pp -The following commands are supported by -.Nm : +.Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo +.Fl h | +.Fl \&? +Print usage information. +.It Xo .Cm activate .Op Fl t | Fl T .Ar beName @@ -192,7 +193,7 @@ See .Sx Boot Environment Structures for a discussion on different layouts. .Pp -No new boot environment is created with this command. +No new boot environment is created with this subcommand. .It Xo .Cm destroy .Op Fl \&Fo @@ -319,18 +320,20 @@ arbitrary white space. .It Fl s Display all snapshots as well. .It Fl c Ar property -Sort boot environments by given property name. +Sort boot environments by the given ZFS dataset property. The following properties are supported: .Pp .Bl -tag -width 4n -offset indent -compact -.It name (default output) +.It name (the default) .It creation .It origin .It used -.It usedds -.It usedsnap -.It usedrefreserv +.It usedbydataset +.It usedbyrefreservation +.It usedbysnapshots .El +.Pp +Short forms usedds, usedrefreserv and usedsnap are also supported. .It Fl C Ar property Same as the .Fl c @@ -345,10 +348,28 @@ or .Fl a option is used. .It Cm mount Ar beName Op Ar mountpoint -Temporarily mount the boot environment. -Mount at the specified +Mount the given boot environment. +.Pp +If a nonexistent .Ar mountpoint -if provided. +is given: +.Nm +will make the directory, including intermediate directories as required. +.Pp +If no +.Ar mountpoint +is given: +.Nm +will make a directory such as +.Pa be_mount.c6Sf +in +.Pa /tmp . +Randomness in the last four characters of the directory name will prevent +mount point conflicts. +Unmount of an environment, followed by mount of the same environment +without giving a +.Ar mountpoint , +will result in a different randomly-named mountpoint. .It Cm rename Ar origBeName newBeName Rename the given .Ar origBeName @@ -372,14 +393,10 @@ Unmount the given boot environment, if it is mounted. Specifying .Fl f will force the unmount if busy. +.Pp +Unmount will not remove the mount point. .El .Pp -.Nm -prints usage information if -.Fl h -or -.Fl \&? -is specified. .Ss Boot Environment Structures The traditional .Fx @@ -452,7 +469,7 @@ In this example, is excluded from the boot environment. .Pp .Nm -commands that have their own +subcommands that have their own .Fl r operate on this second, .Dq deep @@ -471,6 +488,7 @@ flags. \" .El .Sh SEE ALSO .Xr libbe 3 , +.Xr zfsprops 7 , .Xr beinstall.sh 8 , .Xr jail 8 , .Xr zfs 8 , From nobody Fri Mar 22 09:15:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Gr85mC1z5G99S; Fri, 22 Mar 2024 09:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Gr8409Qz4Xq7; Fri, 22 Mar 2024 09:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6UxWMGMwwCPdE1KgLSY9PFIHnNY5Rk9hranvbtsaQg=; b=sYYLk8RlEhxB7Gv2JrFvf0/IRd6g9wCVE0C8Bf7PoVaLAM69kvKDGHWFiPQ2i0JuC3mso/ OrV7e3eHUs2msaagpzmYJ7D4qK4MdtBRn+Tl1KNYvHN3fpKg9/hp1dFg3tke0iIMMyIvLK IkvSul9vk13tGvHNSVVGKV7nFc21wyFCgrMpbhaxvKDZGs0m1WCGDh783PvNJLkTO6okQQ Hvq8fj7qHLxj94hAjrmo/XgaR7bY56pzSFQyig5EViqvoWCMAfOPFwTfi46TW5JlS8/+2E I/A74fBzzzSslZcF6MwyP9mTaXLNcFJtchC6/zM9YP+dm8PmMigbKGDT+3mWfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098904; a=rsa-sha256; cv=none; b=KMb8GUQ4XHTQZeVdF3kFkF3Mc18eX2lcUnP0QHJ6dT9k6o40i0SnZd/z+cg7mrCO6F23mu /jMxWcPKfLAL16T9ET+tAUx/YPU7EnaIWk7UY+EGTiVomw0motc671N3Wgh9+gFW7w2FmO rWG/EQz2i2nZNRPZXep3N+t9WOtUG7gwtH6n9Wr8p+ijNybEAEnUx00A2Jl+ix75O2VoC9 y4SuQOQr2krRJOCp44DtzFDsicvmkVWTIELf38WhOdbBQzvZAX8dKoX+DvoQ1cBdf0vUIG F71h9VWjd69ve2oUVv+1VCuA+iNtLG6XQ5iHWGDDfcirfA20PvJeUFgbM4Athg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6UxWMGMwwCPdE1KgLSY9PFIHnNY5Rk9hranvbtsaQg=; b=X0McciGeQf8QDTeJr1Db4p/lVeiejbXqL+jfLXJCc1Kt707QOzB7tpos59j/wFiQGZ3OlN PgIMeSC/sXSugwU/eKXb79jDqAqMb7JQ+kJjr3/XytPGiUaRkjc8HmTZwofmXvL31atTzh b97JB1HYt5xHV0nDuo33s4FbCIV/PMn6gtpebzuncscD0JaD08BfG9MzZbT9NGSWgYjZiJ kJCAmuJhapU72p/B5tJjBOdUclUYp2Pdr/AxEQ6IpSf9DsdOBD6UN0B6DFaUb9zE+ZQ6AZ QzIKt9IlRLghuGS+fG0fmMdrXqhp/jUyKBX3MZohgEDaR/ohyKXPgtGu7e5Pqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Gr83YhDz1CGN; Fri, 22 Mar 2024 09:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9F4vq061923; Fri, 22 Mar 2024 09:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F49F061920; Fri, 22 Mar 2024 09:15:04 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:04 GMT Message-Id: <202403220915.42M9F49F061920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 897a6f8b90c1 - stable/13 - bectl: fix some `mandoc -Tlint` complaints List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 897a6f8b90c1810fc0e13a8e1cf419c00c61c1b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=897a6f8b90c1810fc0e13a8e1cf419c00c61c1b5 commit 897a6f8b90c1810fc0e13a8e1cf419c00c61c1b5 Author: Kyle Evans AuthorDate: 2023-10-05 02:26:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: fix some `mandoc -Tlint` complaints The EXAMPLES mis-comments caused an obnoxious amount of blank space above SEE ALSO when rendered by mandoc to a terminal. The missing termination of .Xo meant the description of -h ran together with the subcommand synopsis. The other changes were generally ignored tags due to context that simply don't need to be there. Provoked by: grahamperrin (cherry picked from commit 9b03a5de73d41f98b9b3c8e250a58f62f3e48d61) --- sbin/bectl/bectl.8 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 45c676a7876c..42561a967bfd 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd June 28, 2023 +.Dd October 5, 2023 .Dt BECTL 8 .Os .Sh NAME @@ -114,12 +114,12 @@ For instance, booting into the recovery media and manually importing a pool from one of the system's resident disks will require the .Fl r flag to work. -.Pp .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo .Fl h | .Fl \&? +.Xc Print usage information. .It Xo .Cm activate @@ -396,7 +396,6 @@ will force the unmount if busy. .Pp Unmount will not remove the mount point. .El -.Pp .Ss Boot Environment Structures The traditional .Fx @@ -481,11 +480,11 @@ A future version of may default to handling both styles and deprecate the various .Fl r flags. -\" .Sh EXAMPLES -\" .Bl -bullet -\" .It -\" To fill in with jail upgrade example when behavior is firm. -\" .El +.\" .Sh EXAMPLES +.\" .Bl -bullet +.\" .It +.\" To fill in with jail upgrade example when behavior is firm. +.\" .El .Sh SEE ALSO .Xr libbe 3 , .Xr zfsprops 7 , From nobody Fri Mar 22 09:15:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1GrB1Xrcz5G90H; Fri, 22 Mar 2024 09:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Gr950vzz4XlJ; Fri, 22 Mar 2024 09:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxsTAmHVlXsVsuvt4Vn3UCuuUl5d+T2WozdkKj9tIgw=; b=UzhnPGSelTJj4Yt8vWIxYigIEStfLDpRurwIjbaC6TVsXAJnvHQPAnxPA79jYh9A1y6xY4 Niq93X0EEWYgiFL6glMuB3rxGJHLn3+N8s3nL2WGgBi018s9LEntYykv1Ua6IhfBsWOdgx oS0SNq1/mTOj82jZ2LMKqI7gEF4KOgMdw0CeHvr1wW3Fjyf0nbbAmZCxDNu71rJYVFX9oJ HJ1wyBVPOJqihX4+2kwNOSCumsm41wgv0zGwWhsOPaCH4PsPl87OlgmJ63Id8tw38XV2MZ vSBqKVjEIt0syzGIWSzBO1xZ+rJUgggg0fiX5jb9hwU7lweN5sLcg3RPUG8DTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098905; a=rsa-sha256; cv=none; b=FvxXNf5j2MPORXD1ddB/A7iDUhXAEPZXbIfqz0mzSo40oHVesBa4yJ6P4RWq7jC0DWknum OKB3lQJycPvzpqt16xk9j4b9mTxEBLjnGrvgWXEpbUTmdpYqeIkFh7Yicx4W3QupzAE6sM yBcyFYVOiMZ1jBOgbb0VxNFj5x6PSZvPj7AaQBEcT9nYIM8cPrethTxAbi7K72sn1wGHiY zPhF+OToirKrLZtLWSInW0N22+vdCXGaf+UG4UorvTDgOYe4oz/ZzD84tOj9WRw7v0WJSS Q5XPRGzRHvKNKK8ag+2o7LPXYvdsskQ9ss3npHwxytNU25nFmoZMp39WjsTEiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxsTAmHVlXsVsuvt4Vn3UCuuUl5d+T2WozdkKj9tIgw=; b=qz56i7s5JC9/vKuDGTlZRBqps4Rwpr73d7nKNvKF3F4BPv3NYR8tRDwQJxLZjyGr7SoPu0 h96v7/S2zbKGQDSyWuNfQLMIyXaEKuOMXtZWJljbFTHh+rpdi1Z9B6aVPhXgC19m9H2aWw BYos9FV223jIaua3f6WGUGea90JI17/jXevL7dJs12VbWxGdYB3rpx/hbhpEtRokSerSUL 9wmy6yOCiYlV9blE+PW0BAm87ev8m8l4OkidyyEDaqeZMhqAsSlD23Ol01ZWgshK074CRA SFBnwsVaOywjFMwRqM7q+7qxRVlUEYXxxk3PIoX6+GZbDIRJ6oBigQJwOzVJJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Gr94bv7z1C00; Fri, 22 Mar 2024 09:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9F5aP061978; Fri, 22 Mar 2024 09:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F5f9061976; Fri, 22 Mar 2024 09:15:05 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:05 GMT Message-Id: <202403220915.42M9F5f9061976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 95d66df41b83 - stable/13 - bectl: Use geopt() and drop mention of -?. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95d66df41b832724a6a5e58f4a07cc89639cb660 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=95d66df41b832724a6a5e58f4a07cc89639cb660 commit 95d66df41b832724a6a5e58f4a07cc89639cb660 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: Use geopt() and drop mention of -?. MFC after: 3 days PR: 272260 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44405 (cherry picked from commit e819534f15308c92afd19166254604995766ce32) --- sbin/bectl/bectl.8 | 11 ++++------- sbin/bectl/bectl.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 42561a967bfd..e0e2827fb34f 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -13,9 +13,7 @@ .\" documentation and/or other materials provided with the distribution. .\" .\" -.\" @(#)be.1 -.\" -.Dd October 5, 2023 +.Dd March 18, 2024 .Dt BECTL 8 .Os .Sh NAME @@ -23,7 +21,7 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm -.Op Fl h\&? +.Op Fl h .Nm .Op Fl r Ar beroot .Cm activate @@ -117,10 +115,9 @@ flag to work. .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo -.Fl h | -.Fl \&? +.Fl h .Xc -Print usage information. +Print usage information and exit. .It Xo .Cm activate .Op Fl t | Fl T diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index f2ea8b241b14..89d107431661 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -65,7 +65,7 @@ usage(bool explicit) fp = explicit ? stdout : stderr; fprintf(fp, "%s", - "Usage:\tbectl {-h | -? | subcommand [args...]}\n" + "Usage:\tbectl {-h | subcommand [args...]}\n" #if SOON "\tbectl [-r beroot] add (path)*\n" #endif @@ -545,27 +545,31 @@ main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root; - int rc; + char *root = NULL; + int opt, rc; - cmd = NULL; - root = NULL; - if (argc < 2) - return (usage(false)); - - if (strcmp(argv[1], "-r") == 0) { - if (argc < 4) - return (usage(false)); - root = strdup(argv[2]); - command = argv[3]; - argc -= 3; - argv += 3; - } else { - command = argv[1]; - argc -= 1; - argv += 1; + while ((opt = getopt(argc, argv, "hr:")) != -1) { + switch (opt) { + case 'h': + exit(usage(true)); + case 'r': + root = strdup(optarg); + break; + default: + exit(usage(false)); + } } + argc -= optind; + argv += optind; + + if (argc == 0) + exit(usage(false)); + + command = *argv; + optreset = 1; + optind = 1; + /* Handle command aliases */ if (strcmp(command, "umount") == 0) command = "unmount"; @@ -573,9 +577,6 @@ main(int argc, char *argv[]) if (strcmp(command, "ujail") == 0) command = "unjail"; - if ((strcmp(command, "-?") == 0) || (strcmp(command, "-h") == 0)) - return (usage(true)); - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:15:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1GrC0WLdz5G90J; Fri, 22 Mar 2024 09:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1GrB639Kz4Y0Y; Fri, 22 Mar 2024 09:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q1UGLy24Xq//AH13ojO75s+fvc8Y9ooORe0ULR/4FnM=; b=floSzNd/kAqR92MEdi7QewNPsKKlYaBqnb1bH5sN1VYJjnLhEGempKLVOl4DJ5C6WlauvR jRQ03WxYbuDyTQhiJ2ahnuOfI79PRdJX0hsqkkxcs8hIPmy6epVmp6REoYfs1nJl5NQUaT f+c9L9J0+ddjoBYGNMzySj1/1l5KTt4iG4kiAu7m85DwwkEA96Z/oM6xTP7PBcz437lRb/ vMhl04p6Mri64VDStJWuEVZHoX5vxGdYaivhDtaIrXpfkvNxjyleVe09DpBL25Zl/jff+r eShHVqSiFOZkshxXxDTbFclbllcDdCWovGrwZK8rYR59VgP8ICMm4/jYxAnfgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098906; a=rsa-sha256; cv=none; b=YoDOAb1mc9gRM8WoTy4eA9sWodnhhYh5imjg3AEdfCNDBj7RVUfp00p+BcZvfn3jqANrVo kmLnhd8SAWvW0F6yAIGDLq6XWps0DRSfNXZb37nAe3WU0aJJnBPDcdDcCEj7fyArHR/wLS PjUsGps3jBaoCpp5ZaukeRhWYB/SNpjsLUgj0tAHQT72cpoLC72YyR+bCdf4m2v8iM48w+ nQyRVOQnlDxx6XWxxP3iB2RelliN+ZNYOoG9sDtfyYDMhg5XrzEIGQYxlOqo/xI0IB7nep lqiAL4lw2r/1t5DB3tqsy5Y+XOoKUeINNA5/ENX33eDkPJQjExZKtif5t6RRyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q1UGLy24Xq//AH13ojO75s+fvc8Y9ooORe0ULR/4FnM=; b=DCWpwqO8n/Udq6P3vRgF7+KzPCdNHAgAR5r+MeiX9RMaYNfbknBtKwNdazvqwVnG7wR6or DhYe+PO4FPHbiOhYC/o0CuE1Tf4oE/zXsAmNWxttVud/UHyI2WCZeTYCBOjDqV5F+OXGJ5 KfeDX/jaDpIrXCMFW/mIiUGO6LG1v4B1Mg6RjwULaJ8vnZMg7ceYJ2GA/h5Z3H7vxxnusd KugSZecrDhoi4+VTuuVTUbON3yz/IBKWbiAWEwKps1zQl+6FEmVTItcR3efmxm8OkLZGtS XSaFnfCISGVT8krJy3NX2qzsAy16OxBdMN7h2gaoCrM6FNMHvhl5ilPPd2Rp1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1GrB5c3Bz1CGP; Fri, 22 Mar 2024 09:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9F6jw062020; Fri, 22 Mar 2024 09:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F6x9062017; Fri, 22 Mar 2024 09:15:06 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:06 GMT Message-Id: <202403220915.42M9F6x9062017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 36afe5ef45bf - stable/13 - bectl: Simplify command aliases. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36afe5ef45bf6fd588e07471cc72f9a74490683f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=36afe5ef45bf6fd588e07471cc72f9a74490683f commit 36afe5ef45bf6fd588e07471cc72f9a74490683f Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: Simplify command aliases. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44406 (cherry picked from commit a46217ce7d161ce563374899df4d94b6d000138f) --- sbin/bectl/bectl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 89d107431661..4a2d62348cbe 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -115,7 +115,9 @@ static struct command_map_entry command_map[] = { "mount", bectl_cmd_mount, false }, { "rename", bectl_cmd_rename, false }, { "unjail", bectl_cmd_unjail, false }, + { "ujail", bectl_cmd_unjail, false }, { "unmount", bectl_cmd_unmount, false }, + { "umount", bectl_cmd_unmount, false }, { "check", bectl_cmd_check, true }, }; @@ -570,13 +572,6 @@ main(int argc, char *argv[]) optreset = 1; optind = 1; - /* Handle command aliases */ - if (strcmp(command, "umount") == 0) - command = "unmount"; - - if (strcmp(command, "ujail") == 0) - command = "unjail"; - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:15:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1GrD1RNdz5G8tY; Fri, 22 Mar 2024 09:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1GrC6mPTz4Xtb; Fri, 22 Mar 2024 09:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fd3d2O2zcZ9pb65cJLUsi6Jq55erUg2eFoQPurY/0G8=; b=Fu8mSG99a5snHuy391VbBCFMPQFrDCGPRdnkpWQNUt3PBrX5pV4Ke3RDwLjlCvzbxRxwSd 0bqkQT76v0+0T4pPlriv5WLTwd84gTOAF5VQtBPKCPtdNUxihRxoBCyle0/IdjMwXrQPOt 8bqM0wAgGwJt9JL9U+/OB7IM9oeKlyGaNxAJ/bzk8FwMtyvq5t9neqKH08SwA/9Pm2NePD /VxD3vN6wO8FOWnB7tDtPCzE7iL62gBmkfDwBX1d3R023iKgW9wfviV3Os2ZFMXeoEzELA P3gpVpttek06whCjv3YwLvXe8tnCIW3yoQZeYkvMlk9W27qThF4pOyVH65a18A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098907; a=rsa-sha256; cv=none; b=BHHpOlAxoNDD5lUKYzCOi1Om+kwOxSY6A7sCCI915FCmiykuL2pmCtlG9AiYGXdMpzR9XO 9OP04ug6GY+ALM/1g/u3dD7CodwuP/ZUMXpC1DaD59818gDprX7rHdLFgZK6EAqKOmfpci 1iMna9sOP+p4goNudcgop2X72DPkrWxEq6l26efJaMnjTQVujzJ6jjMKNtQUodouy53c7L 6PsR+maTmNdWW3X23GU0kscRKswn9xX07Km8oOl2B3uCqrjjYPE5z6VD2Rg1SraAm7O3ig WlRNa7LQM5KMmNK8Wd4MwIvgzdnIcijr0msrQzdW2E5R0/x8zg4GF+oaHK7New== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fd3d2O2zcZ9pb65cJLUsi6Jq55erUg2eFoQPurY/0G8=; b=dT8Fsg/XuZHQECPcVpvw6DR4AD3N6J0ArZpMQEn9pkopbphRsfUSLeM62un3bqNvsgN6HA /4alQ0Z7D9AbpHC/AM7C803hxne34Z9tq/1Y4tmZw2taLqR5jIvpwdS2GfKO/R1Gd0Y5Dy Q+4NoQz9YACITA3HDT9aQxb28yh58jmVST81oWUC6ie0WgxdgrTjDJWUDRN4ne8tJxmlWD ZcPKBcOm11bW01eyG/GbpS3d/oeLHdtg55aTOkwvaALWmaCkNAwQeMbEN/kUYk2FG0VcEX XDutkrrFvTmF7H1bNUfocPNCrzQNGQaxP9E50QpDru75O+ioO8cvDqZsCV7BWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1GrC6N9Wz1Ch9; Fri, 22 Mar 2024 09:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M9F7xM062065; Fri, 22 Mar 2024 09:15:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F7CS062062; Fri, 22 Mar 2024 09:15:07 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:07 GMT Message-Id: <202403220915.42M9F7CS062062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fb12765e7052 - stable/13 - libbe: Fix some markup issues. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fb12765e70528666cc20151888a7274e411ce35c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb12765e70528666cc20151888a7274e411ce35c commit fb12765e70528666cc20151888a7274e411ce35c Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:35 +0000 libbe: Fix some markup issues. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44407 (cherry picked from commit ad99fea9045dd3daaeca3d2dd60fffecd2311826) --- lib/libbe/libbe.3 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index de2c29c65268..644b1d71ccd3 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd March 18, 2024 .Dt LIBBE 3 .Os .Sh NAME @@ -178,14 +178,22 @@ If a BE root is supplied, .Nm will only operate out of that pool and BE root. An error may occur if: -.Bl -column -.It /boot and / are not on the same filesystem and device, -.It libzfs fails to initialize, -.It The system has not been properly booted with a ZFS boot +.Bl -bullet +.It +.Pa /boot +and +.Pa / +are not on the same filesystem and device, +.It +libzfs fails to initialize, +.It +The system has not been properly booted with a ZFS boot environment, -.It Nm +.It +.Nm fails to open the zpool the active boot environment resides on, or -.It Nm +.It +.Nm fails to locate the boot environment that is currently mounted. .El .Pp @@ -226,9 +234,8 @@ function creates a snapshot of .Fa be_name named .Fa snap_name . -A +A value of .Dv NULL -.Fa snap_name may be used, indicating that .Fn be_snaphot should derive the snapshot name from the current date and time. @@ -520,7 +527,7 @@ The function will free the property list. .Sh DIAGNOSTICS Upon error, one of the following values will be returned: -.Bl -dash -offset indent -compact +.Bl -bullet -offset indent -compact .It BE_ERR_SUCCESS .It From nobody Fri Mar 22 13:11:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1N516mbWz5Dtmg; Fri, 22 Mar 2024 13:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1N516GDgz42ZN; Fri, 22 Mar 2024 13:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711113093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mA7ZqIqfkAXckwDLnvfZhUUBi41ypu47cNQHJP0kayg=; b=CbiKFjebHhc6jfN3C6W9XhO6/OD0V9L+0dbt0sZAzskAAGfJNDfKxsre/YcKUx9++mGtaE kG8qt+PhEig+UiEqVtz8wP82XLuD7rMIaDgVgtUxUlODf9SzKrcB7+AicAzEHslnGnuubE Dn2OwuzRpvgCUgjjMNWLGGY9TI4nbotnnp2VgnFwes0MlNHZQc8G8XqmXmKNd1Mv5/4Kgn xuspL+ypH9ksAw2LJRhebmPkpSFJfxq+lFKdsmysF9sc3jDu4BSh8eVtzgk/YzXYHj8knS RnwyuWF2tnLYV8gR1fO/6298s94xL4tQTzqf3P3cOh/KCzm5IBP0wvqiyujJ0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711113093; a=rsa-sha256; cv=none; b=Tj0XhpCom06Y2arOtI05vziB61o5HJcKXTNy4YArmotwhIoN6lG/RcZxqEU7hDMONnvszy fOiqOXod+ckBdGqyt4YRtDPSS7HjCrMvHMB03gdkSP9hbHbG0k5aVsnpCwT93dMxdCTnC3 kFJvTODPe6bIcxGZ5HB4YE3YLw3pZ1x3Es5Y2iIYh5uzeqMABBjnQ0nYs0ORhzMmvF8iFM SzllB4S3km7IY/Zi4MHV7VCXmqnBNd943kqGRQn7rMDiI4py5vqnKcTASf7I68gNZQNpaf KDNVj6WCNnoD82S8hDs+P7sSu9Xv2vcG3x4MkCKMI2xoKtOg/26vWftUFVF99w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711113093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mA7ZqIqfkAXckwDLnvfZhUUBi41ypu47cNQHJP0kayg=; b=FvcXxhm18/wDC33OQsvBaHRp4Ie0+X0ZKO3M+iAGqEZi8K7GAuHJYGbOxocsCHgu2PUhMT yRAuZ17F8Q8BC2izAX/NHfILjNUBNqzKUvnrvDu3m+ldzkvF+0p1/elKoNcp2ADpPJsJNK uPcDo6keqJPah5gh1exB9p2m5OvYi07Mo24PoVjplXXunUEYxEHNEhgO0LxQ4zV7rBTMFQ Yeoc1ovfHptICGvjAi1/UOKkK9/M+Y/giHURPnpEtgPaR8FLPPrVXonbbA7jCclVGkbnV7 T45lxApCZ8zzx2Tm1eDdojLEiM3b2d886IAvWbeAUysiKUxDe4S7Xent1GN+Ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1N515s6kz1KVS; Fri, 22 Mar 2024 13:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDBXJt064226; Fri, 22 Mar 2024 13:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDBX7J064223; Fri, 22 Mar 2024 13:11:33 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:11:33 GMT Message-Id: <202403221311.42MDBX7J064223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 67e6b8354a7b - stable/14 - CONTRIBUTING.md: add author identity info List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67e6b8354a7baa4604b75377b7e765cef3c9c6c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=67e6b8354a7baa4604b75377b7e765cef3c9c6c4 commit 67e6b8354a7baa4604b75377b7e765cef3c9c6c4 Author: Ed Maste AuthorDate: 2023-09-19 14:12:03 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:11:15 +0000 CONTRIBUTING.md: add author identity info We do not want @users.noreply.github.com addresses. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41918 (cherry picked from commit febba4622b605bfda0f44ae3c943ccdaa914cdeb) --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 90c2a4bfab39..62a11d8498c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,6 +75,13 @@ submission does not meet the limited scope for pull requests accepted here. Sometimes it is easier to review a GitHub pull request than to do the review in Phabricator, so that's also allowed. +### Author Name and Email + +We require that contributions are associated with a unique identity. +The author email address should not be `@users.noreply.github.com`. +Do note that your name and email address will become a permanent and immutable +part of the public Git history of the FreeBSD source tree. + ## Style Avoid adding trailing newlines and whitespace. These slow down the integration From nobody Fri Mar 22 13:32:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY53ZQZz5Dx0C; Fri, 22 Mar 2024 13:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY50tt1z441F; Fri, 22 Mar 2024 13:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYJYLoQAAVqFH1C/9D/Px8437wZkyA0JHCbav1yEvA8=; b=I2eJb7j6uWRu4k4i1KXxWxYLPaAJHkfGKpDq83LMKYEgAa3QLgZ1SQS9HtmEFWSjEvl4OM 6DbWjzV6ctIn1a4u31wrbOuRWvtTEL2ZSyYgnzCvL45QofWuj+1sXuNCDoOt4gWMEv2Q/8 oR6AT5Z0b/gqV3v6+wbyP3dlBuMOUNx+FSS/FYEvQdagU75F+cZYz8T/5mP6GsR3qVl5O3 hXMHSorKM1ceuRHvwbbjEmH6rqgq20mMwT37MIo1ma6vlz9C0dLEMeRnOXz0U59nZPdCDk lUSFP5uKqir8hgm+FIts2R4cgPDyq3aOAiiL6ONDAlbGzNw4+G+fZ6vaRSkA/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114345; a=rsa-sha256; cv=none; b=aujyUKOTvo7HqooRWtd/rirSit2TOT+tiFu5zHLft5d/fdQLOqT8XW5acKW5aZyzozq4Av Gvt7pTvr83FUyOpxIr0I93RG5dSaSVRoZzaHhTbY4eB7kvKOg2MjwLTMrGUdSGUEXoeEo3 97EwfIIcX2AEh27Ur5Wqng6zGr4fYYaiuCSDw4NNEGOkPdps73JUlSxFZrTY7lv7osoGLe bDosFR91O2UcpphG1VB4Aa6jTu0fGMiQ6LGkajzTfzpoijJO40OTDvzqsGuqUETu6XIeG1 y0GJTduwL7yUsmHts4tCgzN7SWrL8HtGr/EFk6UwBICA6c8oHBQ3HXaChLYs7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYJYLoQAAVqFH1C/9D/Px8437wZkyA0JHCbav1yEvA8=; b=YPpwnPSWTeB9uY8TgGyC2o7uiYQigx1rSJWvMO+d1NOHm7MDwDPs5+kGmrHBkKOZ/Ulih/ vAqZIhJG4ptVpFPJDHH1kXaLmY1PS8Ch6SNoImWXdd3RVevm/MkkVvfj1VOpVIp7oR17qK mqeNDIaJu4EGjqbD0CVF9vHWqTnLe7ciiofBW5F7Qf1/frgBf0R0L+4Cp2bNIFtTC+7nxU wEtbIlX/JR/3HDamv/XTeN7WSf9H6rwyqx3cJ/ca1p2VKHsiJGkYoGMKmPmVzFkORgIxhw ZLPZIJwN6UGCRfKyl/o0IT+UX+buAwP0GE3JiJInwYG554Mqgxd8o/JOqGgSEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY50VTKz1LTN; Fri, 22 Mar 2024 13:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWO7D002307; Fri, 22 Mar 2024 13:32:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWOVK002304; Fri, 22 Mar 2024 13:32:24 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:24 GMT Message-Id: <202403221332.42MDWOVK002304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ed70dd5bf560 - stable/14 - iwm.4: add iwlwifi cross-reference List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ed70dd5bf5604f3e70a5d0823f27903246e5f791 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ed70dd5bf5604f3e70a5d0823f27903246e5f791 commit ed70dd5bf5604f3e70a5d0823f27903246e5f791 Author: Ed Maste AuthorDate: 2024-02-20 16:43:00 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 iwm.4: add iwlwifi cross-reference iwlwifi(4) supports a superset of the devices supported by iwm(4). The latter may be retired in the future (if there is no reason to prefer it for the set of devices supported by both). Sponsored by: The FreeBSD Foundation (cherry picked from commit 9dd5023e955dac6bf1d4372d1b611a85f8b6f508) --- share/man/man4/iwm.4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4 index f0ad81b4f696..b810f7016e54 100644 --- a/share/man/man4/iwm.4 +++ b/share/man/man4/iwm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 4, 2023 +.Dd February 20, 2024 .Dt IWM 4 .Os .Sh NAME @@ -167,6 +167,7 @@ failed. This should not happen. .El .Sh SEE ALSO +.Xr iwlwifi 4 , .Xr iwmfw 4 , .Xr pci 4 , .Xr wlan 4 , From nobody Fri Mar 22 13:32:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY41fgcz5DwXx; Fri, 22 Mar 2024 13:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY3713xz43kr; Fri, 22 Mar 2024 13:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10PlZsPNngrnnXuBvrsgeC48eE51WqWpo8/yGH3ieCg=; b=NZKe74rga5SHz3jYcuBJ1ITIJ/R0YVUAF+NyK4aWoPuYfY/1M9MM5Q6P+9nPbWBnMTVy2f gGttVpkL88esa6O8DCPMRiFG4Bxv9WnVu1IVrE6C4warOTPdvS02PT3fAXP/TOYMT16bY0 qK+iojNmPw/mI03XcfvlPG1ElkpOGKJFBN/1S7Cn/DDlbLZ+bs7+4/nz1kN8229z+AycLf sRlh7RL1uS1pMXbjF6ItEZ5saKOc9+o7//FqyL9WWzzPy1zqWMKY/kZC7RzHuIKf9p0Ekp psn6YtH0eF2lkhJUkgkz1P/s1svM4wRMzWh1soHbYGljZvKKQ0NQg2uYhFHLzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114344; a=rsa-sha256; cv=none; b=lRmliKHW0MN+XsEfBEBb3yfKwAwzy45vRNpsJz6PDTumJaWUss477+FNnFqcJnM8UUqgsJ PRYoM3qJc885CaC11JPSe25sS4opDB2lEHFTLvzoReH436IrxYv2CLwfJ4YLpJ0MQWk4RT h09EGByYMwM45Kzq4aD7I1EJuLKbjVbC94LP9PVkdBpdxLkdoLcdSMMwSjr0GBp+ludVLJ 7jj5b0xSkcL9/z3BMJm03d25LvpmHtNfBRA6gTCAJeaVXLbQUwweOBBW2o7CIIynV5WP6R yZm2Wondq9u9vgaxX4SOcjUaGAz7k/AmwUxKLN41LyT1wiy4wpT0ATTpR91PbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10PlZsPNngrnnXuBvrsgeC48eE51WqWpo8/yGH3ieCg=; b=mWzHj1MwAEPtQCNB4baqeUk0Qw0lMzlHckDNmLvUb3D6gfQveHxoKp6mJ1FsAsGvEAXSYM cMeypQCI0H+eWvKEsJRZjsU6HZkgzW2Wj5V3yybIbb7YIsuFixJlGOqsaNoYVMF7nKPfsx ufq9Ll8rczjBG0JHzOVxQ0Ouz3Sr2TGfqRp2W9KHiwqWr39/DqhUMUOrVTy5zQ0cw+/l+B dwuO8I0wFlFrjCJNdEZd+q3aTSQlezyUQ2CdkyZ+UEJE/MxG9d019b/tROSeA0seHXtE92 N/PGw9PvVcnE/trTSLY0MeyNlJRB3uinUkT+0RkWSDxjdl7nxKHFyx0FoSDN2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY36dGgz1Kxc; Fri, 22 Mar 2024 13:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWNJr002261; Fri, 22 Mar 2024 13:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWNed002258; Fri, 22 Mar 2024 13:32:23 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:23 GMT Message-Id: <202403221332.42MDWNed002258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1bc20e8af16c - stable/14 - mount: document atime option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1bc20e8af16c104b80903d6750e1ec5cfddae310 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc20e8af16c104b80903d6750e1ec5cfddae310 commit 1bc20e8af16c104b80903d6750e1ec5cfddae310 Author: Ed Maste AuthorDate: 2024-01-24 16:26:23 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:30 +0000 mount: document atime option atime is enabled by default, but may be specified explicitly so that any future change in the default would not have an effect on a given mount. Reviewed by: olce, rgrimes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43580 (cherry picked from commit 54d31cfb278982ff8c2af97a13e40b1a3ebd838e) --- sbin/mount/mount.8 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 91e697bdc3b8..680f28766af8 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -25,9 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" -.Dd October 4, 2023 +.Dd January 24, 2024 .Dt MOUNT 8 .Os .Sh NAME @@ -157,6 +155,9 @@ For this reason, the .Cm async flag should be used sparingly, and only when some data recovery mechanism is present. +.It Cm atime +Update the file access time when reading from a file. +This is the default. .It Cm automounted This flag indicates that the file system was mounted by .Xr automountd 8 . From nobody Fri Mar 22 13:32:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY16NRMz5DwbQ; Fri, 22 Mar 2024 13:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY14mVjz43gy; Fri, 22 Mar 2024 13:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDSOPS73Kz9FmtfbC8t4gPsQJZAtHGD9snjLYmAaUP4=; b=VOr2CYzDIwdMWPuKSziAYzgcilB0kuZjF9/HkKavJglSLIf6luIIAhfw0ord2HCPfZsZ+P /yS3TKSKmRtxoSwFil51XpbIkWPivJCYoBLzhnJAFXNjEVqSxj/vW3c0oLHdjmb7ME/M0T rIf5zZPz1YPsssHKDMiP27qO7ZHRg0BlSifJHJ2c9311kw/8S/EY3AIZFjPqnroXe8931G y/qUIdNkR6qaKAApkf5ISqChEFIQ+LEpgbRAoPWu4iLqwjs77SKfJ+QnyN4UV682azy8mD ZdPa5kHLtjH/O8Ii3iyKfR43f3R7G3boYo0MwCwbm6Rf5GZYMZ7lqGJi5N26YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114341; a=rsa-sha256; cv=none; b=d/ncKz3LLdO9OTsVU7z7EKmIssTHIqFXk41cqaLWFlvDaHYx7Wc7cIetkWwS+PU0FSFok1 r/08rfJcziL4efm9OEbBf81kj/EvYgDhq0eAX1IvcO5OZnFGg2HncXjKkc87LW0Ci14GXd R1MYwVpJ5VvrMt6ybzpgEY8WnDSA5nl8p+WIxq2NyyLHGrmUqDjR/X+W2nfLc23v/aMTWM 85rufRbOI0tWr9aKotef1l/mX6RTSEkE16c+i0FAyI6Bj9DvneiAjTPAVkTxgpJNPGvKYH Y2WZHQxcJnnMtdhqcyz0a9PLO4EdLTYgnyAH63bTVxug2S29XC0Boo9lT4iSZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDSOPS73Kz9FmtfbC8t4gPsQJZAtHGD9snjLYmAaUP4=; b=iAJwywzDMd4L5MR0GTuXSs99lkUeB/8+1sMco9tCZCNs87vLo3ROWOm9vWvhChW90zkiKd kQaPt4OiPLAFJxWnok8HonkXl4jqBH+JqyyqL5AE0IQEC//7DFJWYIEmzrR8HM+HiyXO19 K8gOVn0+rH0wdKGFDxgDjQPxbY2skcbPh/64jdqRDpT11rO2+Lbj40zh7rmvQMkNKrverC 9yC8i+A1pWWRixEjb96HtY9SlrTUWxeFTkgJJv8gDf6taG5EIOK+IRuaGe3gfAtX9Ol5Zn uHsPgk9xl1bcJJCucDX/XNpe5I9Lc57u+2XhB6K9lAueY5gjeO0MCyql3pp4Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY14MwZz1Klk; Fri, 22 Mar 2024 13:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWLbL002170; Fri, 22 Mar 2024 13:32:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWLT6002167; Fri, 22 Mar 2024 13:32:21 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:21 GMT Message-Id: <202403221332.42MDWLT6002167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0416bffd5183 - stable/14 - CONTRIBUTING.md: fix typo from commmit to commit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0416bffd5183372a42feecee54d87d100210803e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0416bffd5183372a42feecee54d87d100210803e commit 0416bffd5183372a42feecee54d87d100210803e Author: rilysh AuthorDate: 2023-12-28 07:34:32 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:30 +0000 CONTRIBUTING.md: fix typo from commmit to commit Signed-off-by: rilysh Pull-request: https://github.com/freebsd/freebsd-src/pull/960 (cherry picked from commit 5f71f9636efa25f6de1a832202bae7c78ad013aa) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 62a11d8498c3..b59deb68bd17 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ A pull request will be considered if: * The commits follow FreeBSD's style guide. See [Style](#Style). * Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors * The commits do not introduce trailing white space. -* If the commmit fixes a bug, please add 'PR: \' to the commit message. +* If the commit fixes a bug, please add 'PR: \' to the commit message. * If there's a code review in Phabricator, please include a link as a 'Differential Revision: ' line. When updating your pull request, please rebase with a forced push rather than a From nobody Fri Mar 22 13:32:22 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY341GNz5Dwn4; Fri, 22 Mar 2024 13:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY263cmz43km; Fri, 22 Mar 2024 13:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAVtAYgNEn0oM/Ul3F24oXDubp8lyPtF/aS0fla+RiY=; b=DsOfQwF67Jh+Jd9oTcWTEAsgMJ2qyRc37zp1j8tr8Cv+kCpDibUzQvFHXGw6xlbvAVzGyq dpMgvE6mFNErvb86/+ZpNEI8pms9KkE52gHMJAI3gtxKKjVma06qyv+PPd0k753QDmCtTZ XKM0RJ6LozDOSzwgMwdVzBgD9ustnI6Z90ErsAnBlmvNu8ItFgLnNePRfQn9iAGjgIUhu4 tOeAovyfJAE0t0t09Z3bESKP9O+nYTcTuRhCAnEE+y8e6HRpwQIgIxctzqdRkUMVzqWlpy 0Tt4x+JEwGh9c/8XMZNLRaQpJOKzf55S1WbjfPO9XGJMsjmMNmV2beHqU9JxgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114342; a=rsa-sha256; cv=none; b=L1Wgg5OiYJ+z53q5Qt7dmJhDloEw18/V3FsxpyZw8DC9ogeL1BP96hGHyJKYhz4JqQVXVg kd7K55UTzqWKPzo3pzrtNaQzVS+YSsJt6dKhBXebU1rAvNAB5Yccu3vGDMLBTMMFl8/Jc5 k7tPSPwaSAlfp8SKy6qdhsR0i2XLsnjnLJvgduPb3gaoAd08SSm5GfGjxFcWSALT/39Hff cYNB87XNAUq1j14rCGHBV5/cI5hbtfEec5jSvlh5f07upGd2pF6AnB25rImH8/IXzocKsf Z2QrKsJ7hnPy7wBULZeCFJoUwtWTGS/Nob884r7khYUUZFW1RCWwRyMq5hNgLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAVtAYgNEn0oM/Ul3F24oXDubp8lyPtF/aS0fla+RiY=; b=WmHGVZgIoEi+vAMBSrofrYs7O3HzU4RgZ+g+MQFkyRexWa5bMM3IEt0EXhEOgkEJRnIs+M SpQ+tlRIiqp8VcL+q/5JEc2J553QLHh+240Tz2OzmPcujEuBAYV3oCLyxX9/BtpWEU6hno bfZxGeBzMwoWf32bd2eIXCTmABKMDUY00l/utz/PvPG1XzmUPgZ7ZBmjvSNVKR8T1SIbmW vslYSXtMgkqU+Uv0pZuCYZIbVnw7pvi+y7T5BhADYfFiu4c68T7bKkTKbBIAPdK/yJ+gKU J3Llu/FY+UME1oDPMy0d1BS+qKlljRQe1602i/Tl/m55HDNd3DHn/ZWF3m5k9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY25gvZz1KxZ; Fri, 22 Mar 2024 13:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWMjF002222; Fri, 22 Mar 2024 13:32:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWMIA002219; Fri, 22 Mar 2024 13:32:22 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:22 GMT Message-Id: <202403221332.42MDWMIA002219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c3c75c142c0c - stable/14 - open: make non-POSIX errno value more apparent List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3c75c142c0cb9fe9bf166e3416195bc59ad0e12 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3c75c142c0cb9fe9bf166e3416195bc59ad0e12 commit c3c75c142c0cb9fe9bf166e3416195bc59ad0e12 Author: Ed Maste AuthorDate: 2024-01-26 15:19:04 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:30 +0000 open: make non-POSIX errno value more apparent In the errno list, add an explicit note and reference to the note in the STANDARDS section. When O_NOFOLLOW is specified and the target is a symbolic link FreeBSD sets errno to a value different than that specified by POSIX. Commit 295159dfa3ed added a note to this effect, but I missed it when reading through the list of errno values. PR: 214633 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43618 (cherry picked from commit ea6a6b63e1fd304e790c8ed7627caf5e3ba52bc7) --- lib/libc/sys/open.2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2 index 67a059db10da..383dd58b2a31 100644 --- a/lib/libc/sys/open.2 +++ b/lib/libc/sys/open.2 @@ -487,6 +487,10 @@ The system file table is full. .It Bq Er EMLINK .Dv O_NOFOLLOW was specified and the target is a symbolic link. +.Tn POSIX +specifies a different error for this case; see the note in +.Sx STANDARDS +below. .It Bq Er ENXIO The named file is a character special or block special file, and the device associated with this special file @@ -649,6 +653,7 @@ is set, and the process is in capability mode. .Sh STANDARDS These functions are specified by .St -p1003.1-2008 . +.Pp .Fx sets .Va errno From nobody Fri Mar 22 13:32:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY63gw7z5Dx0D; Fri, 22 Mar 2024 13:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY61bRQz443c; Fri, 22 Mar 2024 13:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FbVRY+RhlWhBETd3TXbXen+hW969AW4MCO1kWumtVuI=; b=VKOw7KfkxW2ShSi6AxNiKAEd4nITYj0X3D2OWJwA0lCWgadp3Hh9LIPhEGw7RkI9a0b1Z/ 0JC6Ia4lsnvy9mdOFnslnliyE3o/ewVenZQqFin5Ucq7mXkvvH+aPkTy42Ndw1wiHUgjYM tBi8hJU2Zfy0HyYHRzZplc3eWDu2y2JJvugV5CNTaiuNcDEmFf6LwM5qloPQ99mS4Ke8aU bsa25cK6fxA67LUxKrC7JZUVWLrgXEoQrcKBPfdRsAB5h/JQy08X/rfAPRIXnusu+U+CWE yiFQvWlP1maH75l2UQyIIbam9q7UQIKRNy8IPlcbN+OHLQCrD4NpCkypuJMUVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114346; a=rsa-sha256; cv=none; b=ZiBBiEky3nnJj5mEn4xDAAW2QppGUbUHNli3BSKcbC7+64QVtbWcmorCFEY2wxBodvclck 9wF0tMuOicvsbcAOyvwQ92lPDoI+ESfpT6gqbLMGL7OHWg2mqvz1ExiDyUFjjlqy14XdYn GHc3S5dltzZKwxe2U5UqETcIUfN2Sh2HnlvLY4Ce5Ils24xuPim3nyxnbAzzDNJXR5wA+I QOmdE3rnYu/DYk0ITJgmQYxaHxBNJ/6I1kYq098F+MtU7gYTF6MORiaIUBw2NFdhvcUSgN 2XUmHSM6OShQ/5k2jcYBqaANtT9F7to+DMjplK9mHbCWZMduZ80BsFQjGt4AWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FbVRY+RhlWhBETd3TXbXen+hW969AW4MCO1kWumtVuI=; b=cAFQeSXvLGJYmssIDyetWOAZq8sCZJ7bKh0IdK1U4v2R1jFRO4cUOgXrexxcaRdtL9Symr vEc6QFu5UKde9vnJ/sg8RxSa+9SV8ssp0+uP8NiiM28g/cKe9z2cIGsW9zGWZu26Z+sF3r YtPL/uCPL7Ux8H4L+Tl12XaK9Yci7VwOvNHNJ6mdhZB60FkIVGr/gNnrUN1G48inbVYxlv L9wlK3GtAgKXHoi2piR7mSTLrEcA/n25ikArXe1+6AdBEQJwpunbfFCE879HC7RD0SPkrg B7w/RZ/zdfzVhhsDgEEJhO41CJTIMdV61/HeUzH7141qwVvc0G7zN0mAmTf+OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY619xkz1Kxd; Fri, 22 Mar 2024 13:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWQss002355; Fri, 22 Mar 2024 13:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWQEA002352; Fri, 22 Mar 2024 13:32:26 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:26 GMT Message-Id: <202403221332.42MDWQEA002352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 466e0dc5ce78 - stable/14 - random(9): bump removal to FreeBSD 15.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 466e0dc5ce78da69c14dd993d12ef21a62deca5b Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=466e0dc5ce78da69c14dd993d12ef21a62deca5b commit 466e0dc5ce78da69c14dd993d12ef21a62deca5b Author: Ed Maste AuthorDate: 2024-03-18 20:02:08 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 random(9): bump removal to FreeBSD 15.0 It has not yet been removed, and still has some in-tree consumers. PR: 277655 Sponsored by: The FreeBSD Foundation (cherry picked from commit f50322c1dcfe369ad73e1123541d18fc431384f6) --- share/man/man9/random.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/random.9 b/share/man/man9/random.9 index c0d58482416c..7fc721564897 100644 --- a/share/man/man9/random.9 +++ b/share/man/man9/random.9 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" " -.Dd March 22, 2021 +.Dd March 18, 2024 .Dt RANDOM 9 .Os .Sh NAME @@ -133,7 +133,7 @@ The deprecated .Fn random function will return a 31-bit value. It is obsolete and scheduled to be removed in -.Fx 14.0 . +.Fx 15.0 . Consider .Xr prng 9 instead and see From nobody Fri Mar 22 13:32:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY74SgHz5DwWD; Fri, 22 Mar 2024 13:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY72Xklz43l0; Fri, 22 Mar 2024 13:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/hfjy3YU6Cv2K1A0SP8eOKr4NvuEkBtfRenTmh4yMc=; b=VKuJ8V/FA02wliWDdA1gZa+frJlyoj6NHkg0DepPOBRaeIQm3xsooAVZVbPon0IYrIMIHQ JYXEZL3BnVPp9H7G9t8AulNwkpgJTTMSSnp8J9K4d4biMGPUPrrL1Us7vH7G3rRiU3ELAh /0pzLnv5CiS5gGlCqBo+UAulfVKpYRLGgGmLu85NUd1XjUbBJDg6rmnjsTJ341p7Layo/Q nqNtTjZ4IAhp4A9rz0stWjq5vwKctW6xlXd0xI0OUoLugpkHppSLhgsoktMwA5TDYhKj++ A4HizeSmITolrZANb6ESLZxMGGY5Yr5eZCOc7Ll7nT03LYzTqjez5FNOzYLrKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114347; a=rsa-sha256; cv=none; b=R3Mxx/NcZnJ+xMVH59ZmeddkPgDStj8axVoRFUQM1tgwtrAaGbeZV8t6PnbMsrXQOJFOzP kZecB7HH3j8n3HEJD23XBFxstaT9LAbmAC8aDZjYS70uZ/iFQlGWE+QtRA4YFFqb3QUfJY MdXyobaLfBtIi1zQR68x188gm4ZkkUXSJzIA00UU0cEbzP15DBIyM5pbUXvnVEkMgiRU+Z IhyGRJuz75B3YaJhor6PAe6bThIdl2ow/8E67bdXx2U+yMbQ5YCmbnoK2AdoTFY1Jbxx6J ddcXfO3hUntqFwwO6vs4Dk6aw2zUHWjvcgnZhFEaYyQUeFhmpB+V56DlTAkrCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/hfjy3YU6Cv2K1A0SP8eOKr4NvuEkBtfRenTmh4yMc=; b=v9/8XwwKoSZbwGaRXvzN7gtqPZtesymT29Lea5ysej44ss3NaUUCB+nIqzq6eHS4l5sKAi MkDrYYjXiPXpnGLEeOjPewl3ySdpSftQU0D7/7mOVK8dM+sWHBvLhy8nqkmH0GGwQpPgdE 9h+y1LOmG7ppFsKtV1X73w1Lajrt4kJKaR2j8wInZsv3fwyJQIbb5Etwl2fEzUC4qqroDr eTirTEak85oxPkd0ip1UrcEPcKCATPIV4fIb+uT+yU9PbwO4YysAxl5Va4qHsrEVtbJ3qC s7zRF9XYCg1NQMqOHyZo8RwBwMHnsO2RTApzV6hfI0pKU1pFUYKlUdLcOsj9fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY729Gkz1LKc; Fri, 22 Mar 2024 13:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWRN0002399; Fri, 22 Mar 2024 13:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWRrD002396; Fri, 22 Mar 2024 13:32:27 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:27 GMT Message-Id: <202403221332.42MDWRrD002396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 144abdaa2bdd - stable/14 - wlan(4) - remove an(4) reference List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 144abdaa2bdd6effc6621a0a5a076272486b377d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=144abdaa2bdd6effc6621a0a5a076272486b377d commit 144abdaa2bdd6effc6621a0a5a076272486b377d Author: Christopher Davidson AuthorDate: 2024-02-14 04:27:13 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 wlan(4) - remove an(4) reference Fixes: 663b174b5b53 ("an: Remove driver") Pull request: https://github.com/freebsd/freebsd-src/pull/1120 (cherry picked from commit bbd29c4394de2750b6137c46bf4e577805a4120a) --- share/man/man4/wlan.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4 index 233b29bb89bd..4cd1bfbdc9d5 100644 --- a/share/man/man4/wlan.4 +++ b/share/man/man4/wlan.4 @@ -166,7 +166,6 @@ not ratified and subject to change. Be aware that this specification is incompatible with earlier drafts. Stations implementing earlier drafts (e.g., Linux) may be incompatible. .Sh SEE ALSO -.Xr an 4 , .Xr ath 4 , .Xr bwi 4 , .Xr bwn 4 , From nobody Fri Mar 22 13:32:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY96XhQz5DwWF; Fri, 22 Mar 2024 13:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY951Vzz43l4; Fri, 22 Mar 2024 13:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tm46OBH434LejjYRxjUsJkpjPjLk2c+BVc4zYGopwB8=; b=kNjuaiwuvgaCA7TRWGQIVQSpp4K3ZMdQEsdSjTqOWG73BfyxnCbMI/hLSzSeujWaWZrvZC fSwO8ytQX/ZXdoAA9pDfXm0phvlP9VtqyqKZKCPOetkkExfRdP7djPaL1cTff4TKu6TeX8 zzCxTTGimgpm0rMkKwfNmYqn/Lq28PmMLaN4gJUEXrrENZwG3agHhUWPrNvLVRMcwtH29U vXjOqfFCw6gz13wRuWY1Ca/n/wX1GPLDAH22RZ3Wa5NaNLiYB3N9Bxqg9lzmbgj/ynJ0yt ZwGKndQ2wxiKJ02HzixFVSfmb9aZzH6QzbCM1bf0EgnL0VhHIjMFx63IYf4FTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114349; a=rsa-sha256; cv=none; b=sjuQpW9ebUB1NARE1h8m+Or6rCG1GZRblQp42AEGsaLfRqc2FRWCLLAC9zD6Yz65vhE4Uw QWCtHpMtv7KRdscQxTn0FbnVQPmwVFlfatWjDD3A65MVGqekh1WFIApxtK2L2/YF0O6Kih 9XDUil7NAtcuuRP0xDtPzrrhuVZL48vd+UGxRJVShJEBQqZQsDZT2wyAjWNPGxF0qs0qeq epxBMjw1wqkr2RmKW0bZjUtJ3xk4iGR90bCHRagG0Udu7bu73gMqqeS2dZEWfTRv/bsyY0 sUo+mTubkT4VzESwXvAYQNpI7Yi4HfFRuzPIsIXBkH4+kVCS8kJjMLrMdU/oGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tm46OBH434LejjYRxjUsJkpjPjLk2c+BVc4zYGopwB8=; b=Ch3yd0/yuntqcwk/a2K1RFTMQ8/VXBKhbHSvKc7/Li/e3n2Vmcp5m3KFKFsV0Eq1Qej4Vg Ej1/rsD/UhMD8q8pHuOJrtohpXKTR5l07O4p4lXSu30bV4aoQkzqtSezwA67n6+Qnxqup1 30Fn8msXcAZa/jg1FTuq+rJLXxF68HlPk9JP43KDW14lW8+gQLaXjKmDord5QXjZP7/rI9 v61S3GWWYjDtNpSZeaTAvUxCyZk64th8uazNfooz8mYOuk22PEqfGyQZZ2wU7144hSr+fL p8KhnAsHLMNK9reggfeuayUqte0zE+RcOnM+4RjhRUilnU0p/Nypol0eszm4xA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY94LSzz1Kxg; Fri, 22 Mar 2024 13:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWTYh002493; Fri, 22 Mar 2024 13:32:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWT3f002490; Fri, 22 Mar 2024 13:32:29 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:29 GMT Message-Id: <202403221332.42MDWT3f002490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b5ae8f217122 - stable/14 - ccdconfig: remove obsolete references to BSD disklabels List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5ae8f217122258764e4c187dbfee712dbe6893e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ae8f217122258764e4c187dbfee712dbe6893e commit b5ae8f217122258764e4c187dbfee712dbe6893e Author: Ed Maste AuthorDate: 2024-01-24 15:05:09 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 ccdconfig: remove obsolete references to BSD disklabels ccd(4) previoulsy had knowledge of BSD disklabels, and relied on their use on the underlying disks, but this hasn't been the case since 2003 (commit 0f76d6d822f4). Remove disklabel references from the man page. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43574 (cherry picked from commit a3ed434a69c903fa58ef001c11c9466166d67c92) --- sbin/ccdconfig/ccdconfig.8 | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 2c7460f291f6..4014a36b0771 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ .\" -.Dd March 17, 2022 +.Dd January 24, 2024 .Dt CCDCONFIG 8 .Os .Sh NAME @@ -122,13 +122,6 @@ argument is optional. ccd0 16 none /dev/da2s1 /dev/da3s1 .Ed .Pp -The component devices need to name partitions of type -.Li FS_BSDFFS -(or -.Dq 4.2BSD -as shown by -.Xr disklabel 8 ) . -.Pp If you want to use the .Tn Linux .Xr md 4 @@ -187,30 +180,6 @@ When you create a new ccd disk you generally want to and .Xr disklabel 8 it before doing anything else. -Once you create the initial label you can -edit it, adding additional partitions. -The label itself takes up the first -16 sectors of the ccd disk. -If all you are doing is creating file systems -with newfs, you do not have to worry about this as newfs will skip the -label area. -However, if you intend to -.Xr dd 1 -to or from a ccd partition it is usually a good idea to construct the -partition such that it does not overlap the label area. -For example, if -you have A ccd disk with 10000 sectors you might create a 'd' partition -with offset 16 and size 9984. -.Bd -literal -# disklabel ccd0 > /tmp/disklabel.ccd0 -# disklabel -R ccd0 /tmp/disklabel.ccd0 -# disklabel -e ccd0 -.Ed -.Pp -The disklabeling of a ccd disk is usually a one-time affair. -If you reboot the machine and reconfigure the ccd disk, -the disklabel you -had created before will still be there and not require reinitialization. Beware that changing any ccd parameters: interleave, flags, or the device list making up the ccd disk, will usually destroy any prior data on that ccd disk. @@ -246,12 +215,3 @@ The .Nm utility first appeared in .Nx 1.1 . -.Sh BUGS -The initial disklabel returned by -.Xr ccd 4 -specifies only 3 partitions. -One needs to change the number of partitions to 8 using -.Dq Nm disklabel Fl e -to get the usual -.Bx -expectations. From nobody Fri Mar 22 13:32:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NY869zXz5DwbZ; Fri, 22 Mar 2024 13:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NY83fB4z443f; Fri, 22 Mar 2024 13:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yO5S3RgZp/E+lPns4NRsPZS84e6WUgVp2TYhLEDpyLY=; b=Pcie57oZKDP1cf91UrquMZ8O1dql0j4CqkZwNNb2C97INiYvrFTy3UQQWIVS4mou+1m7K3 NNKnNeQHnWrV3fY9J0NcB2QOn5m7O526pVGHECbgFscZebt8oGT1MA0IzYJ1TnQ9CBqImm 5IWc0XumYaOk514Mkl8J/0mhYPVyw0WoVE136gqjGfW5uoEui7UHQ1zB7o5VB87kpG7XkO bppigW+5N2nFfjFMR8wEG9LBP9O6TSHao6rPr3uNL1Se13MVFHs9IpM2A3C6iki0g71Twq Z5JjPiM2KGsTEaBrmA5LJmldTFHOPpw8+Q7nLWfHsRFuAUSBjH95PeWRCqrZKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114348; a=rsa-sha256; cv=none; b=jaf7CIw0+pGTSrIORH5D1+FM420+2vb6HBcy3tDmT2ifjECbLoUoAKftqvDm/hTHpbnSc5 EK3qrgh9r53Q5bMJOv5XjB2+vRZj/Our26uwz5yqHiEiQnQqwPX5ZqRkeaEWKOwgEpCsHT TMv1SPv8C276lsjMtgjFa7vdZdKm23/bJfzB7YxGPqUQodGQRG+74MSAHMfNUm+g9ChQzk q4sQcusnoRsQ/U/W797JzVetyTio4b+7PURM8k4izWQlOdbu3H7aMGueYg92voUQzbB1oj YwszJcNqOtDDO1u1zJMzGVe9l2nQgzQZ2ia9SWNj/PL2n8n+fQC/7TtJ0IQB+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yO5S3RgZp/E+lPns4NRsPZS84e6WUgVp2TYhLEDpyLY=; b=X+FhINuQPSaudNGEFeqkGy6JZ9NQMcIH00GND8iDGQHDxSFIf67PL6GUy0Cg4yFNsdxtQ0 j2eQjqqUStuwIeVPc3O1MijZJg5l5/BDa52e044IWqUlG3MPd9aBD3JMHKp9amGp+ipziY gzc558pjelsiheLgJyP+v+G0Pa3gyRoEWK4ERwYz/NnS7sTd4Jhbry7HiZBsD4a6oGtpCg O3N2suUGvpYFOgmyM5dpNNreqQ9yX83RBp15khkmQdceMuZQ9ZLwcVQLUBu0iNmNdwqj4R 6RVQOpKAZQ7FYj5aMPLJeBH3PP4hFGlxt9O6v8pWVj/t1I1QCbuoyX5J4z2wkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NY83DR3z1LH2; Fri, 22 Mar 2024 13:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDWSSf002445; Fri, 22 Mar 2024 13:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWS1m002442; Fri, 22 Mar 2024 13:32:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:28 GMT Message-Id: <202403221332.42MDWS1m002442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 269bc49fba66 - stable/14 - style.lua.9: remove mention of $FreeBSD$ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 269bc49fba660d212a7ac50e2ae5923cbc675e14 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=269bc49fba660d212a7ac50e2ae5923cbc675e14 commit 269bc49fba660d212a7ac50e2ae5923cbc675e14 Author: Ed Maste AuthorDate: 2024-02-12 15:36:36 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 style.lua.9: remove mention of $FreeBSD$ Also restore a comment line in an example which previously started with -- $FreeBSD$ but was removed in 6ef644f5889a. The example shows the of a module require statement block following the license header. (cherry picked from commit f1bd7311fbd576a387042c0d81945b701c7459a3) --- share/man/man9/style.lua.9 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/man/man9/style.lua.9 b/share/man/man9/style.lua.9 index 0417efc83c45..991a6f96b01b 100644 --- a/share/man/man9/style.lua.9 +++ b/share/man/man9/style.lua.9 @@ -44,14 +44,13 @@ is silent on an issue. The copyright header should be a series of single-line comments. Use the single-line comment style for every line in a multi-line comment. .Pp -After any copyright header, there is a blank line, and the -.Li $\&FreeBSD$ -comment for non-C/C++ source files. +After any copyright header there is a blank line. .Pp The preferred method of including other files and modules is with .Fn require name , such as: .Bd -literal +-- License block config = require("config"); menu = require("menu"); From nobody Fri Mar 22 13:33:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NYw1khWz5DxB5; Fri, 22 Mar 2024 13:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NYv6ZX1z45QM; Fri, 22 Mar 2024 13:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUeVuKr/9y7kMEFWkUY8ksR684rSVUECSwCarYYzHlA=; b=w30rFQDO1EfxtqKgUfxltgVgOk+wErJ7JxlpqOuBmIoIjj+M97S57Gq3Bzt74hDEBw+i3Z /hiMKYT7yTnKyDrQKPf857T4GLKrNajks3IdhLIowKHNc1e0ZPmoRFJ1gmRioau0t0HUMf q/gRRVHAPLQmUZf/CPlXvamvSOU3D8JJTXE2ZxL+3/rxIqVQx2ChPXN8TYgDqXGBgpBXkx CXjSQa2y8zIKMC6ivBn+Le93Od6uV50cS2irUzXuskE6dDZpG6zfeeuuNexdJvyQXfBChb PrsGWagvfvF71+Aj0wtLG0fwYKOgkTnp9JymKVLd0+kNSm911USaGmvuonkq3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114387; a=rsa-sha256; cv=none; b=gY2VSAwDtZdZwtQ13HN/LTBsQpGfFmtkaiWFWwzjzmzhWSWaIOpbWNh368TkVzruL8nex6 fDDyTVz57ka+miQw/OO1fB6cr6cjlniP+ri0Uaq9/6pVS6ry5PkdRPSG5fzi10RYicdVPH vk0ilc8+/BU0DKiTdCgm83G1EJz6+yTFUthKllbnjdDxNNj7E0hEHZVvII/+UzihxQss8y GwJ++Mh+BRZRWIrBxinnyjPpf0HxFpNx6rDwwISx7U0V/xhrbYL4uBOPOjxUE5VAxEGqt0 EM2Bh/4QEE5e/b9W6YUO5T3TnZ2B6DsZBqrxQdpkOBY2wcCQC40K/eKkSlb93g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUeVuKr/9y7kMEFWkUY8ksR684rSVUECSwCarYYzHlA=; b=OWkVX8xU8nrDR4eIXV+SkC9yjvaU2xbIWqUfiz+ogWZEYYkNjJeaI64JJBrKfiu6koh2wD /8OUKUn9SnDoiarF2DJhWyiepwqLyvvEzCgQonBUAsX9tYmWqpGBtulKczbeZ7JOFCprEv KHYGAU5uzuwm96cUiW8UlvzyqAXRWUl1bZ68FV2kmU0vYCAIm2KdIa0CVjHMSBW/i4wFB3 gOQpiHw0WwgWboQdJulKtOwfIyz2MTkQWtRn0F0GlDRQe1CkGJI1xni/lOMs3MPkQpnQAf ssHuGXxfUooKrFvgaS9X7kkQEVAq14pv8m09oQ0+aplMDYOo4+HmnIOI0r80hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NYv69ckz1KWm; Fri, 22 Mar 2024 13:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDX7KG002826; Fri, 22 Mar 2024 13:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDX7vB002823; Fri, 22 Mar 2024 13:33:07 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:07 GMT Message-Id: <202403221333.42MDX7vB002823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5f527dbe41b8 - stable/14 - cat: add CAP_SEEK capability List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f527dbe41b804d3fc6a789c5def25b25a44a3a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f527dbe41b804d3fc6a789c5def25b25a44a3a0 commit 5f527dbe41b804d3fc6a789c5def25b25a44a3a0 Author: Mariusz Zaborski AuthorDate: 2023-09-28 13:20:47 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 cat: add CAP_SEEK capability The copy_file_range might require that. Reviewed by: emaste, theraven, kib, markj Differential Revision: https://reviews.freebsd.org/D41967 (cherry picked from commit 64c6327738fc24bb34b9f40ff1c223ab460ef637) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 1468faf494a3..c69bbc4911cb 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -155,7 +155,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL), + cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:33:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NYx2mwSz5DxGy; Fri, 22 Mar 2024 13:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NYx0TYJz45d6; Fri, 22 Mar 2024 13:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uDKZzKBBq9VSbs3T7I8NeLvttrs/iHQ33CVQjTqA/6w=; b=rmW2EKWMPUKhVEOU9titRD2c6k7rfu1+lMi5iSG0Kbgi6isZNNVyDeWYk+wHDs1V3PkZWu v9fJyIvOz8HDsutgbRg6KWcBzfUU22LbKEtmQccFrINMXbGl/eVQfyBMkWsasGROHXtJYz Zd0y9F1QDJVICk10Scmf5ttSyL+imqbTaS3p9nfaZlp/4nMvzooje+Cc4p8ulUxCsHiv+b RsKh88ZG6ZxnygAUErfjvqgdR+DieuCRyYAcuJo9y7eEB7RcEYGe7HWu1Wow3KqtA48oTc JseqrhAuO1GjtQqdImGXdw/VqHrQTH3ABsB84vEstrC9+i4Yogxp16B9I5c2hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114389; a=rsa-sha256; cv=none; b=HQQt05pd0RjGLLfdBnZJapBpygBPB5+vkcUuFCRd2ZhefmCmIVW5Vyzd/o/V1CLzxoGTsW NTARZvVQ0wj/UE8IeotYpwGgnCaOv9O1O0hIIT7LeNIl5tMYXey1jN1wuh2wsWDhln2JDn TQCXRvllLGv+T5z4DuqmX077iCnl4I+/BPbcrFjM9FrRreHYA6TGpjozrWN9bLjFp/hENi CDH4sUXBVT9j7bSnuUBxjCQ0qNNycORnm8Sa/ykI8OinyxbQ4Bi45SRMp8aQ9A+pSZG+s3 FzUh2jIPyAJy4uIkRpaK10wkTvW7azvJVyfvibkivCrKfQB1oauvgpjN2+fiJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uDKZzKBBq9VSbs3T7I8NeLvttrs/iHQ33CVQjTqA/6w=; b=Dffnr7Mnob3tcM+Sc7nvUq4JXsXf0FzlZ8vvIDVnG+1O1/CckXMxEyLkpqIXnHJALN9GPc zhlA6U73Wn5anqmMHIoJQ6wFjzRqMRWsaZV3rI7zk9YK8Me6rQX/KQogU/kRMTFJIcb5kl nZ78rhKd5r81wI8zOQ1513T4UphnT9hFQoI3193vYBEIswdoD/z7lpCeQFrOlrf2Y07zvA 68GaVl45eDejuPM8bENz67riLlMaaPH9mJAT/CK3CrAEEKMbYxto2sLrQ08zfpG2tkjZ7t lQ4K6m3xKOEExeWeJOc3LMd8BbN3f7g4U9/O2fhXLD/E+n4hSvJe6R2B6zFPZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NYx02gKz1Kxj; Fri, 22 Mar 2024 13:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDX8aG002867; Fri, 22 Mar 2024 13:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDX8dr002864; Fri, 22 Mar 2024 13:33:08 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:08 GMT Message-Id: <202403221333.42MDX8dr002864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: dbf34bbb1888 - stable/14 - cat: fix cap_rights_init usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dbf34bbb188876551dcfec32fbbed2ba8ba24f12 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dbf34bbb188876551dcfec32fbbed2ba8ba24f12 commit dbf34bbb188876551dcfec32fbbed2ba8ba24f12 Author: Ed Maste AuthorDate: 2024-02-15 00:03:40 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 cat: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Reported by: asomers, markj (cherry picked from commit 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index c69bbc4911cb..81ec5feec240 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -155,7 +155,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL, CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:33:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NYy2NVJz5DxN4; Fri, 22 Mar 2024 13:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NYy1STsz45dH; Fri, 22 Mar 2024 13:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pqAR5CDPabWmDqXX8gxIj+N+i8Yc1nBa0Ef1X0YFZec=; b=biFbzvEZsjrofy1d9UFG5kOVR/QF9/SAOrFw38vJZkXsyjW2rC0lVAdRTnDk0urjMm2osq 0kOzanXZdRCPgaWtFGgXnvg3gzWexLI7Qw4Uyj1CrcD7Tz0/M8TARDdGZRJEECBx1hCADy 2Uam2c/fGq7OtN/K21UL+uvDpYq7UWXDOos9fUc0hQnccWgYR9AimKF4QN4sXWqpWJMRKA pE59JGu+Rz9S843qT7+1gBtlTseRIaYyd3S0SZqh4W80Up+gos7vWAI7nEytVUxfdD/IK+ fXS1tXugdBFzoPlzUi/zpuxLTjAQ7fRCvc1wef4nxGbbGzOaPKqmHMrIViufRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114390; a=rsa-sha256; cv=none; b=i48b2AvAdkKLd2yzm7nr6dhailDHxDVG+r6Z+Zks27fcS0rLZlGzwcdp0HYv4d6lzjMk0e eKkfWbJclUTqfuQXMKB+auFXIVHs3X1LlAjZVmYkUy4TmSIuhzT3Qnlt0viEb0NoYC/FVh 0XZTQVixC+L3Ov8aRo/McEVmE73yitSkQ0valcnqsLgN9t1nkX6MlbLGQkpO5JCEUix2DI ebRoHRfQk1N1L6ljXTXQedleMfenaTpHSxDIEcY5eDxjfJdCu0ivD6x+VvTBcdTLXJwgLD q44dihsKiPvfVpirfSOwuUhQd/7/7TtzHxgDeSRPpHikRkzLnLNL/wYhh9asxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pqAR5CDPabWmDqXX8gxIj+N+i8Yc1nBa0Ef1X0YFZec=; b=AQqBy08tEwhTBrmQOcB6yhtBYfRoC8RyO5wMYJNsC0vbyW9K/wV0WaZvUU2H/bv+AMs8q2 ZKLITPM1wsDToIXey12bx7YN/9/UGnQNUzOuIGlHw9zlve7dHlm3Z7Ga5eRZPNZJkPGN3f xD+BWbFERIYgmh96t3LF3k4ZWpUg4gQ44UJpdQ1MpM0JFf5FCZyL83bJBPDPn3Qi6QiXm7 815ZBvkjQ9ZigS41dAz0cRpO0ZeJ10qPJ2o8b5J7FlUAxkSlkrF9ymRx4JPP9c2xeCf6ld gHHbHNnlDCN4tADpYqPPI+jPM2vG8UyZ62y2iNiOsZlfng9gWEAothqfWR7jGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NYy12PGz1Kxk; Fri, 22 Mar 2024 13:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDXAKN002916; Fri, 22 Mar 2024 13:33:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXACM002913; Fri, 22 Mar 2024 13:33:10 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:10 GMT Message-Id: <202403221333.42MDXACM002913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: be83aa2a01b3 - stable/14 - libcasper: fix cap_rights_init usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: be83aa2a01b35f9e7aa94a3d45a851305fa22c83 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=be83aa2a01b35f9e7aa94a3d45a851305fa22c83 commit be83aa2a01b35f9e7aa94a3d45a851305fa22c83 Author: Ed Maste AuthorDate: 2024-02-15 00:42:48 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 libcasper: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: faaf43b2a750 ("fileargs: add tests") Sponsored by: The FreeBSD Foundation (cherry picked from commit 3733d82c4deb49035a39e18744085d1e3e9b8dc5) --- .../services/cap_fileargs/tests/fileargs_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c index 4df43f183735..dce499c8b7c3 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -292,7 +292,7 @@ ATF_TC_BODY(fileargs__open_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -339,7 +339,7 @@ ATF_TC_BODY(fileargs__open_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -386,7 +386,7 @@ ATF_TC_BODY(fileargs__open_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL | CAP_READ); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL, CAP_READ); cap_rights_init(&norights, CAP_FCHMOD); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 666, &rights, FA_OPEN); @@ -467,7 +467,7 @@ ATF_TC_BODY(fileargs__fopen_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -517,7 +517,7 @@ ATF_TC_BODY(fileargs__fopen_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -567,7 +567,7 @@ ATF_TC_BODY(fileargs__fopen_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_READ | CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FCNTL); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 0, &rights, FA_OPEN); ATF_REQUIRE(fa != NULL); @@ -673,7 +673,7 @@ ATF_TC_BODY(fileargs__open_lstat, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_LSTAT); @@ -721,7 +721,7 @@ ATF_TC_BODY(fileargs__open_realpath, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_REALPATH); From nobody Fri Mar 22 13:33:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NYz35Wbz5DxPj; Fri, 22 Mar 2024 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NYz2FWlz45T9; Fri, 22 Mar 2024 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtoXUf5oeHGx3nPBaLKg7fImZze+6YMjJdgZV+UXJsA=; b=E6K6DASlZ3H+WQuk6UM3iJyYtjlxZNTVZyVCsfwT4GscTlXZv0ig9pvxMXRuPvHdiqQMIr cO+GAQOpLaWL66V/HCxLr5PzciTmATYzCKinN1FOF/EmlD1RyeTAZ0tUCoVK3jAhiUzZ2v N9nm+NYtJ+/QzB5OjPL3mRYzGIW4z5e5DQDfL/4cM9iHlgcSR014iApYETFMSDoe7n4bC8 8ufCEJPS9xUIw/xdGOmnnts+PE7BqJtu1lb/urdhmGCZn5oTMphUyWAUwl3OqU+y0rHI0V gH+TBN8LZd0/Wt/cnt0LOEydYZGFzLWXEYzl/hv1mxz94MvgBp/4ONZICBo/Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114391; a=rsa-sha256; cv=none; b=bV536/cZaRLWZwNVo6eAovZp+zzqRbrqF86nRMM8VxJLa7XA0jY2B9hymzUMb9bLetZ48v 1GJ0xCjJsi8GXjcYHDlldJLTPpc772qCh2Fvl5CKKNz7xgBVGEjoE7qaMQ7yDw21fjYRAB Ry7VTnVG5e23sxV8UzZy+TVAVxlOWpvqc0wlCjU6KbLogdDOX5lYmH142aDe2c5LORl3G+ k29Oc9A69CK8sX/ylg+/6zuYuYiKtM8UHI12U92XnykuyklMUjE6VsfvTaLZDvbJizszxg a2m8qXXCur0iSczNgoJYZAo9GsamOEC36aq7mGQLp8pczDUjfu3J6Kay052trQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtoXUf5oeHGx3nPBaLKg7fImZze+6YMjJdgZV+UXJsA=; b=NX1Vr6SqUsqqu/PGbqxk3TH4DBHWy92WTFj0MMxuPfpKSM42hUtP4BZomfL7CK+7CAlCIa U0WOn+EpZ72R/fsPRDAM6cFg+Uip85wKDHvxfoqqdLp5pNQJ8mHeMQranpsmEE+GWn0LvE 3iAua8fGJEvRadCbSDj9sWky8qg4huMbxh+uh3Jpjk0+HZ6uiBjxsMpb+imVsTjE2zNo3I y6zbj521Fal6+WiYxVR5/nM3RQX3I0uCVX7TbLzqXxljUgINI71u6yHmnj2YqPJ6+LTCw1 EZgpWKSkX66akVQSrj07U0iNoFsQivsT80diuxQFOntotk6FPTuvrnWbI4P1Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NYz1sktz1L8f; Fri, 22 Mar 2024 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDXBEh002965; Fri, 22 Mar 2024 13:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXBj1002962; Fri, 22 Mar 2024 13:33:11 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:11 GMT Message-Id: <202403221333.42MDXBj1002962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ea3910c452cf - stable/14 - path_test: fix cap_rights_init usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea3910c452cf44342e0b65d6283aebeb77a10863 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ea3910c452cf44342e0b65d6283aebeb77a10863 commit ea3910c452cf44342e0b65d6283aebeb77a10863 Author: Ed Maste AuthorDate: 2024-02-15 00:45:42 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 path_test: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: e5e1d9c7b781 ("path_test: Add a test case for...") Sponsored by: The FreeBSD Foundation (cherry picked from commit 8d1348f55aed6873f34f54bc3b275b73ef0ff66d) --- tests/sys/file/path_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index bd98d7a6955a..911c7c7075f0 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -235,7 +235,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP); ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); ATF_REQUIRE(dfd >= 0); @@ -256,7 +256,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) ATF_REQUIRE(fd >= 0); CHECKED_CLOSE(fd); - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH | O_APPEND); ATF_REQUIRE(fd >= 0); @@ -265,7 +265,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_SEEK is needed to open a file for writing without O_APPEND. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); From nobody Fri Mar 22 13:33:12 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1NZ059yzz5DxBB; Fri, 22 Mar 2024 13:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1NZ03Dvsz45sZ; Fri, 22 Mar 2024 13:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=92dCcWaynlHwyri/wWxPjKOjpYDHB+0bzIBnfMsUFCI=; b=COepw8+QHZndA/78Yd6cQQ3a0+cztUuPHD5f9MeHRIEcPWdlFaC9eDzxvYR9EzsKSWIRZe QlSpwFi8eIO/XJemDavjS8BtYE17zcO0qmw9RRNAvbe086lBoQlXqbD/+/8G8PQq2MdJOR KmXgJGrg7Jkh3RXiUhgUJ44eGwPDbsbAg1e2wuk4slXOoprk68UWzIDTH/ssjP+s2rP/ep THtjXfNUxXOtw0bvcQUIfweIGabmFD+mUhOA044kZcLp/nT5y+MQDrpdcgOL5F9bheIidc v9aJAX4qeFNUM9/liByr+C3xL1o3STCypFyLW3SXqHUTlx/VxRSA1ilcEljkSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114392; a=rsa-sha256; cv=none; b=BgauXaVhJuKLbDc3EGS2iXB/3B9hBYkN8utFIqqk8cr2449CRLjwKcXGW/M5m0ubZILy3g intSfOIsHhzrXncGe6JMbnXpUojsTG6K3+abfovoRrK79f2D3m/V3HJXOZ+sXq2ZqXPcjn ZzqIhXlQ0rKukt66HRg1NA9cN3rvmxoEclqC7jD4f8bjVNneL5V85KCmv0WHvxLJMquMyI wpw1rok+3f3MJ+4U7ryD7Ckf81aw0WDCcDs/Cq5k5zlGfZvd8BkaqpoBtCLFRRxKLZIkdX bWT3ErkevFC0fSshcY6lQV75SM32b02m5oTml21Iw2BB9tsDC6o8YuKMzMcd4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=92dCcWaynlHwyri/wWxPjKOjpYDHB+0bzIBnfMsUFCI=; b=QenN2QYamU2y+H01x07R0q2gZcT4ToBTY5CzfQz5EoIiFp/Si41iB6fe1g93OUGiEizdmi PqCtvSEymQfkdLX+3sm+Ci1jhQ2DQ+JqA4Vq/YfWkVViIqjr44eSA5ULDTnS3zlB3N5lPP EN5G7ikgKXJUdNJ07BG8iCxl5OSzo1GRfB7XiRrBnCeTjrVeU0v+M8FiDJUKmIhnDvwmqy gq1GEc4xvHsMB6T7ED4SsvGUQsAhNrNjaNbk9/Vy7HC6XeOcQszgHzCiEsk8n9J+YjQuRE Txue+1SkTvWD+EaVhLP03TnUsxr7XyvNydsqlCIM7GKUajrgeR4S6deoXB+6wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1NZ02r8nz1LTQ; Fri, 22 Mar 2024 13:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDXCam003025; Fri, 22 Mar 2024 13:33:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXCXk003022; Fri, 22 Mar 2024 13:33:12 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:12 GMT Message-Id: <202403221333.42MDXCXk003022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2031b368f895 - stable/14 - rights.4: Remove sentence implying that rights are a mask List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2031b368f8956acbc2ef3b3715af9dc66670d120 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2031b368f8956acbc2ef3b3715af9dc66670d120 commit 2031b368f8956acbc2ef3b3715af9dc66670d120 Author: Ed Maste AuthorDate: 2024-02-15 14:55:39 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 rights.4: Remove sentence implying that rights are a mask Capability rights passed to cap_rights_* are (now) not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). Remove sentence that implied rights are masks. We already have the sentence "The complete list of capability rights is provided below" so listing the rights without an introductory sentence seems fine. PR: 277057 (cherry picked from commit 2c5ff9118c1ed8483a9477db3595b1d154615e2c) --- share/man/man4/rights.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index b9fb5e15cf4f..770f9ea5c979 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -68,7 +68,6 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS -The following rights may be specified in a rights mask: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Fri Mar 22 13:36:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Ndk0khzz5DxTB; Fri, 22 Mar 2024 13:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Ndk00zSz47Yn; Fri, 22 Mar 2024 13:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CW28/5LZfAs2PTshGjymICj+aNhDCMU1MXKCOQdaEfU=; b=NtDgJTMt/XJH3+KAWx5d+eXnKWg9hxRJXcXG3Lj8/U+IsiR46760DIaHIQGtDIUSli6+UC No3VxkkrSUhE+vYXru0SnBKzekSki1SDH/p4SkO0xPkKUalG7fuu4hhRTQT/4lcGgCGH99 n1AQuchqp9+3QtAT/9Ii4mknBs3xZWGqBq8F+Vej5zldL5W1iXDaNIBTxMS10ROw2o3YgK ZtfDseGbqLjkarxYybzlNOS9VpYUvZ0WgeMYs8/s9w0hWM9ynsi0n0HkAocQdFdh30R1jG Zchrn9Ccva/f4L7dwvtquKZwoUo0s2xX2Ivb9pHUVAAlPYkGzHx/xTe4uB5MiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114586; a=rsa-sha256; cv=none; b=H0pIIhf6i2PFKcO1SjHvSm5x26J7MVMh2IfGAu770sT3V3J/PDha1fxH29a24RIqgFWkFl SWZWIBzkF2FymbfYFirJIGJDHYKSUKmTfcbXPHDbw9yxpxEOhwQ7RUbrfikaYHTBHgL+u5 M3A0YFen7ED0VUrP1wBs0cMQ+5LNafLDW1yMmXUX76IJNfhZRrv4cnl8OSGankoVYvG9S7 H7J9j83BqFsbfxhTVnFd7Py56QX/Gy9xsZdQpUzUj85JCJFRMH+hEVehyL59YigOhavFlr 7VZRjMNV0QFI1m4LdzpeNGa4rk/Gq8W0jksrXMQVklnG7wFPMBZjNcO+8VPi6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CW28/5LZfAs2PTshGjymICj+aNhDCMU1MXKCOQdaEfU=; b=SkZPa3bzlKkjN4XptlxPEY6dNFFgyAyWAifnt2rw5bMM6/9gR4RMIzdjRYCqBM6OjTrbxo gvERYsQWYWW9nG8YrLQ0fjjjCAKrOYgum7okTae7BhmiFS+O8wRJweGMPiEGsJfdiuYvDT RZUvQmlsQxGsGHfbt/ebYrmWnpsyCtGOAo1Inbnubjm2PhAccfmY5/PfHNIJazGM+laWVj B06NEKvQFhDTvWQcU6ko0zpnpTcnmDeik+1d1y+/SNjORNLy2oF6ekWaZ5yCC9//VSjLHs e9Gz1OCtZa0QXlMuYq4nRbguaafEFV0RUpwtChkhc7tRe8NmnR0DAqOsMKPCZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Ndj6k0bz1L8p; Fri, 22 Mar 2024 13:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDaPbP003754; Fri, 22 Mar 2024 13:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaP8d003751; Fri, 22 Mar 2024 13:36:25 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:25 GMT Message-Id: <202403221336.42MDaP8d003751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1abd98ecf9e3 - stable/13 - cat: add CAP_SEEK capability List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1abd98ecf9e31b96ee72cca1431e53361233cc96 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1abd98ecf9e31b96ee72cca1431e53361233cc96 commit 1abd98ecf9e31b96ee72cca1431e53361233cc96 Author: Mariusz Zaborski AuthorDate: 2023-09-28 13:20:47 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:43 +0000 cat: add CAP_SEEK capability The copy_file_range might require that. Reviewed by: emaste, theraven, kib, markj Differential Revision: https://reviews.freebsd.org/D41967 (cherry picked from commit 64c6327738fc24bb34b9f40ff1c223ab460ef637) (cherry picked from commit 5f527dbe41b804d3fc6a789c5def25b25a44a3a0) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index c13d3ef221f8..0f36bce2098d 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -154,7 +154,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL), + cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:36:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Ndl1bW3z5DxBk; Fri, 22 Mar 2024 13:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Ndl0yB2z47Yp; Fri, 22 Mar 2024 13:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CawcsNQZom70g8ENH6yROjfuxAMIpfEoHC36stWtSk0=; b=p8TVbqmRgyzkhNk029KpmVt9lqRtEhOq7UrFBO82Jqj7a2ZTnVUlF7jLKl7r/N6st2bb5s ZqeEtNDlYyE/wRpIBbIMkB8H3UDCR9X3advDHjA2woR55LoI88e8NodoG/59GG4EP9ooTk bxVe689wjeYNk9EUPxbSCMTDmmiwIXFm5ZCsH/uXjANt9i+rosmQRHB4AeSEcjlQbGJx1w CDPW/dyAKtb1ctZxqfuVQ0cSDPNsLjjSbt/N0bK1eC+qqXf2OfbUNNuscbAuXQ9U6kiB1m Fko5Kts4JSKqs+OceGT0B/yGZo6KO0XGvOZbCWl+eME83Ug/he9DaiNPfCwY1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114587; a=rsa-sha256; cv=none; b=v21LuZV7U4FVxs1vmNsoNolFIRAV+E9G6u5md5JyhUs1fCLorYzGveRQOaXAto9HPhiTGu bpWXjTx0SCJuDwdxDgkNN90oaADX8QVKoKPVKbWD2UWQucaZUAEZyT9+1Xnqux7hXu3Ckl VVbJTKDwuTCB2kgU9PihvEy37pJZqcWAyAD7SGGjsDYKWW1fbcyW/OsN2c98VZmNYWvcnl xwxDTtSDYG8AGqxbKZ+qFnvS+fC076vn5isNLc4tLZNEpGhyvx2RKrGNrvWCeyzAn2upUS reCFOMisif1pCVeSd6MabnRE3+IkaU1BbFSiHm9/65zphqeHk87tO6EOqjH/7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CawcsNQZom70g8ENH6yROjfuxAMIpfEoHC36stWtSk0=; b=VBDvSinSrXzITrvRwNL8Z+Q4Tzk3xKnps2MoE/E/E0MHaAagPlnPPj2q784jZ3r4LSFewb JjrF6BnPW0zc2dOpkhAFeYiZuzrdK9ZUR4NAmDU/5e4oXGgO8+Mz9BRo9cTCYuTw1Pf9ks 2Z8bJzO7KmvWLfc4aPjfjYq7E4jTs1FNZF0NE+U4ZloSnXV+orTLFTxX2dx/1bzhBmTzHU gxlAe9xaHOLDz7am0CUlg+twkSWxD8U/pMxchF1DFsbLw3basciRSWvb2B50RMn2DSiDpa ps9Nn40npLFkVhjCNsw6nApRtTxnhrIGerOypzsxRu6wplxF881e08V1MHchxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Ndl0Y8Tz1L8q; Fri, 22 Mar 2024 13:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDaQtl003793; Fri, 22 Mar 2024 13:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaQbr003790; Fri, 22 Mar 2024 13:36:26 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:26 GMT Message-Id: <202403221336.42MDaQbr003790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8a17cc127bb0 - stable/13 - cat: fix cap_rights_init usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a17cc127bb0a404d8f641926ad4a3cc42c482da Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8a17cc127bb0a404d8f641926ad4a3cc42c482da commit 8a17cc127bb0a404d8f641926ad4a3cc42c482da Author: Ed Maste AuthorDate: 2024-02-15 00:03:40 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 cat: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Reported by: asomers, markj (cherry picked from commit 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f) (cherry picked from commit dbf34bbb188876551dcfec32fbbed2ba8ba24f12) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 0f36bce2098d..dc6e6417dc49 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -154,7 +154,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL, CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:36:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Ndm5j2dz5DxHS; Fri, 22 Mar 2024 13:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Ndm1yThz47RR; Fri, 22 Mar 2024 13:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y6Se6q2MzNNoG2kHBbdlSSf4D6ejUvQ8akMRY35I+Z0=; b=TByvZlULaJDB3uRs2bMP/kp9MAzGDR4p+gKitV7UqaSMjWQWZhWFDQXy+RUE4wZtd3mlws kXkdWODi9Mxu31ZW/4opf66lsBU7tnYNAxQUdO6HkCX2jXxBQ/EXbsXn4sZFovWyJiLTVv Qk1XLu2Vaj2vnry2fDI6R47C0WnNTgZoU8kxF/BgdIKRSqQlci3C6LJel2K6vCDpxIXDch Nf1vgSiTLjjCOp5sV6bd9mJR9wslXaKDnt2Hy5N15IAKLPoxu8khXbpVi/xlbbJlPHSijO J64EP169uxfaOfHda6Pf23TX7F3fRsXUgwO8BUd1JHIPB4bCEjchovwWee825g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114588; a=rsa-sha256; cv=none; b=jKGRYAtkowvfXGO2u0gvq4srMq0jgkRjUftk1LLCtkUkP7kriHbJ9cp8cGArNtxrlA5+GL OiWKYMqy8dSydg0txejju3bgK0rGOLDIvfr0KbYdydu8vAav8WgomiUgO7P4B6whcoX40R E9uD+SbKQjVM28dzba4q9vCBdSfo8P1nplY8ozAOGXBRpSoGSsq98OZm9k43AhmCUK1Rfo xkPmT7fn6sM3I7vKfO3+ch6QHMvaDvwUuYn7zkrQK06kxm3ZYtKuDRmSdpr5RVFBUCcF9m COzy7b9P8hHuJiDMUau1PSnevnIvNNyYzp5yDtYJ27fhTE6FlfonbBtLPRE9Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y6Se6q2MzNNoG2kHBbdlSSf4D6ejUvQ8akMRY35I+Z0=; b=Aw22HP53talFFm804AdAPuuNJca/lXeAwgnZyKBj/HJIFeBCYT+dH1n4qgu10pqMbVAiX5 G1oo1IRPBD5gjNu8UUVEBvD3GKRwAGvpmkzoPBPj/Ae5hGiVAu5FOFC/5gvqJgfwxau3w7 8tVyF2I3MRO58iEy54Z8KEsnsGVnY38JNvrl+rxFmqXGM8WhPfjRXq3dH0E8Fae+EzTT4u YCd4GglyuRIq6pSbbaQ6+XeKiy0KbxQPBnv+ZgDf111klab38VyrxCLkGr5QQGSytBaR4E PjaR6wrF4wfPUNSX7uWBQFJOFDiXh4tmNukibakZDP807B+OpUu1iaJc443CLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Ndm1XZKz1LTZ; Fri, 22 Mar 2024 13:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDaSQE003841; Fri, 22 Mar 2024 13:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaSKV003839; Fri, 22 Mar 2024 13:36:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:28 GMT Message-Id: <202403221336.42MDaSKV003839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ec44cc4e2882 - stable/13 - libcasper: fix cap_rights_init usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec44cc4e28824b83b2b53b4afd39663345823613 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ec44cc4e28824b83b2b53b4afd39663345823613 commit ec44cc4e28824b83b2b53b4afd39663345823613 Author: Ed Maste AuthorDate: 2024-02-15 00:42:48 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 libcasper: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: faaf43b2a750 ("fileargs: add tests") Sponsored by: The FreeBSD Foundation (cherry picked from commit 3733d82c4deb49035a39e18744085d1e3e9b8dc5) (cherry picked from commit be83aa2a01b35f9e7aa94a3d45a851305fa22c83) --- .../services/cap_fileargs/tests/fileargs_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c index 0b4857f6ed07..a9f2dd90e1af 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -281,7 +281,7 @@ ATF_TC_BODY(fileargs__open_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -326,7 +326,7 @@ ATF_TC_BODY(fileargs__open_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -371,7 +371,7 @@ ATF_TC_BODY(fileargs__open_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL | CAP_READ); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL, CAP_READ); cap_rights_init(&norights, CAP_FCHMOD); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 666, &rights, FA_OPEN); @@ -448,7 +448,7 @@ ATF_TC_BODY(fileargs__fopen_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -496,7 +496,7 @@ ATF_TC_BODY(fileargs__fopen_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -544,7 +544,7 @@ ATF_TC_BODY(fileargs__fopen_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_READ | CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FCNTL); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 0, &rights, FA_OPEN); ATF_REQUIRE(fa != NULL); @@ -646,7 +646,7 @@ ATF_TC_BODY(fileargs__open_lstat, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_LSTAT); @@ -692,7 +692,7 @@ ATF_TC_BODY(fileargs__open_realpath, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_REALPATH); From nobody Fri Mar 22 13:36:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Ndn54QSz5DxQL; Fri, 22 Mar 2024 13:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Ndn2s9hz47cC; Fri, 22 Mar 2024 13:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24RU8GtDxRxKOPaQ1RKtzTNHuOTLaDk3puwHVYvGeL0=; b=nvVHgOvkp2ILlv7UezVxfouMn4LUWk6whT2bvmnnRy4EJmZx8OEq5F55TF6NrhD/pAXl2+ Vg/IYD8LIpYPgA1DPe50p+l9RxQupX8s/Q7nQyqpf/itEdqLV3rx3XzoWQJluhCBnnAPO1 XxStnQtB0x6hcaEJVFQ2aPg1BtK222TXcz7FNDnuH8346Q3jNLvrumYvl1k+wMhkKW3HhE 5lhMVqUAuODg1ximdhj/vDnd7WrRSbyqKWr9EpqV5BWh6665ZeRtIE1kAQ9qaTaXnYZ0fA NbE0NgsGzxsmUQCv7FJpXV/OklLhLxbj9KUNHPkBiHsNNbtBMsnzvSaupQGXmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114589; a=rsa-sha256; cv=none; b=RTUVbrab3/CMl/4yqe+WsN3SIso9febBJ7tv2GzUmdmRLaRoKGlbznqLetNO4ZOU9MMHPn xRUBK3pJ4LFERGdtPoZmO9QkMyfzL9LkoNKDxTji0ruPhLCjWUvA2gDM2M20NxyHeq++Bd N9o62s7ozIqrSqTSMQBRVXSdvu2YlmCSBb8c6gQdlsbtBzc1w1ZgL6FwREUkyeq0au/CEX vgv4ER13BWsgRDxNEZQ2BPE1yaSCoZpXc53TbIuuVdKLUOckEYqA42U8ofz/3gFRVJ1jLh cCwBXZlo3L8ehb2QawdpuUYE5AF11VU09eRmq0bTInQeZ4Sr/72X1FUnyaNIWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24RU8GtDxRxKOPaQ1RKtzTNHuOTLaDk3puwHVYvGeL0=; b=e51wlepLlK3eg7bZNKEfW8miE9u0lUCRKUc/cspK5Gb8X6jQriCKKUACWY2tOPnOgrNcmC sS13v62esI+shglY6aYwYEvLWw56/P/oXCzstjaG1yHpEJnmuxpmZvLD+04JPsRRbDzdLW M0Z2RJ2/cRsaTeJ0TyCABDluZKwKjPqHaElc5oq5c/LDIR7+DduZDY5jh0Ocma5PY/YOFD 6qqtkvgWJRdfA/9eCiPqEh/20fNdE6ps4KowN1NS3nna538jYjoFZJStELOyg6TfGXF8rI E1lFCAkyf4i4VguWTwr1NLr8Y2NqX4l1qHeEen6E6LPpUkly+rLnZ4Ob/qKDpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Ndn2MJHz1LTb; Fri, 22 Mar 2024 13:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDaTiT003880; Fri, 22 Mar 2024 13:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaTt8003877; Fri, 22 Mar 2024 13:36:29 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:29 GMT Message-Id: <202403221336.42MDaTt8003877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e8d01b2efaa3 - stable/13 - path_test: fix cap_rights_init usage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8d01b2efaa358b5ff8991b7defefbf970f871ff Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d01b2efaa358b5ff8991b7defefbf970f871ff commit e8d01b2efaa358b5ff8991b7defefbf970f871ff Author: Ed Maste AuthorDate: 2024-02-15 00:45:42 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 path_test: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: e5e1d9c7b781 ("path_test: Add a test case for...") Sponsored by: The FreeBSD Foundation (cherry picked from commit 8d1348f55aed6873f34f54bc3b275b73ef0ff66d) (cherry picked from commit ea3910c452cf44342e0b65d6283aebeb77a10863) --- tests/sys/file/path_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index bd98d7a6955a..911c7c7075f0 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -235,7 +235,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP); ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); ATF_REQUIRE(dfd >= 0); @@ -256,7 +256,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) ATF_REQUIRE(fd >= 0); CHECKED_CLOSE(fd); - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH | O_APPEND); ATF_REQUIRE(fd >= 0); @@ -265,7 +265,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_SEEK is needed to open a file for writing without O_APPEND. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); From nobody Fri Mar 22 13:36:30 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Ndp5Ztsz5DxFR; Fri, 22 Mar 2024 13:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Ndp3mvmz47l8; Fri, 22 Mar 2024 13:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sq19/hBo+LeDiK8IKed72l9ZOMNiSpkr3WCzg77fUiE=; b=T1gQxAB13J4yM7IAW20z/gU0xw7MD4B/PQrtTH0tSPz+Ucj5GppQfOZp3sl62oQ814g9So WGfhsRnr7i5g195NAq1lhNsHv03ioS670UNcRYpVJqd+f0Q+5EWHsKUMJ7OX4RWKJ088cn jZ0Urlp+zqX8pT4JGdJNtsJKC1Sqzu2YZhhU9Machs9Egq2VneIdnpaT65aCcDTrpFEKtV ECaYbRPbPiMDgGGVE2MtH7gK0uqevIuz+SejKujTMU866v93L+eTi7Lqrw0E2nrBscpf2v iQTYNMcw+u02IjezWD3K/CxdIaqxwLMYepZYH+A5Vnk9rhNiIxpeizkbJ1p0NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114590; a=rsa-sha256; cv=none; b=vQUq71+bv3WyRpPcjEIiq7MOPzUaQ0F5OYWYrPEbv1yiZeNOWACx8eMrLZZkmLHok1kY3Q OfSISWOLRh589k38KT4Fdam67dX/EDMNpAuOLY95FgBeRJPNV/CHYAuodH3BfOT9iqD3x7 xRBoiPvHBdnMjVNJwk8fTvaKLHws/B5MoNcOh6pkoSeNvz8jKPGvPavlf3jK9kNPp7Ua+r M9LgqCFa89t2DjSODKW4dRYkBAq2U1bBFvHCjaFP8UY9kcfVDOJilHPTyA9nTz/hAsJ4Ix Wg8RQl0rHcyP7d42BRWGBgVmyXqzmDICawlWfo7HhZd7hVYjke5zrn2BQx+X2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sq19/hBo+LeDiK8IKed72l9ZOMNiSpkr3WCzg77fUiE=; b=OcvuhAT0zX06l3gu5jFmlfqKkQ53W7m0dLY5F2ciaBY0PsDg2JDgKUEqUqoEVDhjybD7op AzeNyy2a3wpwBOcog9LjR+GKxK14mAiGujl79nwBixk0G5DEXZDJxk0CKMQ+tuvuR3q8tm /sz9XUOX2lLAly6rlJORApMQcPzJl3rO+ZpoDPxQC5Lc1i79VyiHem7rO6a77iQrRJnRSL C9ZoIvdfqAfclx5ZwxYFbrYvBIsCUjKkZ8s7MMTdfnalGmq8MaXakQm0WlRdHlIkWj//PX DH7m64alqmQAaiSFz61w8AVQ70NKlcQhyDvMdliS0zEqGSlNdasLFRQkcDueCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Ndp3MS2z1LF3; Fri, 22 Mar 2024 13:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDaUqJ003934; Fri, 22 Mar 2024 13:36:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaUUx003931; Fri, 22 Mar 2024 13:36:30 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:30 GMT Message-Id: <202403221336.42MDaUUx003931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a2ef45a0656f - stable/13 - rights.4: Remove sentence implying that rights are a mask List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2ef45a0656f9f3c4364a3779c042991918c42c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a2ef45a0656f9f3c4364a3779c042991918c42c5 commit a2ef45a0656f9f3c4364a3779c042991918c42c5 Author: Ed Maste AuthorDate: 2024-02-15 14:55:39 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 rights.4: Remove sentence implying that rights are a mask Capability rights passed to cap_rights_* are (now) not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). Remove sentence that implied rights are masks. We already have the sentence "The complete list of capability rights is provided below" so listing the rights without an introductory sentence seems fine. PR: 277057 (cherry picked from commit 2c5ff9118c1ed8483a9477db3595b1d154615e2c) (cherry picked from commit 2031b368f8956acbc2ef3b3715af9dc66670d120) --- share/man/man4/rights.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index b9fb5e15cf4f..770f9ea5c979 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -68,7 +68,6 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS -The following rights may be specified in a rights mask: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Fri Mar 22 13:38:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Ngf08KJz5Dxpy; Fri, 22 Mar 2024 13:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Ngd6lQYz49mx; Fri, 22 Mar 2024 13:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TS4QxIMLA4GPNWDho77qKgHtc6Z45afNo7m1/bTFOKA=; b=qQqNxNXS5Zva9OLQCVwka/x2MnJhn240N7+C88vPnCxKdZxFKf4uTsmcSpgU7mJrV+5Mar No4hlOUNcLbeErnuk9+CEPcvgj37VapnQ/I+/+JTSOX4XFlb3OLCQPaaswmKunXzCDEms9 98fdayBjAS1243EBQ+Ejy4+d+MuqRAEL5S/gCccMm9PTnOw4s9wfhczIwLXWgAvOFYcbuj AA2E1Nt0h6bu2IUDDtaTlvcV7U3wLLXvcuyyR3xTPrY7uY7MfJ/MNjHKMRg7KoypXKx84k 5t3zcpPzIRKSGUXXPnXki5K1SqZrFZHHACQwEC2PYVEeHBFCSSr8f/rz1VNieA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114685; a=rsa-sha256; cv=none; b=drjRKxWRMvlLrvkPTmKWFCGWx1hzos3WBN9uoEnW0quVDQfqZsKrMoTW821oAvwAID1om8 sabfM20QzjYkhoQMPgxv4XRBlmrcekD56cOzVEotgjkovVxkwOw1dHh2iIk/5JcOyB728T NmiSiwaMtfOpL7jQnzh/PhK7TORZNLuKJLhiSNSKot4DAk6S2RS7rIap54Li7sGcMZkXtx QdrmaGgWeA/hfAFMP43/sfBEpT3HGaUIvSq6aib1aYbKipNNSIsFIu+mPT9N4VHG5ukicw +3Rz2+at8KhnpdySq8JnlATQ81IRqx6QhDbaSF3olVo2NIwjU5DqVuGAZr/1wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TS4QxIMLA4GPNWDho77qKgHtc6Z45afNo7m1/bTFOKA=; b=AbEObN49dbDupRDYb+A63tJjYDZe5Tli46FugFpED4LgL+UOJvrShzAVzyIP+guh7Qi6+p OnxPvcZNddFMS8QGV6+bTk7PaEUYdL6k4/s16aywwJ5z34n///wKWxAtLRF+kNH8Z+7phc Do4DttOpcgwC2Dpy853gZbwtSQfBWJfcbVNQwowtXDoX8OB4n4GK151IkCjNMPdkEEfqjs V/vsEp3wEMHc/9z+Z0Ufh588NFNUO9RgT06HIQuj7GN9NFooDyv184w61uqPUrKn9rdJMr hitAlvEMewLcSFtOAXajlIH6drWkWPikkdAZ6GpQpDqtZ3wFvpD2HrqKOVs0eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Ngd6Kqrz1L8x; Fri, 22 Mar 2024 13:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MDc5pe004336; Fri, 22 Mar 2024 13:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDc5qA004333; Fri, 22 Mar 2024 13:38:05 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:38:05 GMT Message-Id: <202403221338.42MDc5qA004333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 35457886cd3a - stable/14 - release: remove binutils package data List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35457886cd3a0431ba2333189a003016c3ad5e67 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=35457886cd3a0431ba2333189a003016c3ad5e67 commit 35457886cd3a0431ba2333189a003016c3ad5e67 Author: Ed Maste AuthorDate: 2024-03-17 12:09:31 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 release: remove binutils package data GDB was the final GNU binutils component included in the base system, but was removed in 2020. Nothing provides a pkgbase binutils package any longer. Fixes: 1c0ea326aa6d ("Retire obsolete GDB 6.1.1") Sponsored by: The FreeBSD Foundation (cherry picked from commit 1e4cd5ed54d73dcb8e9af92990e7bf005b9a5710) --- release/packages/binutils.ucl | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/release/packages/binutils.ucl b/release/packages/binutils.ucl deleted file mode 100644 index ff2710862e03..000000000000 --- a/release/packages/binutils.ucl +++ /dev/null @@ -1,17 +0,0 @@ -# -# - -name = "%PKG_NAME_PREFIX%-%PKGNAME%" -origin = "base" -version = "%VERSION%" -comment = "%COMMENT%" -categories = [ base ] -maintainer = "%PKG_MAINTAINER%" -www = "%PKG_WWW%" -prefix = "/" -licenselogic = "single" -licenses = [ GPLv2 ] -desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 95a7c6f18a6a - stable/14 - LinuxKPI: Queue skbuffs at tail in __skb_queue_tail List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 95a7c6f18a6a28cf866384ff60b587ec30be1cd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=95a7c6f18a6a28cf866384ff60b587ec30be1cd1 commit 95a7c6f18a6a28cf866384ff60b587ec30be1cd1 Author: Tom Coldrick AuthorDate: 2024-03-02 19:22:55 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:33 +0000 LinuxKPI: Queue skbuffs at tail in __skb_queue_tail Correct skb_queue_tail to queue the buffer at the tail of the skbuff. The skbuff is a circular doubly-linked list, and we call with a pointer to the head of the list. Thus queueing before the head gives us a queueing at the tail. As a motivating factor, the current behaviour (queueing at the head) was causing frequent kernel panics from my RTL8822BE wireless card, which uses the rtw88 driver. Interrupts can cause buffers to be added to the rtwdev c2h_queue while the queue is being drained in rtw_c2h_work. Queueing at the head would leave the nascent entry in the linked list pointing to the old, now freed, memory for the buffer being processed. When rtw_c2h_work is next called, we try reading this and so panic. Reviewed by: emaste, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44192 (cherry picked from commit d3befb534b9c8cd80f1b8d75ce6451e3f62b8ba9) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index f8ce212e7853..02190a29e241 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -567,7 +567,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { SKB_TRACE2(q, new); - __skb_queue_after(q, (struct sk_buff *)q, new); + __skb_queue_before(q, (struct sk_buff *)q, new); } static inline void From nobody Fri Mar 22 14:00:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1P9T1DsNz5F10N; Fri, 22 Mar 2024 14:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1P9T0RTPz4FTb; Fri, 22 Mar 2024 14:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711116029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FjwFzXZxPP/0Znsis/EG3zCWsrFN6xp5Eh9qfzgKv6g=; b=dA2Oo9BJ3YpPCGtd6GsrEg8uILhdt4ArKFrq5FLRHuaqjtE/HmvljKcblWPDYfF6rEf110 KuLWV2cSfaMS9ZmEuqIw/B6iuE8geCNoISif0at5PsHdgn1oBKRAP/baC4Q11d+V92VdMi Dcj1KoYQxv5knJ5MTiS7KsZqWr2PHamUeKvCthJ2Hn5E47umC+VHE/gXnn3o+Gwvt3NVHc lD+oa15tHG1Lo3eHiAl0ijWIL+ptIwDBLZyGm6vTjo+uvZSawI2V59ClWYZLbMks8deQ+T l7r5xf87lb+30mkjw8PsA5cmYN1oEyZ2fTh1FM6n+cmtWG7Vs2cqWmAlk5FEwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711116029; a=rsa-sha256; cv=none; b=cB4paAxuTfk3vXJ2X8jWCvZ56ZvgPdFhp1CDifI5DKrLNuPIqMd89lJLiEjwpBXKw0F3NW nq+x3yVVPXSdvxmR2Znuhhj+tlXml86XMJUy06MkNPJi9Qs56C5nMmVgan0a0MU7f7of19 Yad8Mr7Ee2Y7tAP/Z8uHD6/wnad9tqX1rOawWcC9Jh4SJcmT92OsAKqxpW989zAioTmXHe NJKlcMo4UzHQAth9nhFVwj19CULW1Y3woubhPaydRoxE02Zg2+fWQs9I2yJcOvgfOhAF4L 5MX9OQS4ElPxrE5qoLFLmdOTlVDw6JRgQG5P+TXWe91ZIuwjoiWsYhTSdiWM1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711116029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FjwFzXZxPP/0Znsis/EG3zCWsrFN6xp5Eh9qfzgKv6g=; b=ap0Aq1B62bTPTWglnDrEvYgYg87AUbj7liQAB34POg4FhKcl+15AosAznXof0Pwa5kFqhq 5jh2kES6204zD60PxhbqmeSrurKb6CR4P369PeTrhxvNBiV9Q8/jqaRPEsmBs3ZbE64uTC Hx3NgM5fcf0YlOfGHXj1hbC4+xhQzKWalEsO20GgF8jceiXKnOBh0IbHbZ1p9cjLaP16OI 1Xg9xoySnuke/FUvxI7vZwXGHcNa6HOuDsPRJjomtQFgdG5RF76tcs6iGLJVwsGE/HBG+W MJfClb9zgrB0a/pVd2PFFTOmrBSauaJlsX7uUBx5Ki+fqaTaPqlxvDrfQPl6Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1P9T02x9z1LhC; Fri, 22 Mar 2024 14:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42ME0Sdw048232; Fri, 22 Mar 2024 14:00:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ME0Sm3048229; Fri, 22 Mar 2024 14:00:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 14:00:28 GMT Message-Id: <202403221400.42ME0Sm3048229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 163286a86176 - stable/13 - LinuxKPI: Queue skbuffs at tail in __skb_queue_tail List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 163286a861761d54ad0943de70d87cb544200f45 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=163286a861761d54ad0943de70d87cb544200f45 commit 163286a861761d54ad0943de70d87cb544200f45 Author: Tom Coldrick AuthorDate: 2024-03-02 19:22:55 +0000 Commit: Ed Maste CommitDate: 2024-03-22 14:00:02 +0000 LinuxKPI: Queue skbuffs at tail in __skb_queue_tail Correct skb_queue_tail to queue the buffer at the tail of the skbuff. The skbuff is a circular doubly-linked list, and we call with a pointer to the head of the list. Thus queueing before the head gives us a queueing at the tail. As a motivating factor, the current behaviour (queueing at the head) was causing frequent kernel panics from my RTL8822BE wireless card, which uses the rtw88 driver. Interrupts can cause buffers to be added to the rtwdev c2h_queue while the queue is being drained in rtw_c2h_work. Queueing at the head would leave the nascent entry in the linked list pointing to the old, now freed, memory for the buffer being processed. When rtw_c2h_work is next called, we try reading this and so panic. Reviewed by: emaste, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44192 (cherry picked from commit d3befb534b9c8cd80f1b8d75ce6451e3f62b8ba9) (cherry picked from commit 95a7c6f18a6a28cf866384ff60b587ec30be1cd1) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index f8ce212e7853..02190a29e241 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -567,7 +567,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { SKB_TRACE2(q, new); - __skb_queue_after(q, (struct sk_buff *)q, new); + __skb_queue_before(q, (struct sk_buff *)q, new); } static inline void From nobody Fri Mar 22 18:40:14 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1WNG5jXqz5F3sl; Fri, 22 Mar 2024 18:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1WNG3cXLz4rll; Fri, 22 Mar 2024 18:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWNIYnnbUZxwZlnz/kclxKTIxf0SCz1fg6LEA7eUrr8=; b=QG+M/JtPEMRtFzQfu5SOIe1nR203HIBGD4nAn50XuFjH+F30PlHm/6qdh4rxyIZ7g1k/T2 C865jsUZGc/BSZjwMU0YSjJ8avY1CEXGI5RQVbafJl/BgYTUcYRz+Xf4qARw1R9ZoFo2HT VD2SiFJF3EKp2wBYr9Wi3kePNO+SbUR1aIPEu7PX3PhgTj4Wg7rVr7XSHBVzd0+wu1I/rC S5M02D1dKLHq4TwXaq+TERk2Jh/MatB4NTZSx7dDDar07rk0/Tj13C1vzTiES+hOhZqRm/ 1Bj2dZeQhD1efVlZrQz9mdZZzyHjcnd6PNcBIgxLXsQRFh29evDI3ZRBMBDSnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132814; a=rsa-sha256; cv=none; b=AQUdXuQ9vyW3kLt+frdlccIB8fhdg0J+nnjTduLmzizMClzwQrqLsV7hYz//x8oAA0E/ta RaktsCY6b1pKBFTHWsX10sIUUaBJzWXJaO1CmKj0S4iJPi07ppvYG4hJfdNzVjnPpF+HNA E/qkO9WQDP70AREa82/erAkwt/SyUyCkLQDjhx3Pjsf7OJOe1a0ddjd4RonCCxa87m62A8 OAzNgtyKDCohPFEer5WjFUgGW4ut4fBaK+3ndy8IoUQtFoR0OgGUNeRFqLdaXaOgDbRHkh nAufShH4rltuSb8prUxSXPXcG44vxuItOJJi371o/cFRpY/jo84KJYHUxtLH/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWNIYnnbUZxwZlnz/kclxKTIxf0SCz1fg6LEA7eUrr8=; b=riSWgTAjbOl/BQjr8Z5HhWSeIFCEzk0ZPNuS/NgRR4OVbHGNLKCP3TKgB+Qvcj6fgSV71T fyQ1Iv6YTV+TYTmexYEDtbN+43L8gvVTiVgcyj538Md+A98T04bdlQqDX1xEqKxHF9JIKC S1lcRSg1PoXscKr1y2AFF/rjr2sRCzh5wwGyYr31s7BLM0mrzHGeEUvNYRKPHV7O9q0Svz 7vUGM425rzK6dpWJnCnJehztw6JEtofbvXbcFnF/y3SMEkWRkj32bEhLR+lFiG75PxYH2R uMgDFCcvJ+IC96ceAJpwaQLsygMZ+xWcXnsrY6QaogEJEhw5QqvwnXCEc2Nmaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1WNG3DvFzFpt; Fri, 22 Mar 2024 18:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MIeEhN019819; Fri, 22 Mar 2024 18:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIeEKr019810; Fri, 22 Mar 2024 18:40:14 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:40:14 GMT Message-Id: <202403221840.42MIeEKr019810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 806e51f81dba - stable/13 - if_wg: use proper barriers around pkt->p_state List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 806e51f81dbae21feb6e7ddd95d2ed2a28b04f8f Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=806e51f81dbae21feb6e7ddd95d2ed2a28b04f8f commit 806e51f81dbae21feb6e7ddd95d2ed2a28b04f8f Author: Kyle Evans AuthorDate: 2024-03-15 01:19:18 +0000 Commit: Kyle Evans CommitDate: 2024-03-22 15:21:42 +0000 if_wg: use proper barriers around pkt->p_state Without appropriate load-synchronization to pair with store barriers in wg_encrypt() and wg_decrypt(), the compiler and hardware are often allowed to reorder these loads in wg_deliver_out() and wg_deliver_in() such that we end up with a garbage or intermediate mbuf that we try to pass on. The issue is particularly prevalent with the weaker memory models of !x86 platforms. Switch from the big-hammer wmb() to more explicit acq/rel atomics to both make it obvious what we're syncing up with, and to avoid somewhat hefty fences on platforms that don't necessarily need this. With this patch, my dual-iperf3 reproducer is dramatically more stable than it is without on aarch64. PR: 264115 Reviewed by: andrew, zlei (cherry picked from commit 3705d679a6344c957cae7a1b6372a8bfb8c44f0e) --- sys/dev/wg/if_wg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 89b5e52b7b2b..6638524301b8 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -1519,8 +1519,7 @@ wg_encrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_send); noise_remote_put(remote); } @@ -1592,8 +1591,7 @@ wg_decrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_recv); noise_remote_put(remote); } @@ -1649,7 +1647,7 @@ wg_deliver_out(struct wg_peer *peer) wg_peer_get_endpoint(peer, &endpoint); while ((pkt = wg_queue_dequeue_serial(&peer->p_encrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; @@ -1691,7 +1689,7 @@ wg_deliver_in(struct wg_peer *peer) struct epoch_tracker et; while ((pkt = wg_queue_dequeue_serial(&peer->p_decrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; From nobody Fri Mar 22 18:40:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1WNK3LJBz5F4BD; Fri, 22 Mar 2024 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1WNK2TVRz4rvD; Fri, 22 Mar 2024 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RLkmp0rQv8aIxdp9Dn+bEyfb5v+z9h52PLnxG7AAsA0=; b=MeCeuOJPHlL2XTHZRPlP86cIWTjuQzAgnHwkZnOXx+Qra7tY3/PezvB4F7wYfTEtBdf4Ot 2Stx0D/GAWT5RiFKTvK4U2p/CrI2IUwoo+NAyEJWLqD1T+C3C3uA3J6y9GIPk+mn+Tqdmn LVEDUaTm73lnaviXY9cOSdBu+Auqcbanx/aAnjHyEbigrBfNLv2UR27X3rqPubfGmyX4Ra x919+NyXFRRvjIkFXme5zXzDG8ck8sfmx52ZjzH3DnvR/Gk/wNo1COcoC2z+1cSOIecx63 +BcRIMBujibhaGo4HeyaBizb6LixK/JBGZb1Zmcw6do1LcrCUaI07bHSJJkdLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132817; a=rsa-sha256; cv=none; b=YXO7NvcJAe3gUcB4NllotX54gbxuAQHnMBv9UNRg52gIKeWFXj1tPrM37YyK5f5ZmCDl+6 pr1yOxcSpAzavb6qLhas2LTpDC2ujoNlyL6pTz5hS3RGoegSxtwWpeTLAYSoZzDEtdghlr uD9YY22Jm9ojf9BNi8831lxdHR4WnFnCqh4aYR+V62MXT/1XZzUtZzYkW7y8Kwbzxs7lYW dFHJ9BA6YicePicOMrHOBM21b2dBXXhumJtUk20FQkBV7ntMpLsSyhAWX9sJTVUINcqu71 f/0AMzgou2ItGhkTkJ9PSdxRKho88w5rUNZg1SgObkhQ8UnPbfmIhHNyabAfeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RLkmp0rQv8aIxdp9Dn+bEyfb5v+z9h52PLnxG7AAsA0=; b=uU2xgjH8Eoo98VY/iGRWNSqTYudgkkD9eq2I6PhIPzdFdPWPUV2zAMdBpgQuRJ//JKj27d HtPbrH99lzYmj0YLxtE19G7yeFxH4vuBVeliWRgLQ5K7ZmMr9sTUUCYIBbrQ9hytLMNvAu vOR1bzLjBOXhVOh0UBCL2W6k+LIQQ+FlUqu/C+BJBUXo7mM45rr9e2E/k1ii8HshJtbXsR nKw0YqsPOkct77L8Fl5Fl/IRKGAahSNrlTtZoZ5JPx77AqEctplKD+zE9FgxdGyWzy+gUp gjxF91fz0ziF1SF53DZ27eYGCy3UrFfRdEcDQrCIhmFORVTjpbWAUkvKvYokhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1WNK22G6zFnM; Fri, 22 Mar 2024 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MIeHlx021561; Fri, 22 Mar 2024 18:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIeHce021553; Fri, 22 Mar 2024 18:40:17 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:40:17 GMT Message-Id: <202403221840.42MIeHce021553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 590e02d3c088 - stable/14 - if_wg: use proper barriers around pkt->p_state List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 590e02d3c088b220c19d53ce40a5aecc6fa099e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=590e02d3c088b220c19d53ce40a5aecc6fa099e4 commit 590e02d3c088b220c19d53ce40a5aecc6fa099e4 Author: Kyle Evans AuthorDate: 2024-03-15 01:19:18 +0000 Commit: Kyle Evans CommitDate: 2024-03-22 15:21:39 +0000 if_wg: use proper barriers around pkt->p_state Without appropriate load-synchronization to pair with store barriers in wg_encrypt() and wg_decrypt(), the compiler and hardware are often allowed to reorder these loads in wg_deliver_out() and wg_deliver_in() such that we end up with a garbage or intermediate mbuf that we try to pass on. The issue is particularly prevalent with the weaker memory models of !x86 platforms. Switch from the big-hammer wmb() to more explicit acq/rel atomics to both make it obvious what we're syncing up with, and to avoid somewhat hefty fences on platforms that don't necessarily need this. With this patch, my dual-iperf3 reproducer is dramatically more stable than it is without on aarch64. PR: 264115 Reviewed by: andrew, zlei (cherry picked from commit 3705d679a6344c957cae7a1b6372a8bfb8c44f0e) --- sys/dev/wg/if_wg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index c324b5fb048b..25fa53c2e672 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -1515,8 +1515,7 @@ wg_encrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_send); noise_remote_put(remote); } @@ -1588,8 +1587,7 @@ wg_decrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_recv); noise_remote_put(remote); } @@ -1645,7 +1643,7 @@ wg_deliver_out(struct wg_peer *peer) wg_peer_get_endpoint(peer, &endpoint); while ((pkt = wg_queue_dequeue_serial(&peer->p_encrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; @@ -1687,7 +1685,7 @@ wg_deliver_in(struct wg_peer *peer) struct epoch_tracker et; while ((pkt = wg_queue_dequeue_serial(&peer->p_decrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; From nobody Fri Mar 22 18:43:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1WRj6vwFz5F4gH; Fri, 22 Mar 2024 18:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1WRj65nfz4snF; Fri, 22 Mar 2024 18:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POI/p/ja7DDIPakQ/G6a7FP3D8Td/2enYlA3jxkJq78=; b=GXIQdlWgYzeKOYntN65NVod90JgQw92Zf1MOP3WOsZh3kISyJAtPGlg7yTHW6hUajvuAHJ e3QLZ6+rWSedrgCSS4CNkR5nyvao3xu5SiFsWl18Qa0efPVmG1k9r4UIKJ9XecT0UgIY/v yukfZHHw9jvBfpXaKQbZGGy9orTPYpG7ybV7cC8a2orEZfCD6WNUWgdh3HyLOdtzTA+u8I fNYARGAeN3dsY8WyMbcwz8s5XH76F71vSIQd+BYL7MT9rgPTlIzNjlYCU3e/+JfKbupzvV kN4NdwXTx395kApmFvTR2rskrCpCQxhyT1XVPohSDub1I+hfNZslkbZGFWw3Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132993; a=rsa-sha256; cv=none; b=kuEg9vspbZi3wa8B67o8bcPGlD4iFAKBm6HsKtz3kJUOOWtad/jBmHP1O/J9kgke76lGTT pe1u4/HylMNWgZXu6ZM5VogyXALZQ2VXnA3OyWLRDfaqDHyeUWV4/ALD50c4zWUDFUEUGN UZ1mp4Hh5+9Cz3dhGwcoPeUQtIT1pFy9OptkprHYTbkD8s1KdO6Cm03WE8iFqZf8E2PUXh OitXo1FQeQFMEXjxeDLfNcEQsfN6FfjjJLp8AGoI6WF3aR50y8XsiWzHNln+9cuYtMMjqE NlUQVEM55huhm8D890JW1Iy2u7ofld+fc/EhX3pUutRADnzDoup1odtX6ZpkeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POI/p/ja7DDIPakQ/G6a7FP3D8Td/2enYlA3jxkJq78=; b=E/MgFbZgRaaniDx1x559vDj9FzBe2Lk4R5XaN6dlbK+q8Mdk3DHlJvf2qiV+eth79sfQlz Lx9NxSQqcLvw0TNOAPHsaSeZBX/IFa7Jnkbp3Bd35Esv9nloGeK769FviGGi9mk3N2K+a9 CY9PstRXi+/bIuruDHfgMuk6JkDHqX2sEDSNcPRJeJmzeASzwNVd19JlmECLUiacm4E+3I gkgQ+80pvejTGwhmNdw4ryjtaiHludkmZ8Y5tS8O12V6ZziM98LKPOBMeApuGPXegXtOHr gAa2AETAPVAojAXuT0rShEw9qRHiawWc/HpYHj1ZGLN1gf4kUP3qwOp+fjUIKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1WRj5g6WzG8t; Fri, 22 Mar 2024 18:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MIhDox029279; Fri, 22 Mar 2024 18:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIhDrv029276; Fri, 22 Mar 2024 18:43:13 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:43:13 GMT Message-Id: <202403221843.42MIhDrv029276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a323dd42bcac - stable/14 - bsdlabel: limit to 8 partitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d commit a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d Author: Ed Maste AuthorDate: 2024-01-23 02:05:58 +0000 Commit: Ed Maste CommitDate: 2024-03-22 18:42:59 +0000 bsdlabel: limit to 8 partitions bsdlabel is intended to support up to 20 partitions, but the disklabel struct has a d_partitions array with only BSD_NPARTS_MIN (8) entries. Previously, an attempt to operate on a bsdlabel with more than eight partitions resulted in a buffer overflow. As a stopgap limit bsdlabel to 8 partitions until this is fixed properly. PR: 276517 (cherry picked from commit 3f4f82c0d7791bddf2d6f2c29d9f2f8c48c712e2) --- sbin/bsdlabel/bsdlabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 766def59ffe9..56190bbf6858 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -63,7 +63,7 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; #include #define DKTYPENAMES #define FSTYPENAMES -#define MAXPARTITIONS 20 +#define MAXPARTITIONS 8 /* XXX should be 20, but see PR276517 */ #include #include From nobody Fri Mar 22 18:43:14 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1WRl14FLz5F4gK; Fri, 22 Mar 2024 18:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1WRl0HbVz4sF0; Fri, 22 Mar 2024 18:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rm9YPEMLFUuygOzbxBYedEH2ZUt5t+TxGk25XF19ByU=; b=hi9y2kI6CgYpPNjHEzKBy+Xqos8Rq6R5vRKrp/OiW9VC7zswSvjMdJgJg5vxfvuLdWD1R5 EE/pmdYN/4XGGFZ3VGkmCVYH/XiBKvHuNURz7GjdoIZPpvH+2PTNGCagjkNW5WZPwici0F R8+kwtk/f9w1oBzo+Ysm0AV+TCSWtpbdE9tqpA3BpxvvS0BjPT4MBTgOXdZoPxX2eS3Mqa S7RVrAm3bb9hLFYqI3rvMdzI8/Y1WbaHGf32Z4gDNxbFsdbvHJ7UPBgVz8xVO0iZCkiBdK w+gBFsZ1M0I05/1t4uXod9uckJvT+6zMhy/OMrO6lgnEdEMlOYhQRujcZMnu3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132995; a=rsa-sha256; cv=none; b=bxmyZHLblvdpZHXHXRSGilW1Qv8ZOZDs6L19+uEuNuamzlJTLcjpsV4Effkbad5sOh4fRZ f3HED4GMZMCJE9N1af+qt3kYGghGVhVweZIpTceyo1UxjCyR1cyqOYgB54d/sv+XKjlpdd ff6wY4iv61EIDVKYFRrowLiPZzT4JbsEDqdD4A2AUlQ6mTjTnGngfkJOFC8bLYqIjuicy7 zVjpUAQAlOeyan+ZkGY6ui+cqPexDF1658dRAHr1Q3xjLyw6m/72zCzSJaUmrQPq70leXZ Lg19mJUqmnijIIOLU2+dChVtrT9GP0MF2X2tK7zgRyI31xlQthPW4JsqSSkLmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rm9YPEMLFUuygOzbxBYedEH2ZUt5t+TxGk25XF19ByU=; b=mteSWowGjAocBPJxbnmoKK7eWqV3LAoo77Ud9Q7soE/NBvb4/OjrMbVG4GyjJ6GtFVCdeS 8u4HMfS16EEZRQHi7TeuKORsLEwTI7KgoHSXHldgjawufto2JfmyIt9+SDmp2asfSY8MH0 RhpUn/xJaK5ObCgYZNalUcWgsK340BM2z3eRQm6prqcNgpLNCYd8LHIIHLtgP7EAnv8ksx bfKWJppgqlN9pgjB0wvvgp5VvTz1RfdK8jwxTE1CqpWlPWuvGxbz9LcPexUNCsZfkh8VwS lh3Xzwmrlh2KBurAFMJcmAaKt6w4z4r+4Pl0ED5W/FKrpHYHEcVeOS8mNs9hZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1WRk70kxzFsX; Fri, 22 Mar 2024 18:43:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MIhEvV029339; Fri, 22 Mar 2024 18:43:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIhEKt029336; Fri, 22 Mar 2024 18:43:14 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:43:14 GMT Message-Id: <202403221843.42MIhEKt029336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8e402178193f - stable/14 - makefs: warn that ffs sectorsize other than 512 may not work List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8e402178193f7b273a956b864d8d8b288ce62ee7 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8e402178193f7b273a956b864d8d8b288ce62ee7 commit 8e402178193f7b273a956b864d8d8b288ce62ee7 Author: Ed Maste AuthorDate: 2024-01-25 01:47:36 +0000 Commit: Ed Maste CommitDate: 2024-03-22 18:42:59 +0000 makefs: warn that ffs sectorsize other than 512 may not work newfs always sets sectorsize to DEV_BSIZE (512) and derives some other values based on the number of 512-byte sectors per real sector. Similar logic is required in makefs. Until that happens, emit a warning that the image may be incorrect. PR: 276571 (cherry picked from commit 176b9e0d724b4c1a24d2c46a1256381784f04edc) --- usr.sbin/makefs/ffs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 597379cc1a4c..97c1d6ccefda 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -340,6 +340,9 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts) /* set FFS defaults */ if (fsopts->sectorsize == -1) fsopts->sectorsize = DFL_SECSIZE; + if (fsopts->sectorsize != DFL_SECSIZE) + warnx("sectorsize %d may produce nonfunctional image", + fsopts->sectorsize); if (ffs_opts->fsize == -1) ffs_opts->fsize = MAX(DFL_FRAGSIZE, fsopts->sectorsize); if (ffs_opts->bsize == -1) From nobody Fri Mar 22 18:45:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1WVF1hKsz5F4dH; Fri, 22 Mar 2024 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1WVF0sTFz4tMs; Fri, 22 Mar 2024 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711133125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HFImihndat1Cn6QTkhlcg/aL+zuA4O35uyRJOTLRaI=; b=pvNbEctlqUs3KvNndKVfuimlZnnHNY7Q5RSK7oHydX7az3Oyin1Y6lygWvPCJRa3WjIs8S 5iHKmJd52FnDgQLjqhx0pN0nQI/gB+yk0W63qMn3iSlzRIWaEl81O7jCMgq52NRgh1+dev bWGJmk8ZSePTKtA4MwArVP5AhEg32GTFgqh+LAyMj/7C5rJoV83e5fxhtC2+E+vW8daMcY Rs7RcPPtMrmN1aGYi2H5rFLBe+lF7SFTgCvx3//vTKmrNCqbBNZHdbCY9+4UBvfykB4NbK d4qP/yXt1Wy9thB0YUBh4kHVZbarC+8eoThStUm2uruKPd0P2NxwiRa26kWdjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711133125; a=rsa-sha256; cv=none; b=ooqQ3YKX97kgT95gPaZ9ONx9nZCXkW8vKp6BdgYg/W+Bqh06MeVaXnRK8w/LgyvOsGyA2f yd7ZnhIKeO7HUvpbdd6dy5dEjnh+TcXnRWRuCsWJtm/vohXGONRNk5IxsuIwyyyUjKtHOU srQ90i1SF5TfUNAXTwWXQuv0izgHyEbzZuykSEpjZbMEnybxXrVNFrNBHzDNrsBOvFIqC6 XlF6xIjn3+stO5YtsoC5rRnANvjTo6/8ldNKlGq0rFqbyVksaytATUWNJ8BevMZjKwu+Oi 8DBLqeoL1LRT3xvzgBdirjbH8QjpHygDYC/LENEurI09906TzRkJmRPrKi1c4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711133125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HFImihndat1Cn6QTkhlcg/aL+zuA4O35uyRJOTLRaI=; b=xV99o84Zdo0B/4P/HCsNH7U6vE15aMOV05vuS7RpXNImUn2lKQvFSi8gCvgAoOcBDsBPv3 J5qJUquP6/ciVLvRC96iPwBQirZ33TSH3LP3Y1A76VQr3WU055MPjD9imlEq3s+i/gt8qA zV1AXavU+0N3YlGGaLQMQnhmVDLqiErNrc8dT9qyB+tkoiqlaUb7+yIK57oEpHH6G9ucbG 3jtMkiNgPB/0Wz4vNebvF4whNRY8YRBC31dyotxpPj4cfsjUzAcOgmHinkIVI8j/tVkxa1 PUr1n2PD7QntgGt4cP0HDzwAFkMtVieVzzOHQdl4Ov5Zs0A8R8Q6ilDRGFL5Ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1WVF0TmyzFyb; Fri, 22 Mar 2024 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MIjPgH029960; Fri, 22 Mar 2024 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIjPaB029957; Fri, 22 Mar 2024 18:45:25 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:45:25 GMT Message-Id: <202403221845.42MIjPaB029957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a59eba2caacf - stable/13 - bsdlabel: limit to 8 partitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a59eba2caacf82f741e8bbc334b2382c615744df Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a59eba2caacf82f741e8bbc334b2382c615744df commit a59eba2caacf82f741e8bbc334b2382c615744df Author: Ed Maste AuthorDate: 2024-01-23 02:05:58 +0000 Commit: Ed Maste CommitDate: 2024-03-22 18:45:13 +0000 bsdlabel: limit to 8 partitions bsdlabel is intended to support up to 20 partitions, but the disklabel struct has a d_partitions array with only BSD_NPARTS_MIN (8) entries. Previously, an attempt to operate on a bsdlabel with more than eight partitions resulted in a buffer overflow. As a stopgap limit bsdlabel to 8 partitions until this is fixed properly. PR: 276517 (cherry picked from commit 3f4f82c0d7791bddf2d6f2c29d9f2f8c48c712e2) (cherry picked from commit a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d) --- sbin/bsdlabel/bsdlabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 7c7a5bbd6219..5f45039caecb 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -63,7 +63,7 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; #include #define DKTYPENAMES #define FSTYPENAMES -#define MAXPARTITIONS 20 +#define MAXPARTITIONS 8 /* XXX should be 20, but see PR276517 */ #include #include From nobody Fri Mar 22 19:03:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Wvd2mKsz5F6lQ; Fri, 22 Mar 2024 19:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Wvd2DdSz3xRF; Fri, 22 Mar 2024 19:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711134237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R08ZrKeDjt6zwzCusguKf+2DtIgHFR501IY7TV3xui0=; b=vgglr9d2Iz1xTAh4+tbxkiuj7/MZtpc1fK+jCTxRIOEWad7HBVkjTar39mK7nqajp91xlh dx7YmE4JjW0l40F0FPsN53wlywmv4n7pP8E15KzPKwAWbw3i2lQUCVIGEuNvP26eLmvtjh o2lDbZsne979/Dv4vIGFq897h6Ca2AnwOrQw+aR4Dlfih/81lYL7eSryKQdIYcnGvcP50G jJZmhSuE2WLCKx7ySBjTSqLxk9c1cemn/sZrenUyLylWj/tzgxjZw4b5djWB2uM++Y3Aip FZlRjD5rCd8MTCe8drNN3dpVJ7LmKZNCxCyU5AH/RIzEgwGxxSjYIXlGVtZAJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711134237; a=rsa-sha256; cv=none; b=b4edIzKHwBxrwx6WS7U20b3ievknMyCyT5zU2dA6OdCxzDKfjpO71L7Q4snr2EzhQcyMsc y+L76TSbcd+tg0mQ+DCznH0Rua3EcCd5Jhjag57ONZTzAlSxeGcZFMuY4iQUvxdi5u7Gsk UMhFbvXde4aX9Dk7LUcX3iWEkhn9Vwq/b0HbJWmp/TWyX1GpCsCXOJYK4YYX07FhFpXJof 4WjUS/Pxh7f4d5iPjQH1YY1EWrvEJYWZK00lWlDkhJv8m75QUuAjWhgIJqHnS0t4IiKnrZ fKE7+yiQFmglVBGa2Z1GDwc6U3TFJBU88x4b/Tna/16kbSO/6VkekwRzOVfpfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711134237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R08ZrKeDjt6zwzCusguKf+2DtIgHFR501IY7TV3xui0=; b=vlbKk6lorL7fRbo5qECR8DhrxU7Op8eG8zETYWhwF75s7DVYOS8TIkXDumjJJ0LORNOmaF ITTwx6T3r05fTYVhjQuL2ntd2uB6fmbgariXqB6/z+0uaAWKpc+J92GzKJVO/0qCz+YjJZ cDUR4UieLpI9QHaAp18huxL4ioa5FGWrpBLeo5s0ee3leiaxu6v9scnFPjVBUJzQmPISYZ bLalMGmdH9Iu1rJRH4ytbNcFBwSBUoYZCHgMHyzAQ0cJDEXwCEvM9v2aRtRGgWDT2IuUvF yqoneB4+VPk/s/t/ljccowFkZJKUd1qbpd9+aylI8riOaw6+xaIlxTQU8i8gFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Wvd1r2XzGSj; Fri, 22 Mar 2024 19:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MJ3v1j064428; Fri, 22 Mar 2024 19:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MJ3vGI064425; Fri, 22 Mar 2024 19:03:57 GMT (envelope-from git) Date: Fri, 22 Mar 2024 19:03:57 GMT Message-Id: <202403221903.42MJ3vGI064425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0459337491cd - stable/13 - makefs: warn that ffs sectorsize other than 512 may not work List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0459337491cdfdd752507c0d2722999a6a9781ef Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0459337491cdfdd752507c0d2722999a6a9781ef commit 0459337491cdfdd752507c0d2722999a6a9781ef Author: Ed Maste AuthorDate: 2024-01-25 01:47:36 +0000 Commit: Ed Maste CommitDate: 2024-03-22 19:03:48 +0000 makefs: warn that ffs sectorsize other than 512 may not work newfs always sets sectorsize to DEV_BSIZE (512) and derives some other values based on the number of 512-byte sectors per real sector. Similar logic is required in makefs. Until that happens, emit a warning that the image may be incorrect. PR: 276571 (cherry picked from commit 176b9e0d724b4c1a24d2c46a1256381784f04edc) (cherry picked from commit 8e402178193f7b273a956b864d8d8b288ce62ee7) --- usr.sbin/makefs/ffs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 7504d6653180..cc83f2f2d3d2 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -340,6 +340,9 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts) /* set FFS defaults */ if (fsopts->sectorsize == -1) fsopts->sectorsize = DFL_SECSIZE; + if (fsopts->sectorsize != DFL_SECSIZE) + warnx("sectorsize %d may produce nonfunctional image", + fsopts->sectorsize); if (ffs_opts->fsize == -1) ffs_opts->fsize = MAX(DFL_FRAGSIZE, fsopts->sectorsize); if (ffs_opts->bsize == -1) From nobody Sat Mar 23 12:07:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1ycQ3qnZz5FJ7T; Sat, 23 Mar 2024 12:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1ycQ2x5wz4pny; Sat, 23 Mar 2024 12:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjxoCE5yRWfJPm4Y5ivaVb6GYHskSp0YVASelRNQERU=; b=GtlSpPs7/qWEv8SS9E/58RFPjw/EC7AoIoXHV7lmcD69DqK1UWY1eHOrZfnn8A8GT5np+T YQGiRlkRh4g9lMiKesHnRaWHufKu0Lr1MhKSydP+QgWOLaAGcZUFTX3oAEK66RLh9a305A 8JeGP71uRrQxOHoKTJz6L1Q+fDRkmk9qP60DZ5ecq86oU19ELjUR78q3H89mxtmMHCJ890 ab4OwQOiIC4YQDB1Ibh42QdgQ/P9/IacifiiBBsFQJeJgXe9CW0ruHnPc/3czxk1ofmVtt 9QJ7FO2ysBfJMekB+nofHUQ1WDj4ZgoOGJQ9yfm8sYNnWA4PpMAQihTbxqmI5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711195638; a=rsa-sha256; cv=none; b=ieiNWlwjQBuAwiMN/0PgoWfh2KhVwZl1jOMTsLjROwaRl0EvbaxLXuAXTOsfwC+87+G5hl ceA8k7JhgJHcNVnR041fU0yXHPRHsZGw1Ikmmj+vZe/TIlD2YDohq8/FtD3eA4IElxFDy3 NYJ4EZSClFq/LDyK7dNIdkC++zScdJyjChTLns3UDrSiCUgJmPBjJGAGo1ylLrp50cdxDi eckCcIUbcIkD7YEERGChKrNGzymzP54K+8CfycWcos4R394MnD5Y+3e/+IQ/PrfEKteIhD wH8+1dky9WgEOolcrCsN5jU+9Vw8kMzzMkyFBCqDuX2K8iWFtK5oDCALNSyZYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjxoCE5yRWfJPm4Y5ivaVb6GYHskSp0YVASelRNQERU=; b=NZBABBV3sIjdSol8cj0sG1TW1DGD33ZPdiruZmf96d4oFwQk7uNEKRLFc15jXwPpQQHCvX EMBPkGHamFOtJi9LoECLrC/PihM/6OIg8itRfExXwLX0wpdYJJgOTUnfu0qKOIW2w4GT9o Ai+snDEBUqQmrZDP+K/GwKWkqPVU4PWtWgQRI0gB0YQumkD1iNfxo7kw+1k4hDgB850u9h uv/5GkLl5yGnGKigPRGHmAZhymTR9AZbofl9UB3PFo3bf3I02oIw6VTXMjaR9Ijh0R+zfx lWILdw0tYgbDHO7OASdSCWB0J7x1HA6wGrLoHOqLhczEQK0raiNyXzE2XsTaGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1ycQ2XHmznpW; Sat, 23 Mar 2024 12:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42NC7Iee093262; Sat, 23 Mar 2024 12:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NC7Ijw093259; Sat, 23 Mar 2024 12:07:18 GMT (envelope-from git) Date: Sat, 23 Mar 2024 12:07:18 GMT Message-Id: <202403231207.42NC7Ijw093259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 69da6e087983 - stable/14 - Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 69da6e0879831f1ccc5c60135ed43fcea10a933b Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=69da6e0879831f1ccc5c60135ed43fcea10a933b commit 69da6e0879831f1ccc5c60135ed43fcea10a933b Author: Dimitry Andric AuthorDate: 2024-03-20 22:39:06 +0000 Commit: Dimitry Andric CommitDate: 2024-03-23 12:01:38 +0000 Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): [Clang] Fix ResolveConstructorOverload to not select a conversion function if we are going use copy elision ResolveConstructorOverload needs to check properly if we are going to use copy elision we can't use a conversion function. This fixes: https://github.com/llvm/llvm-project/issues/39319 https://github.com/llvm/llvm-project/issues/60182 https://github.com/llvm/llvm-project/issues/62157 https://github.com/llvm/llvm-project/issues/64885 https://github.com/llvm/llvm-project/issues/65568 Differential Revision: https://reviews.llvm.org/D148474 This should fix 'Assertion failed: (isa(Val) && "cast() argument of incompatible type!")' errors when building devel/boost-libs, specifically libs/url/src/segments_view.cpp. Bump __FreeBSD_version so this fix can easily be detected from devel/boost-all/compiled.mk. PR: 273335 (cherry picked from commit bcd401b5a39c6186bb1fe450286299f2a481244c) --- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 51 +++++++++++----------- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 ++ sys/sys/param.h | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 32c9215184eb..1e9078cda26a 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -4092,16 +4092,13 @@ static bool hasCopyOrMoveCtorParam(ASTContext &Ctx, return Ctx.hasSameUnqualifiedType(ParmT, ClassT); } -static OverloadingResult -ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, - MultiExprArg Args, - OverloadCandidateSet &CandidateSet, - QualType DestType, - DeclContext::lookup_result Ctors, - OverloadCandidateSet::iterator &Best, - bool CopyInitializing, bool AllowExplicit, - bool OnlyListConstructors, bool IsListInit, - bool SecondStepOfCopyInit = false) { +static OverloadingResult ResolveConstructorOverload( + Sema &S, SourceLocation DeclLoc, MultiExprArg Args, + OverloadCandidateSet &CandidateSet, QualType DestType, + DeclContext::lookup_result Ctors, OverloadCandidateSet::iterator &Best, + bool CopyInitializing, bool AllowExplicit, bool OnlyListConstructors, + bool IsListInit, bool RequireActualConstructor, + bool SecondStepOfCopyInit = false) { CandidateSet.clear(OverloadCandidateSet::CSK_InitByConstructor); CandidateSet.setDestAS(DestType.getQualifiers().getAddressSpace()); @@ -4164,7 +4161,7 @@ ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, // Note: SecondStepOfCopyInit is only ever true in this case when // evaluating whether to produce a C++98 compatibility warning. if (S.getLangOpts().CPlusPlus17 && Args.size() == 1 && - !SecondStepOfCopyInit) { + !RequireActualConstructor && !SecondStepOfCopyInit) { Expr *Initializer = Args[0]; auto *SourceRD = Initializer->getType()->getAsCXXRecordDecl(); if (SourceRD && S.isCompleteType(DeclLoc, Initializer->getType())) { @@ -4232,6 +4229,12 @@ static void TryConstructorInitialization(Sema &S, return; } + bool RequireActualConstructor = + !(Entity.getKind() != InitializedEntity::EK_Base && + Entity.getKind() != InitializedEntity::EK_Delegating && + Entity.getKind() != + InitializedEntity::EK_LambdaToBlockConversionBlockElement); + // C++17 [dcl.init]p17: // - If the initializer expression is a prvalue and the cv-unqualified // version of the source type is the same class as the class of the @@ -4241,11 +4244,7 @@ static void TryConstructorInitialization(Sema &S, // class or delegating to another constructor from a mem-initializer. // ObjC++: Lambda captured by the block in the lambda to block conversion // should avoid copy elision. - if (S.getLangOpts().CPlusPlus17 && - Entity.getKind() != InitializedEntity::EK_Base && - Entity.getKind() != InitializedEntity::EK_Delegating && - Entity.getKind() != - InitializedEntity::EK_LambdaToBlockConversionBlockElement && + if (S.getLangOpts().CPlusPlus17 && !RequireActualConstructor && UnwrappedArgs.size() == 1 && UnwrappedArgs[0]->isPRValue() && S.Context.hasSameUnqualifiedType(UnwrappedArgs[0]->getType(), DestType)) { // Convert qualifications if necessary. @@ -4293,11 +4292,10 @@ static void TryConstructorInitialization(Sema &S, // If the initializer list has no elements and T has a default constructor, // the first phase is omitted. if (!(UnwrappedArgs.empty() && S.LookupDefaultConstructor(DestRecordDecl))) - Result = ResolveConstructorOverload(S, Kind.getLocation(), Args, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/true, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), Args, CandidateSet, DestType, Ctors, Best, + CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/true, IsListInit, RequireActualConstructor); } // C++11 [over.match.list]p1: @@ -4307,11 +4305,10 @@ static void TryConstructorInitialization(Sema &S, // elements of the initializer list. if (Result == OR_No_Viable_Function) { AsInitializerList = false; - Result = ResolveConstructorOverload(S, Kind.getLocation(), UnwrappedArgs, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/false, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), UnwrappedArgs, CandidateSet, DestType, Ctors, + Best, CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/false, IsListInit, RequireActualConstructor); } if (Result) { Sequence.SetOverloadFailure( @@ -6776,6 +6773,7 @@ static ExprResult CopyObject(Sema &S, S, Loc, CurInitExpr, CandidateSet, T, Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true)) { case OR_Success: break; @@ -6921,6 +6919,7 @@ static void CheckCXX98CompatAccessibleCopy(Sema &S, S, Loc, CurInitExpr, CandidateSet, CurInitExpr->getType(), Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true); PartialDiagnostic Diag = S.PDiag(diag::warn_cxx98_compat_temp_copy) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp index 394006a57747..7bf228851de2 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -790,6 +790,10 @@ void Sema::PrintInstantiationStack() { Diags.Report(Active->PointOfInstantiation, diag::note_template_nsdmi_here) << FD << Active->InstantiationRange; + } else if (ClassTemplateDecl *CTD = dyn_cast(D)) { + Diags.Report(Active->PointOfInstantiation, + diag::note_template_class_instantiation_here) + << CTD << Active->InstantiationRange; } else { Diags.Report(Active->PointOfInstantiation, diag::note_template_type_alias_instantiation_here) diff --git a/sys/sys/param.h b/sys/sys/param.h index 26ad5c9dbee4..b1ee17301504 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400509 +#define __FreeBSD_version 1400510 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Mar 23 12:07:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1yd501lDz5FJ5f; Sat, 23 Mar 2024 12:07:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1yd46gQLz4qGx; Sat, 23 Mar 2024 12:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNWo6BcIE7kIwM2eb1f9g1iW/Mk5LvRTI1NiJThRccU=; b=tHX+igyD+FqVhHlJlpQMMvJeY0y4lt7xRcpEUBR3tZUVTsd2kQH4Mh664yLy9eqYCxniAV BU5BR19nRyRuMtZJIl+xU9Uxgkb0+efDYUPbY8RyTNUT1cOp3g58O/iXSoG1Nn0/RxHhut +0oPg0tDOoIIb746XZUp+rjEehBY06SEXv9NnMfPcODORU/r9ihPjF5GBRF8+nQOaeixpa zb7zGfhqHZCG4Drofi3KVmpDqUgckXEMny2wI2mfse+bCMbtiG715nIrpttM9yKR7H9LIV UwW9Z+8OYT/eI+2leYa6KZK3v+2Qn14NsUIlJUMuxfLuRdh17iSCY0AjL8LytQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711195672; a=rsa-sha256; cv=none; b=sEcGY7PxWxXYdiNSPnUsd/7SN3SaavVHwmCqDgFNstwuiT95/jcEnI4togivC95VMc7+NJ NHbjz3jbgHIMUlTjElOyzfHpgIEGLWZ5aWDF3Ftexly2Pi0lV2a31iqMLh21WFkdFTfYR5 Is4UAs1tPXsG3ZrRv2dDz3r28MTX5ULF7uslsmTdt1tv6tDARPvgDUHbbuqPXfMTEvGxs9 8mwk8ddJOpqoECMRXXc8uf6i4oWA3BJi6dKcypCKBHQApYn84XqxBspHKJTNTux/ac3YDd h1Feg1h9J86PxbkY6amyjLzrbMv8cC2MW9VnHT/DSiZdNvqefVQB88rhTP8D8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNWo6BcIE7kIwM2eb1f9g1iW/Mk5LvRTI1NiJThRccU=; b=k9oh2fyf3fNCBgpXwAiB36UrUtlFZMPygB6cH3GtuksuyfNSA+o3goVSqFIJxYsE32Jbzh mqH3ukCY0F0IaO2AWla3BtMo1ZLKkdHy00Di48iJnj/qKnXR+pfPTZoj/LMToR62lrMM0y VPJHvZCrjCOFUm75lsULyWJ+S5yyID8Dl5ppH+8pBVqCPuRLcQdyHGbjmV0vAzIgi+b4qd W5mkxoGfQGxRqtLkHKTYWfNxc280gsMgBneLaUGjwWEm9+LCrIDlRWH7oPVWKjl8tWwJDC stzXW85D6zzOTG+E4ObolQVfrrBpcfWFInKlES2XQAw0eQ2IwSGKMeJoD6fQZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1yd46GnxznZD; Sat, 23 Mar 2024 12:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42NC7qPA093477; Sat, 23 Mar 2024 12:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NC7qhe093474; Sat, 23 Mar 2024 12:07:52 GMT (envelope-from git) Date: Sat, 23 Mar 2024 12:07:52 GMT Message-Id: <202403231207.42NC7qhe093474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 07839ae99c06 - stable/13 - Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 07839ae99c06fcbebd5da6ead49c160c32046542 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=07839ae99c06fcbebd5da6ead49c160c32046542 commit 07839ae99c06fcbebd5da6ead49c160c32046542 Author: Dimitry Andric AuthorDate: 2024-03-20 22:39:06 +0000 Commit: Dimitry Andric CommitDate: 2024-03-23 12:02:23 +0000 Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): [Clang] Fix ResolveConstructorOverload to not select a conversion function if we are going use copy elision ResolveConstructorOverload needs to check properly if we are going to use copy elision we can't use a conversion function. This fixes: https://github.com/llvm/llvm-project/issues/39319 https://github.com/llvm/llvm-project/issues/60182 https://github.com/llvm/llvm-project/issues/62157 https://github.com/llvm/llvm-project/issues/64885 https://github.com/llvm/llvm-project/issues/65568 Differential Revision: https://reviews.llvm.org/D148474 This should fix 'Assertion failed: (isa(Val) && "cast() argument of incompatible type!")' errors when building devel/boost-libs, specifically libs/url/src/segments_view.cpp. Bump __FreeBSD_version so this fix can easily be detected from devel/boost-all/compiled.mk. PR: 273335 (cherry picked from commit bcd401b5a39c6186bb1fe450286299f2a481244c) --- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 51 +++++++++++----------- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 ++ sys/sys/param.h | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 32c9215184eb..1e9078cda26a 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -4092,16 +4092,13 @@ static bool hasCopyOrMoveCtorParam(ASTContext &Ctx, return Ctx.hasSameUnqualifiedType(ParmT, ClassT); } -static OverloadingResult -ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, - MultiExprArg Args, - OverloadCandidateSet &CandidateSet, - QualType DestType, - DeclContext::lookup_result Ctors, - OverloadCandidateSet::iterator &Best, - bool CopyInitializing, bool AllowExplicit, - bool OnlyListConstructors, bool IsListInit, - bool SecondStepOfCopyInit = false) { +static OverloadingResult ResolveConstructorOverload( + Sema &S, SourceLocation DeclLoc, MultiExprArg Args, + OverloadCandidateSet &CandidateSet, QualType DestType, + DeclContext::lookup_result Ctors, OverloadCandidateSet::iterator &Best, + bool CopyInitializing, bool AllowExplicit, bool OnlyListConstructors, + bool IsListInit, bool RequireActualConstructor, + bool SecondStepOfCopyInit = false) { CandidateSet.clear(OverloadCandidateSet::CSK_InitByConstructor); CandidateSet.setDestAS(DestType.getQualifiers().getAddressSpace()); @@ -4164,7 +4161,7 @@ ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, // Note: SecondStepOfCopyInit is only ever true in this case when // evaluating whether to produce a C++98 compatibility warning. if (S.getLangOpts().CPlusPlus17 && Args.size() == 1 && - !SecondStepOfCopyInit) { + !RequireActualConstructor && !SecondStepOfCopyInit) { Expr *Initializer = Args[0]; auto *SourceRD = Initializer->getType()->getAsCXXRecordDecl(); if (SourceRD && S.isCompleteType(DeclLoc, Initializer->getType())) { @@ -4232,6 +4229,12 @@ static void TryConstructorInitialization(Sema &S, return; } + bool RequireActualConstructor = + !(Entity.getKind() != InitializedEntity::EK_Base && + Entity.getKind() != InitializedEntity::EK_Delegating && + Entity.getKind() != + InitializedEntity::EK_LambdaToBlockConversionBlockElement); + // C++17 [dcl.init]p17: // - If the initializer expression is a prvalue and the cv-unqualified // version of the source type is the same class as the class of the @@ -4241,11 +4244,7 @@ static void TryConstructorInitialization(Sema &S, // class or delegating to another constructor from a mem-initializer. // ObjC++: Lambda captured by the block in the lambda to block conversion // should avoid copy elision. - if (S.getLangOpts().CPlusPlus17 && - Entity.getKind() != InitializedEntity::EK_Base && - Entity.getKind() != InitializedEntity::EK_Delegating && - Entity.getKind() != - InitializedEntity::EK_LambdaToBlockConversionBlockElement && + if (S.getLangOpts().CPlusPlus17 && !RequireActualConstructor && UnwrappedArgs.size() == 1 && UnwrappedArgs[0]->isPRValue() && S.Context.hasSameUnqualifiedType(UnwrappedArgs[0]->getType(), DestType)) { // Convert qualifications if necessary. @@ -4293,11 +4292,10 @@ static void TryConstructorInitialization(Sema &S, // If the initializer list has no elements and T has a default constructor, // the first phase is omitted. if (!(UnwrappedArgs.empty() && S.LookupDefaultConstructor(DestRecordDecl))) - Result = ResolveConstructorOverload(S, Kind.getLocation(), Args, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/true, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), Args, CandidateSet, DestType, Ctors, Best, + CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/true, IsListInit, RequireActualConstructor); } // C++11 [over.match.list]p1: @@ -4307,11 +4305,10 @@ static void TryConstructorInitialization(Sema &S, // elements of the initializer list. if (Result == OR_No_Viable_Function) { AsInitializerList = false; - Result = ResolveConstructorOverload(S, Kind.getLocation(), UnwrappedArgs, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/false, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), UnwrappedArgs, CandidateSet, DestType, Ctors, + Best, CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/false, IsListInit, RequireActualConstructor); } if (Result) { Sequence.SetOverloadFailure( @@ -6776,6 +6773,7 @@ static ExprResult CopyObject(Sema &S, S, Loc, CurInitExpr, CandidateSet, T, Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true)) { case OR_Success: break; @@ -6921,6 +6919,7 @@ static void CheckCXX98CompatAccessibleCopy(Sema &S, S, Loc, CurInitExpr, CandidateSet, CurInitExpr->getType(), Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true); PartialDiagnostic Diag = S.PDiag(diag::warn_cxx98_compat_temp_copy) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp index 394006a57747..7bf228851de2 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -790,6 +790,10 @@ void Sema::PrintInstantiationStack() { Diags.Report(Active->PointOfInstantiation, diag::note_template_nsdmi_here) << FD << Active->InstantiationRange; + } else if (ClassTemplateDecl *CTD = dyn_cast(D)) { + Diags.Report(Active->PointOfInstantiation, + diag::note_template_class_instantiation_here) + << CTD << Active->InstantiationRange; } else { Diags.Report(Active->PointOfInstantiation, diag::note_template_type_alias_instantiation_here) diff --git a/sys/sys/param.h b/sys/sys/param.h index 77088d010ea6..3065513a8f24 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -59,7 +59,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1303501 /* Master, propagated to newvers */ +#define __FreeBSD_version 1303502 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Mar 24 00:40:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2HKB0n2jz5GDFX; Sun, 24 Mar 2024 00:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2HKB0Gkhz4fcB; Sun, 24 Mar 2024 00:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EntQBJCOGFflLYrY5YGbsLD+jmomhSgfJTBSIQK6yuI=; b=JMc+Xn+1iKQejtl7X1nwGw4LpxHp0VK1hgEo8u+DotUxKwTLIl/bAM7kFgpWXD3NRbpgy2 jf6TKtq5h0xWhyFiSJCk++RAqqexduQr3bxkqf6+a8qJ/qoWBFVysytDumx1Ty/Z2ib5ab vJVuJT2mxlSwSuEAx3CTcq0rvanVJIZbzfCPgneBKcA0t2hT+tmFEEr1FtAOZf6gMeUmDL 1YhP6QNmKSanheOp5U1tGKn1JEtnWWPR5qctHDBtZC1nDzMoPNOHl3XMtfOI5S5lqmBqtt w+t/Huryez4m5T+FlVqf/9EYldnJTsu+6rVIOPAY0zjuUdap7cvVNNMr8vHocg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711240814; a=rsa-sha256; cv=none; b=PHVJtOsT0hxO1eklAi9LXFxZ3WzDhXhQkiMa49j9T9GMNFspkCu9ofUayMYjoxLJdy/qEY BiEalPCxRp1oKoNhrsVQNV9IPJGY49x44Lp3IevpfnKxbXX8ghcsRnYn/6YLrB2pHVy/kc j9K3H+bC3NOgJYsACFJP6XuwCeU3mkVa1ZYXUB6CwrXkTuc9aKMK4zAsz6Hr6ixog3t+dT whlzO06cyWtldEAtbzEuDs3LqbmsX0W17URyT1ceySoV57v2gXP+KnVWTJWmSRY+wUUMyo 7uniJCKZg4HulTtiyz6ssA3eqLrPRVUCmUwDXwEUW65Mc+7pa2aSNXMDcJjHVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EntQBJCOGFflLYrY5YGbsLD+jmomhSgfJTBSIQK6yuI=; b=FWTwQhbUzwymq1SyaagP9KVdNf3KYyA1A2iSuuK+jOWWqvldsI7WUnQhg+5qMX/VqlF6Le S1bStvLVUMlSbMJ3dVuSLxznCK4dwqLbGGHb7iEdeC0wUVv8EOk+ukTlzFOOcfqbKclZX7 ntIzy0lOJ9rq6n+SktslCpPoCfFUvQ5HyZK2ROesPS0I0NB5MpNQD2FdQCy1jStyOkeA0B sZGn0ymATZ7bH4UCZ/y+d1+FTb+KSlahuPIpYYyajOgmBSzowLjTSy8ygCc2xD0Khxtz3+ IongTpIqMepe3XPXqP4+hZveBw7r73Cbhk8d5PiPyFBKF0aJfReZmZ5EY5mkuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2HK96skQz19jH; Sun, 24 Mar 2024 00:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O0eD0C090304; Sun, 24 Mar 2024 00:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0eDGE090292; Sun, 24 Mar 2024 00:40:13 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:40:13 GMT Message-Id: <202403240040.42O0eDGE090292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 880f35eb5d48 - stable/14 - Fix building of several libclang_rt libraries for powerpc64 and powerp64le List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 880f35eb5d489ae6b8d09da82f577381f24157d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=880f35eb5d489ae6b8d09da82f577381f24157d2 commit 880f35eb5d489ae6b8d09da82f577381f24157d2 Author: Dimitry Andric AuthorDate: 2024-03-21 13:53:36 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:36:18 +0000 Fix building of several libclang_rt libraries for powerpc64 and powerp64le I reorganized the libclang_rt Makefile in e77a1bb27574 to make it more readable and maintainable, but the check for 32-bit powerpc was wrong. This caused almost no libclang_rt libraries to be built for powerpc64 and powerpc64le. PR: 262706 Reported by: tuexen Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit f0620ceeccf070a69352105c5dbc23cff499a732) --- lib/libclang_rt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 46f7fdf814be..984da3f34156 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -67,7 +67,7 @@ SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_CPUARCH} == "powerpc" +.elif ${MACHINE_ARCH} == "powerpc" # nothing for 32-bit powerpc .elif ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} From nobody Sun Mar 24 00:40:14 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2HKC1Sn9z5GD4S; Sun, 24 Mar 2024 00:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2HKC0lW9z4fCq; Sun, 24 Mar 2024 00:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnMi3TS/5njDKa/+vfwJjrfBrND/gSic41YGUFe9N4A=; b=c44kKmq2piX6xRJg7ztPvI6M2LxQKW2o/V+2fqTFllsH+W1HEL6X5Ca2Uj6Dz+9SwJVgte 9pgJ8mKny73IraaSQbXrch/SOEE4JoDJSP4k+UAf5EaJLtjxMTAIsBnNV07F2X4Mq5Mj8s RxNvWBd5JRMxLYSdM/q1h0aLzIDaXUfa1FuzZiaGxhEyQi9h4DLCgYKoKVY/L+3HxjEusP m2/CO2y90w3Cqmoy0VK/XlGiUycVDp1GfGs8o8h2RNXyy0jZNaUDe3ISb3h/6ZG35l5EVu aZp65O4feANo0bkINzj9nnZydNaXj6fVXo7JtalW2toLukfkMFp7TcKRYUlTPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711240815; a=rsa-sha256; cv=none; b=cgBd/DZXkTkFDEH2CaSXg9Pzy7JMbCxpO3PHTVFnpMaqlIzOLTVW/un6ur36cmYb8AODlH 6HsP985lB1Ny+VJyMkBhrARoj1fc6dZMU9ujAKo+dKB6QZWFa6jKkZ8e8d4eirhtuK5edS mi1uufY/cp7I2Tcajt8wZdouBziuqzYEQq9Ozm2r69DEWSSZGuyoyuBRpPQVDk5bnoTyB8 g3sXArCluTayoE16EA8z63Al5jHa1k3haEvieZAA1tBxkrmDuXOgYNTyruGUKnl+7YzGps EdZWLlRi4aMLpRT+UqnPh0dzw/g74wtCzkhR/08DWWv6XZ573MW54r/OAYOwpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnMi3TS/5njDKa/+vfwJjrfBrND/gSic41YGUFe9N4A=; b=lZ3IawJFrWnEAHoDrWqzpZZXBh//5wvYopiw6DtGWQ1zx+VDStWliUjz/Kz7y/iMyf7q9Z rPD0PeuUiuvMg8n7VuBWw2Q+aDvu8bJX8u6nH2d2fneRiZK45lpfAZ0mJQ7/q2SFrBzq9C 6rd7ADs/Z6antf4RSQSo2LgarytT486YqwJN0YpqOMuusYk7CbsllRwwyx0qNjtFwL5wAs ytSWXl5lQ9o+aIpzsfECumc1P6jAI6tO14uzbcjkOHqAjgycOeN6GZHNdnfrcsj5oxhFne nKzdoqN23PnlBt+/RYFADxiomfne0G1MbcktdtGpIfqY+Ux0+mayBXCCIBmPeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2HKC0MpWz19TR; Sun, 24 Mar 2024 00:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O0eEex090986; Sun, 24 Mar 2024 00:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0eEjB090975; Sun, 24 Mar 2024 00:40:14 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:40:14 GMT Message-Id: <202403240040.42O0eEjB090975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 35a61f4a25ac - stable/14 - Slightly reorganize libclang_rt Makefile again List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35a61f4a25ac5301b83d2c4835081d60de5b8b1e Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=35a61f4a25ac5301b83d2c4835081d60de5b8b1e commit 35a61f4a25ac5301b83d2c4835081d60de5b8b1e Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:36:26 +0000 Slightly reorganize libclang_rt Makefile again Make a separate .elif section for MACHINE_ARCH==powerpc, and subdivide the MACHINE_CPUARCH values under it. If at some point more sanitizer libraries become available for powerpc CPU architectures, they can be added before the "nothing for other powerpc yet" case. Similar for the MACHINE_ARCH==arm case. PR: 262706 Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit 897a485c34464a44b768f13127d94137229eb83d) --- lib/libclang_rt/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 984da3f34156..79ccd288a845 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -60,28 +60,30 @@ SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} .elif ${MACHINE_CPUARCH} == "arm" -# nothing for 32-bit arm +# nothing for 32-bit arm yet .elif ${MACHINE_CPUARCH} == "i386" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc" -# nothing for 32-bit powerpc -.elif ${MACHINE_ARCH} == "powerpc64" +.elif ${MACHINE_CPUARCH} == "powerpc" +. if ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc64le" +. elif ${MACHINE_ARCH} == "powerpc64le" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} +. else +# nothing for other powerpc yet +. endif .elif ${MACHINE_CPUARCH} == "riscv" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_STATS} From nobody Sun Mar 24 00:43:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2HNl130wz5GDM4; Sun, 24 Mar 2024 00:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2HNl0L8Vz4gbk; Sun, 24 Mar 2024 00:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOL7EtS6AroXv/3ybGQiG3oo/daNP5upHu1t4kdyg5k=; b=l85hvW9SaHlxvkm5e3m1syJUQD8E388qlPrkY8dGcsohMRN+rqtsI13v+v9uRkh6lEkUwq SC9YKvFQXo29KLAR27a9bBfqhzl6KtYjkBZB133lZPqH4gpoWpt8+FzLKhaRAaRkuFgHdu y3l6xSRh8t+l8Uz7cYqpuZuhPefm1B4653ykE769g6D8I6RvolPhbc51MPWJdUUjEAXNQD I8gMHf7Bk0Fn8oE6Ldm6puhsNTQSyUIEvr3Z5Ve3H3S6hqHjZG9dED78mtkBszNPIKtHne IMVjotALRa/+NqH+sFJpUJsDa9sOhuetNHYy53SwFIW88nzfqOm9x+QeEESTcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711240999; a=rsa-sha256; cv=none; b=P7bT+Mf1Jbq3tYegXonbTOj3ESWg6jIC1y9PBzvy5FJsWgmsm0FAbZE+2hF2zGvJsLho2u PMPWa9HT/O7Qswvx2M28ov0H+MLdpo5aWyTu2Azn6SxerailQBMn9CG+yZ9g9Zj0EoWOXW nNfns+sqF5tCHf+pBEmMrGzj/d4REX3ZdgB9zgwZlscYcXKs1SlW/MN6TX84urN9Xl84lf EJH8TAiGUCKHMfKjeV21DcXO1zxbo3olfBVLsH1V0vG4fYLM/90mnXijWdUv0eM+flrujq 1F6CjSmA1OGnpZl0v05StobX0B8fX8RfpnD432lhLyILKlzg8MqRgPUjmllBgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOL7EtS6AroXv/3ybGQiG3oo/daNP5upHu1t4kdyg5k=; b=QJf/0TNjTlJMOneJNPIfZW0Drtj5XWyvNA24ILFazuWc1KVeQH6raPAfjafNXvKt3jS7wE WS32GxOZ3BZTdp2JQRoUYRhKcHcLc+68aTKB9VL7c4X4IcpBPAHFnbLWK1LR8iTlZLiExf vmFFA7aVzebGaH5QWGIN5p6hfMX3N24h/iSxIANUhPztNocEHEc7FrKfRk8PMkjcGaR6sI MUwGncUd2LC3DqAkndJ9A6tO4PRPSzGfrBqfHJ2H0oB499ftgUEBcr2lQPylXsdwzy42qm eIjtt3hGWwy0fY4mfYXxvpRqnMZCZAi8reygG0U6Ee+C0TLvxDIiXHTv123LAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2HNk72hjz19jl; Sun, 24 Mar 2024 00:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O0hIMH000240; Sun, 24 Mar 2024 00:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0hIIh000237; Sun, 24 Mar 2024 00:43:18 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:43:18 GMT Message-Id: <202403240043.42O0hIIh000237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 72d9e1e0ca66 - stable/13 - Fix building of several libclang_rt libraries for powerpc64 and powerp64le List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 72d9e1e0ca66ca39ca157731a65be32c63916252 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=72d9e1e0ca66ca39ca157731a65be32c63916252 commit 72d9e1e0ca66ca39ca157731a65be32c63916252 Author: Dimitry Andric AuthorDate: 2024-03-21 13:53:36 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:37:23 +0000 Fix building of several libclang_rt libraries for powerpc64 and powerp64le I reorganized the libclang_rt Makefile in e77a1bb27574 to make it more readable and maintainable, but the check for 32-bit powerpc was wrong. This caused almost no libclang_rt libraries to be built for powerpc64 and powerpc64le. PR: 262706 Reported by: tuexen Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit f0620ceeccf070a69352105c5dbc23cff499a732) --- lib/libclang_rt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 46f7fdf814be..984da3f34156 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -67,7 +67,7 @@ SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_CPUARCH} == "powerpc" +.elif ${MACHINE_ARCH} == "powerpc" # nothing for 32-bit powerpc .elif ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} From nobody Sun Mar 24 00:43:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2HNm1WyLz5GDM5; Sun, 24 Mar 2024 00:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2HNm10M7z4gYt; Sun, 24 Mar 2024 00:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711241000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KpOGSpsmZsa9WSXEEoJ2l3kvD/UIF+ZhhEg9cCFI80=; b=H1FXEdnqHz3l1a1SX1WdmN57mNGaJ/mOokx1lBuj7p88W0jAiSW6gc0JOBnMnYT2137ktJ NR6plTqHnXyFmZ5v4ortkjVpryBTHGEeybw36Xi/b46EGwpdVXB+5c7xV25rhnzyDTKLcS OgU7diyuGopaU0fRkaVw38hnLt6QU9TGG9Yspsu3R1WE8h+VkRAH7s+x57coKSer8bXSKz YkU7yMEFzhy3y6d8dCx29FMbY4sipMbzTRxrDnDtPoTE11ycZtEBssglyLaDubmssNP0TW vkyKiqJGGLJgb2EW+H+U+V1e+jP2rUKF2lKEP2M4LVGVzYU6FZbRBtIHVLb69g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711241000; a=rsa-sha256; cv=none; b=cE2+J9bkMDA792S5CgwXC2C37J9n0JAK6biBM1A5PgGiEYN9Vhd2RBpQv0CYCrRt7VhhMx IWwRXpo/nfnDcowlaVKEEOxKzVl+M6YFP/xb1DlC4DOZC+XiLmrUd4SiABvmXy6sQkbUoA QmaoBwKKq5j6Wps2KBUACz8+SEuL6cG3VYRdIWx/qvJa9I2EuUhjvyUpF3ICvHA1S9aWA6 DhTm7gRODKvnaUMn0Q2Gxp216fjoGMc2gl1r1a4eUMkZHOly1fv5VFMl+BVBMyhHP+p0BB OjnvoIA+GTKq5mjN2MfwUIAc88D7UL9FYViR5ND5l2f43jZhb/P538Ohyqs1rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711241000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KpOGSpsmZsa9WSXEEoJ2l3kvD/UIF+ZhhEg9cCFI80=; b=gPOEH4V+5m6AYjUg+wQNKb+CVHW+cZX4xJ60CEQhIlAZ204GIEKTwkgdzKrqaLeK0bXuQJ cADDBmIvzgE2SlPdOburET8ZdLlhMJt/FoZePpgcf/ee9OT79UU2GrJG07SQKHn/1g4lx6 18sdsvY6BsEj5pD88N/1ohOPl0mCbFsG+G6t7tI0fL5qb7xzvjOChnsdtqtQe2tGpNTC0H p1TXLEcDPYfw06EQ40CRCbHextTPQGR4C0IxwmNOPh9Ps0PdxI71XWjRX5CpY7zaSJLogU tM+syAqpxAl+sVgwVd/O7/QQh2VbZQtz3Y+eNhT437/3jqqnBIcPpk0zaO7j6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2HNm0cSHz19C1; Sun, 24 Mar 2024 00:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O0hK58000285; Sun, 24 Mar 2024 00:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0hKgD000282; Sun, 24 Mar 2024 00:43:20 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:43:20 GMT Message-Id: <202403240043.42O0hKgD000282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5c588a23c96b - stable/13 - Slightly reorganize libclang_rt Makefile again List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c588a23c96b88327f87bb8ef6c795c442d56c2a Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5c588a23c96b88327f87bb8ef6c795c442d56c2a commit 5c588a23c96b88327f87bb8ef6c795c442d56c2a Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:37:29 +0000 Slightly reorganize libclang_rt Makefile again Make a separate .elif section for MACHINE_ARCH==powerpc, and subdivide the MACHINE_CPUARCH values under it. If at some point more sanitizer libraries become available for powerpc CPU architectures, they can be added before the "nothing for other powerpc yet" case. Similar for the MACHINE_ARCH==arm case. PR: 262706 Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit 897a485c34464a44b768f13127d94137229eb83d) --- lib/libclang_rt/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 984da3f34156..79ccd288a845 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -60,28 +60,30 @@ SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} .elif ${MACHINE_CPUARCH} == "arm" -# nothing for 32-bit arm +# nothing for 32-bit arm yet .elif ${MACHINE_CPUARCH} == "i386" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc" -# nothing for 32-bit powerpc -.elif ${MACHINE_ARCH} == "powerpc64" +.elif ${MACHINE_CPUARCH} == "powerpc" +. if ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc64le" +. elif ${MACHINE_ARCH} == "powerpc64le" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} +. else +# nothing for other powerpc yet +. endif .elif ${MACHINE_CPUARCH} == "riscv" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_STATS} From nobody Sun Mar 24 02:22:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2Kb368tjz5DhFC; Sun, 24 Mar 2024 02:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2Kb35xjpz4np0; Sun, 24 Mar 2024 02:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W+QZexvHmj69GBfw5sWYhqzqMxtyQtpe7qluT4VUgz4=; b=tP9Eh3APMS5iTuvSyfR1eFuCZwb9cUVSR9hXLuV15/VMnMl27Uypfahg5nHYJ5LL0diuKk hJXrUIdnyl1Ag358Eig5CaRfQlq3Os6OtDIwVf9Nks5OWbw6ow/Qrt5fsIG82SY/B2Lsn0 fnLksUh4lW9Dk5ZP+GHnH7vYoIIl6nWOZWF0Z2XkDGlJBGugeXtlUSfj++XJ7S2BlMPAPg AoCWFWUexmM7nWi0RGE7Dj6vcGKq88HzuOpJSC5nc5TRTarWowhZ19MbR2R6LpcxD84aMM mVMNr/scS8d+89rA/rZQ3zNjUkr8/sjWyvikaWS+ydaCT1bkDBllZoLllX6CZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711246943; a=rsa-sha256; cv=none; b=CeLtsAeIS9/Nv3osmN0a7DplNAx+ZeJWoQfg+K88i9x0ip1JfSfUecunBCgg0ddYqVPQgQ P4HhHj33bbaM0sjAbN/wxIwicGkyMOLgA1ZQ351l3OTnS7Rv2FqcMH6sfxgPAmu/qKjfyv sfQQMYIigCXl4QD9j4K/IbDTjzSEeXAKuBBuxjmxSWLnOCXAVjg6md/Jj4Wlndyqspvpm7 kJfz8LmnmkFSjL7ljetFvoONy55Br/TM0ZjM1b/VkAuvarBlV3tejJ8fiJjqj0k15h3aS7 ZLRid05PkGWj7po3KPOrocMfMjDOcJCEEoma0QpSpoaGN6qX58wV62LuVidwyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W+QZexvHmj69GBfw5sWYhqzqMxtyQtpe7qluT4VUgz4=; b=LXNkH4zv0Ek6XQbn1UAtEArbJTnDFB97hL8uRq25JusEL095Mk+sXh2ogvIaJzMz+d0neK s18ZqE7jabzGMFDycH8Dbzndi3Vqpoz0Na9jPtLUSH+H7fDY98qCpGvzFuY4r7Wpp2tHgt U0zPY61jdoEIGf6OT4Gug7/14cvL/5slmN5O3yomgsTjj7M8jn9yN4yQwh2LXKeyOrOXzp TXDCTr0lmfNYGDKivjlR156KTDQ+D5lsqY4xCkKapLD+2knSKQa2Lk6lmFAQErxqs5Z7sX W3rpGBuxK0oKb7k90M4R+tYfU38K06iICzeq0MA5RRApXJcwRENsULDu453K0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2Kb35Xsqz1CvM; Sun, 24 Mar 2024 02:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O2MNk9069122; Sun, 24 Mar 2024 02:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O2MN4v069119; Sun, 24 Mar 2024 02:22:23 GMT (envelope-from git) Date: Sun, 24 Mar 2024 02:22:23 GMT Message-Id: <202403240222.42O2MN4v069119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 66f60770fd7d - stable/14 - unbound: Vendor import 1.19.3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66f60770fd7d39518fef679533c3034e1e4f6baa Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=66f60770fd7d39518fef679533c3034e1e4f6baa commit 66f60770fd7d39518fef679533c3034e1e4f6baa Author: Cy Schubert AuthorDate: 2024-03-17 00:13:09 +0000 Commit: Cy Schubert CommitDate: 2024-03-24 02:22:03 +0000 unbound: Vendor import 1.19.3 Release notes at https://www.nlnetlabs.nl/news/2024/Mar/14/unbound-1.19.3-released/ Merge commit '5a33598e88ad8fbc0affa74dee0a2d8cc4010fbc' into main (cherry picked from commit b7c0c8c18e0f12bc22e251fbcabad719b364a38a) --- contrib/unbound/acx_nlnetlabs.m4 | 121 +- contrib/unbound/configure | 350 +- contrib/unbound/configure.ac | 28 +- contrib/unbound/daemon/remote.c | 10 +- contrib/unbound/daemon/worker.c | 28 +- contrib/unbound/dnstap/dnstap.c | 32 +- contrib/unbound/dnstap/dnstap.h | 4 + contrib/unbound/dnstap/dnstap.m4 | 107 +- contrib/unbound/dnstap/dnstap.proto | 82 +- contrib/unbound/doc/Changelog | 140 +- contrib/unbound/doc/README | 11 +- contrib/unbound/doc/example.conf.in | 25 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 24 +- contrib/unbound/iterator/iter_fwd.c | 1 - contrib/unbound/iterator/iter_hints.c | 5 +- contrib/unbound/iterator/iter_scrub.c | 3 +- contrib/unbound/iterator/iterator.c | 8 +- contrib/unbound/services/authzone.c | 2 +- contrib/unbound/services/cache/dns.c | 12 +- contrib/unbound/services/localzone.c | 6 +- contrib/unbound/services/mesh.c | 10 +- contrib/unbound/services/outside_network.c | 46 +- .../cachedb_no_store.tdir/cachedb_no_store.post | 2 +- .../cachedb_no_store.tdir/cachedb_no_store.test | 14 +- .../unbound/testdata/iter_cname_minimise_nx.rpl | 1 - contrib/unbound/testdata/iter_dname_ttl.rpl | 310 + .../testdata/root_zonemd.tdir/root_zonemd.test | 32 +- contrib/unbound/testdata/rrset_use_cached.rpl | 151 + .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 2 +- .../testdata/serve_expired_0ttl_nxdomain.rpl | 2 +- .../testdata/serve_expired_0ttl_servfail.rpl | 2 +- .../testdata/serve_expired_cached_servfail.rpl | 2 +- .../serve_expired_cached_servfail_refresh.rpl | 2 +- .../unbound/testdata/subnet_scopezero_noedns.crpl | 441 ++ contrib/unbound/util/config_file.c | 3 + contrib/unbound/util/config_file.h | 2 + contrib/unbound/util/configlexer.c | 7627 +++++++++++++++++++ contrib/unbound/util/configlexer.lex | 1 + contrib/unbound/util/configparser.c | 7713 ++++++++++++++++++++ contrib/unbound/util/configparser.h | 781 ++ contrib/unbound/util/configparser.y | 13 +- contrib/unbound/util/data/msgencode.c | 3 + contrib/unbound/util/data/msgreply.c | 53 +- contrib/unbound/util/data/msgreply.h | 6 +- contrib/unbound/util/data/packed_rrset.c | 5 +- contrib/unbound/util/iana_ports.inc | 1 - contrib/unbound/util/netevent.c | 12 +- contrib/unbound/validator/autotrust.c | 8 +- contrib/unbound/validator/val_sigcrypt.c | 2 +- contrib/unbound/validator/val_utils.c | 55 +- contrib/unbound/validator/validator.c | 2 + lib/libunbound/config.h | 6 +- 58 files changed, 18038 insertions(+), 287 deletions(-) diff --git a/contrib/unbound/acx_nlnetlabs.m4 b/contrib/unbound/acx_nlnetlabs.m4 index f27615bd8bce..6a01dc5a4769 100644 --- a/contrib/unbound/acx_nlnetlabs.m4 +++ b/contrib/unbound/acx_nlnetlabs.m4 @@ -2,7 +2,10 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 46 +# Version 48 +# 2024-01-16 fix to add -l:libssp.a to -lcrypto link check. +# and check for getaddrinfo with only header. +# 2024-01-15 fix to add crypt32 to -lcrypto link check when checking for gdi32. # 2023-05-04 fix to remove unused whitespace. # 2023-01-26 fix -Wstrict-prototypes. # 2022-09-01 fix checking if nonblocking sockets work on OpenBSD. @@ -707,7 +710,7 @@ AC_DEFUN([ACX_SSL_CHECKS], [ LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir_lib" ACX_RUNTIME_PATH_ADD([$ssldir_lib]) fi - + AC_MSG_CHECKING([for EVP_sha256 in -lcrypto]) LIBS="$LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" @@ -732,40 +735,73 @@ AC_DEFUN([ACX_SSL_CHECKS], [ ]])],[ AC_DEFINE([HAVE_EVP_SHA256], 1, [If you have EVP_sha256]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - AC_MSG_CHECKING([if -lcrypto needs -ldl]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + AC_MSG_CHECKING([if -lcrypto needs -ldl]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + ]) + ]) ]) - ]) + ]) ]) ]) fi @@ -779,7 +815,7 @@ AC_CHECK_HEADERS([openssl/rand.h],,, [AC_INCLUDES_DEFAULT]) dnl Check for SSL, where SSL is mandatory dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found -dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. +dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. dnl Checks main header files of SSL. dnl AC_DEFUN([ACX_WITH_SSL], @@ -872,7 +908,7 @@ dnl see if on windows if test "$ac_cv_header_windows_h" = "yes"; then AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" @@ -880,6 +916,24 @@ if test "$ac_cv_header_windows_h" = "yes"; then fi ], dnl no quick getaddrinfo, try mingw32 and winsock2 library. +dnl perhaps getaddrinfo needs only the include +AC_LINK_IFELSE( +[AC_LANG_PROGRAM( +[ +#ifdef HAVE_WS2TCPIP_H +#include +#endif +], +[ + (void)getaddrinfo(NULL, NULL, NULL, NULL); +] +)], +[ +ac_cv_func_getaddrinfo="yes" +AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) +USE_WINSOCK="1" +], + ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( @@ -904,6 +958,7 @@ ac_cv_func_getaddrinfo="no" LIBS="$ORIGLIBS" ]) ) +) AC_MSG_RESULT($ac_cv_func_getaddrinfo) if test $ac_cv_func_getaddrinfo = yes; then diff --git a/contrib/unbound/configure b/contrib/unbound/configure index c87c669c8435..6aa1aeb80676 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.19.1. +# Generated by GNU Autoconf 2.69 for unbound 1.19.3. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.19.1' -PACKAGE_STRING='unbound 1.19.1' +PACKAGE_VERSION='1.19.3' +PACKAGE_STRING='unbound 1.19.3' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -655,6 +655,8 @@ DNSTAP_SOCKET_TESTBIN DNSTAP_SOCKET_PATH opt_dnstap_socket_path ENABLE_DNSTAP +PROTOBUFC_LIBS +PROTOBUFC_CFLAGS PROTOC_C UBSYMS EXTRALINK @@ -926,7 +928,9 @@ SYSTEMD_CFLAGS SYSTEMD_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS -PYTHON_VERSION' +PYTHON_VERSION +PROTOBUFC_CFLAGS +PROTOBUFC_LIBS' # Initialize some variables set by options. @@ -1477,7 +1481,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.19.1 to adapt to many kinds of systems. +\`configure' configures unbound 1.19.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1547,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.19.1:";; + short | recursive ) echo "Configuration of unbound 1.19.3:";; esac cat <<\_ACEOF @@ -1718,6 +1722,10 @@ Some influential environment variables: The installed Python version to use, for example '2.3'. This string will be appended to the Python interpreter canonical name. + PROTOBUFC_CFLAGS + C compiler flags for PROTOBUFC, overriding pkg-config + PROTOBUFC_LIBS + linker flags for PROTOBUFC, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1785,7 +1793,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.19.1 +unbound configure 1.19.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2494,7 +2502,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.19.1, which was +It was created by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2846,11 +2854,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=19 -UNBOUND_VERSION_MICRO=1 +UNBOUND_VERSION_MICRO=3 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2942,6 +2950,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -14416,7 +14426,7 @@ CC=$lt_save_CC # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then @@ -18104,19 +18114,86 @@ else $as_echo "no" >&6; } LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 $as_echo_n "checking if -lcrypto needs -ldl... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18127,28 +18204,28 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 $as_echo_n "checking if -lcrypto needs -ldl -pthread... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18159,14 +18236,22 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext \ @@ -19847,7 +19932,7 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" @@ -19892,7 +19977,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19951,7 +20040,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19998,13 +20091,40 @@ if test "$ac_cv_header_windows_h" = "yes"; then $as_echo "#define USE_WINSOCK 1" >>confdefs.h USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" fi fi +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef HAVE_WS2TCPIP_H +#include +#endif + +int +main () +{ + + (void)getaddrinfo(NULL, NULL, NULL, NULL); + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +ac_cv_func_getaddrinfo="yes" + +$as_echo "#define USE_WINSOCK 1" >>confdefs.h + +USE_WINSOCK="1" + else ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -20047,6 +20167,10 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5 $as_echo "$ac_cv_func_getaddrinfo" >&6; } if test $ac_cv_func_getaddrinfo = yes; then @@ -20166,7 +20290,11 @@ else WINDRES="$ac_cv_prog_WINDRES" fi - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" @@ -21199,7 +21327,7 @@ fi # check for dnstap if requested - # Check whether --enable-dnstap was given. + # Check whether --enable-dnstap was given. if test "${enable_dnstap+set}" = set; then : enableval=$enable_dnstap; opt_dnstap=$enableval else @@ -21216,8 +21344,8 @@ else fi - if test "x$opt_dnstap" != "xno"; then - # Extract the first word of "protoc-c", so it can be a program name with args. + if test "x$opt_dnstap" != "xno"; then + # Extract the first word of "protoc-c", so it can be a program name with args. set dummy protoc-c; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -21257,36 +21385,132 @@ $as_echo "no" >&6; } fi - if test -z "$PROTOC_C"; then - as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 - fi + if test -z "$PROTOC_C"; then + as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 + fi # Check whether --with-protobuf-c was given. if test "${with_protobuf_c+set}" = set; then : withval=$with_protobuf_c; - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f $withval/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I$withval/include/google" - else - CFLAGS="$CFLAGS -I$withval/include" - fi - LDFLAGS="$LDFLAGS -L$withval/lib" + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f $withval/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I$withval/include/google" + else + CFLAGS="$CFLAGS -I$withval/include" + fi + LDFLAGS="$LDFLAGS -L$withval/lib" else - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f /usr/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/include/google" - else - if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/local/include/google" - LDFLAGS="$LDFLAGS -L/usr/local/lib" - fi - fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROTOBUFC" >&5 +$as_echo_n "checking for PROTOBUFC... " >&6; } + +if test -n "$PROTOBUFC_CFLAGS"; then + pkg_cv_PROTOBUFC_CFLAGS="$PROTOBUFC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_CFLAGS=`$PKG_CONFIG --cflags "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PROTOBUFC_LIBS"; then + pkg_cv_PROTOBUFC_LIBS="$PROTOBUFC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_LIBS=`$PKG_CONFIG --libs "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprotobuf-c" 2>&1` + else + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprotobuf-c" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PROTOBUFC_PKG_ERRORS" >&5 + + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + + +else + PROTOBUFC_CFLAGS=$pkg_cv_PROTOBUFC_CFLAGS + PROTOBUFC_LIBS=$pkg_cv_PROTOBUFC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CFLAGS="$CFLAGS $PROTOBUFC_CFLAGS" + LIBS="$LIBS $PROTOBUFC_LIBS" + +fi + + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 $as_echo_n "checking for library containing protobuf_c_message_pack... " >&6; } if ${ac_cv_search_protobuf_c_message_pack+:} false; then : $as_echo_n "(cached) " >&6 @@ -21368,13 +21592,13 @@ _ACEOF DNSTAP_OBJ="dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo" - else + else ENABLE_DNSTAP=0 - fi + fi # check for dnscrypt if requested @@ -21895,7 +22119,7 @@ _ACEOF -version=1.19.1 +version=1.19.3 date=`date +'%b %e, %Y'` @@ -22414,7 +22638,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.19.1, which was +This file was extended by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22480,7 +22704,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.19.1 +unbound config.status 1.19.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 70fc7e7fdf49..e0dedbef9add 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[19]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MICRO],[3]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -110,6 +110,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -407,7 +409,7 @@ AC_CHECK_TOOL(STRIP, strip) ACX_LIBTOOL_C_ONLY # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then PKG_PROG_PKG_CONFIG fi @@ -1526,13 +1528,17 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1549,7 +1555,11 @@ if test x_$enable_fully_static = x_yes; then LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1569,7 +1579,11 @@ if test "$USE_WINSOCK" = 1; then #include ]) AC_CHECK_TOOL(WINDRES, windres) - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" AC_SUBST(WINAPPS) WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" diff --git a/contrib/unbound/daemon/remote.c b/contrib/unbound/daemon/remote.c index 3eb711ce6428..5d79eafd23be 100644 --- a/contrib/unbound/daemon/remote.c +++ b/contrib/unbound/daemon/remote.c @@ -553,7 +553,7 @@ ssl_print_text(RES* res, const char* text) static int ssl_print_vmsg(RES* ssl, const char* format, va_list args) { - char msg[1024]; + char msg[65535]; vsnprintf(msg, sizeof(msg), format, args); return ssl_print_text(ssl, msg); } @@ -3181,10 +3181,10 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd, do_flush_bogus(ssl, worker); } else if(cmdcmp(p, "flush_negative", 14)) { do_flush_negative(ssl, worker); - } else if(cmdcmp(p, "rpz_enable", 10)) { - do_rpz_enable(ssl, worker, skipwhite(p+10)); - } else if(cmdcmp(p, "rpz_disable", 11)) { - do_rpz_disable(ssl, worker, skipwhite(p+11)); + } else if(cmdcmp(p, "rpz_enable", 10)) { + do_rpz_enable(ssl, worker, skipwhite(p+10)); + } else if(cmdcmp(p, "rpz_disable", 11)) { + do_rpz_disable(ssl, worker, skipwhite(p+11)); } else { (void)ssl_printf(ssl, "error unknown command '%s'\n", p); } diff --git a/contrib/unbound/daemon/worker.c b/contrib/unbound/daemon/worker.c index 8ae05eb67e66..176abf57d56e 100644 --- a/contrib/unbound/daemon/worker.c +++ b/contrib/unbound/daemon/worker.c @@ -1151,7 +1151,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, log_assert(sldns_buffer_limit(c->buffer) >= LDNS_HEADER_SIZE && LDNS_QDCOUNT(sldns_buffer_begin(c->buffer)) == 1); - sldns_buffer_skip(c->buffer, LDNS_HEADER_SIZE); /* skip header */ + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); /* skip header */ /* check additional section is present and that we respond with EDEs */ if(LDNS_ARCOUNT(sldns_buffer_begin(c->buffer)) != 1 @@ -1163,6 +1163,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, LDNS_QR_SET(sldns_buffer_begin(c->buffer)); LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), LDNS_RCODE_REFUSED); + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); *** 18928 LINES SKIPPED *** From nobody Sun Mar 24 02:22:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2Kbm1hV0z5DhkK; Sun, 24 Mar 2024 02:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2Kbm06Y8z4pFT; Sun, 24 Mar 2024 02:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mRJ/9lzXpcVlhf2qa/7lUYU6Gax5wC5mpdDd/7gAXyA=; b=RmBMx3C5G7c18A3sZDRRjYmlHCPLurypbnxWuCA/Z1T7hTir3AqG6fot705b/KB2n2ga9h rK2wx86sv3J+GkIuS6nr0MsmK2LYk4+5V/5VGHMcIYsDWjAc6ojN3ulyU5gZnzOWxEs0/X z/PYbq2pWLjQvWUWfLIyJqxWpm7n1gvmu73RtBoYeNBFV1JmAjLP8Ib+Zj3y6BPXxYzjy2 THnbOw4lSefbeZRDSfSVQQAkmEuOZFbmkGLuIe6zi7JzMM+Dgx5UNev7q+EpQVpuikK7pE 3BjBkzarSkTTIMoz3XecO4o9RwFo6Ju6u08fYfugcMjGCPRLZRO/0v6r0hDqsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711246980; a=rsa-sha256; cv=none; b=Xh9NRtrOuoEgAdvzyMAosymqBqonGQcJ5T85hveIt2I/6Un7Bf1wIfi9RQnSX9fJ4wVWkp wtYOeEIJckhOd2KwzYHXssYWMu86nQRYX8esjR4t89X7dHTgbAn0rW331giDhJP72ecF/U EsDt33X1Mw1+8Wy4UV6P+p7M/DA5rt8YEvYSVBBnoPG3p+oVY1zJVlXWtEvkkXUKwyR0FD jd2JTlchpuF7cJ92qeCLkkSzxycH+pR1VWRfjJSDgGbVzDRoqO5O/9/SqTZw8yJIGaGI52 QLdMyywa5SdA1sNhwvfoFxLctx+obiCLxwpwglZkAUorGJafZxBxlJ6KuCQXaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mRJ/9lzXpcVlhf2qa/7lUYU6Gax5wC5mpdDd/7gAXyA=; b=RxJC/cP8VTHG1iI5rDMABStadK+3NjsDrP2h6MQbazVvDtFn1dfZaDdWpeQY9mPE8YP6J4 v4Qjj3HzI28sYDlXheWvijiIexvfBMC6XcQEDfLTVjNYGOxAbbYyWRZD90RWeMCYha7oUU noSOgw+dFqjePl7NaD0EC5Mukb9I+GGR/lR5HBOKc7lD1bKAOk5+P4IQQWSGoZadorOiFK f9kF9yqqKm3o+AVSb4BT2+tAD3zOevcISM1Bla2a7JVq3zInUGWvuz7AhZEEytfbglh4l0 PPGt/ouwK5lxVc+i/97R5mepwnDD2VfTX2YFAATAZxRNbopsqt4VHZOD5DOCJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2Kbl6njszF2s; Sun, 24 Mar 2024 02:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O2Mxut069316; Sun, 24 Mar 2024 02:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O2MxJe069310; Sun, 24 Mar 2024 02:22:59 GMT (envelope-from git) Date: Sun, 24 Mar 2024 02:22:59 GMT Message-Id: <202403240222.42O2MxJe069310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e59ac68e257b - stable/13 - unbound: Vendor import 1.19.3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e59ac68e257b3602a9671037d777490717c37dd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e59ac68e257b3602a9671037d777490717c37dd9 commit e59ac68e257b3602a9671037d777490717c37dd9 Author: Cy Schubert AuthorDate: 2024-03-17 00:13:09 +0000 Commit: Cy Schubert CommitDate: 2024-03-24 02:22:47 +0000 unbound: Vendor import 1.19.3 Release notes at https://www.nlnetlabs.nl/news/2024/Mar/14/unbound-1.19.3-released/ Merge commit '5a33598e88ad8fbc0affa74dee0a2d8cc4010fbc' into main (cherry picked from commit b7c0c8c18e0f12bc22e251fbcabad719b364a38a) --- contrib/unbound/acx_nlnetlabs.m4 | 121 +- contrib/unbound/configure | 350 +- contrib/unbound/configure.ac | 28 +- contrib/unbound/daemon/remote.c | 10 +- contrib/unbound/daemon/worker.c | 28 +- contrib/unbound/dnstap/dnstap.c | 32 +- contrib/unbound/dnstap/dnstap.h | 4 + contrib/unbound/dnstap/dnstap.m4 | 107 +- contrib/unbound/dnstap/dnstap.proto | 82 +- contrib/unbound/doc/Changelog | 140 +- contrib/unbound/doc/README | 11 +- contrib/unbound/doc/example.conf.in | 25 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 24 +- contrib/unbound/iterator/iter_fwd.c | 1 - contrib/unbound/iterator/iter_hints.c | 5 +- contrib/unbound/iterator/iter_scrub.c | 3 +- contrib/unbound/iterator/iterator.c | 8 +- contrib/unbound/services/authzone.c | 2 +- contrib/unbound/services/cache/dns.c | 12 +- contrib/unbound/services/localzone.c | 6 +- contrib/unbound/services/mesh.c | 10 +- contrib/unbound/services/outside_network.c | 46 +- .../cachedb_no_store.tdir/cachedb_no_store.post | 2 +- .../cachedb_no_store.tdir/cachedb_no_store.test | 14 +- .../unbound/testdata/iter_cname_minimise_nx.rpl | 1 - contrib/unbound/testdata/iter_dname_ttl.rpl | 310 + .../testdata/root_zonemd.tdir/root_zonemd.test | 32 +- contrib/unbound/testdata/rrset_use_cached.rpl | 151 + .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 2 +- .../testdata/serve_expired_0ttl_nxdomain.rpl | 2 +- .../testdata/serve_expired_0ttl_servfail.rpl | 2 +- .../testdata/serve_expired_cached_servfail.rpl | 2 +- .../serve_expired_cached_servfail_refresh.rpl | 2 +- .../unbound/testdata/subnet_scopezero_noedns.crpl | 441 ++ contrib/unbound/util/config_file.c | 3 + contrib/unbound/util/config_file.h | 2 + contrib/unbound/util/configlexer.c | 7627 +++++++++++++++++++ contrib/unbound/util/configlexer.lex | 1 + contrib/unbound/util/configparser.c | 7713 ++++++++++++++++++++ contrib/unbound/util/configparser.h | 781 ++ contrib/unbound/util/configparser.y | 13 +- contrib/unbound/util/data/msgencode.c | 3 + contrib/unbound/util/data/msgreply.c | 53 +- contrib/unbound/util/data/msgreply.h | 6 +- contrib/unbound/util/data/packed_rrset.c | 5 +- contrib/unbound/util/iana_ports.inc | 1 - contrib/unbound/util/netevent.c | 12 +- contrib/unbound/validator/autotrust.c | 8 +- contrib/unbound/validator/val_sigcrypt.c | 2 +- contrib/unbound/validator/val_utils.c | 55 +- contrib/unbound/validator/validator.c | 2 + usr.sbin/unbound/config.h | 6 +- 58 files changed, 18038 insertions(+), 287 deletions(-) diff --git a/contrib/unbound/acx_nlnetlabs.m4 b/contrib/unbound/acx_nlnetlabs.m4 index f27615bd8bce..6a01dc5a4769 100644 --- a/contrib/unbound/acx_nlnetlabs.m4 +++ b/contrib/unbound/acx_nlnetlabs.m4 @@ -2,7 +2,10 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 46 +# Version 48 +# 2024-01-16 fix to add -l:libssp.a to -lcrypto link check. +# and check for getaddrinfo with only header. +# 2024-01-15 fix to add crypt32 to -lcrypto link check when checking for gdi32. # 2023-05-04 fix to remove unused whitespace. # 2023-01-26 fix -Wstrict-prototypes. # 2022-09-01 fix checking if nonblocking sockets work on OpenBSD. @@ -707,7 +710,7 @@ AC_DEFUN([ACX_SSL_CHECKS], [ LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir_lib" ACX_RUNTIME_PATH_ADD([$ssldir_lib]) fi - + AC_MSG_CHECKING([for EVP_sha256 in -lcrypto]) LIBS="$LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" @@ -732,40 +735,73 @@ AC_DEFUN([ACX_SSL_CHECKS], [ ]])],[ AC_DEFINE([HAVE_EVP_SHA256], 1, [If you have EVP_sha256]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - AC_MSG_CHECKING([if -lcrypto needs -ldl]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + AC_MSG_CHECKING([if -lcrypto needs -ldl]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + ]) + ]) ]) - ]) + ]) ]) ]) fi @@ -779,7 +815,7 @@ AC_CHECK_HEADERS([openssl/rand.h],,, [AC_INCLUDES_DEFAULT]) dnl Check for SSL, where SSL is mandatory dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found -dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. +dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. dnl Checks main header files of SSL. dnl AC_DEFUN([ACX_WITH_SSL], @@ -872,7 +908,7 @@ dnl see if on windows if test "$ac_cv_header_windows_h" = "yes"; then AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" @@ -880,6 +916,24 @@ if test "$ac_cv_header_windows_h" = "yes"; then fi ], dnl no quick getaddrinfo, try mingw32 and winsock2 library. +dnl perhaps getaddrinfo needs only the include +AC_LINK_IFELSE( +[AC_LANG_PROGRAM( +[ +#ifdef HAVE_WS2TCPIP_H +#include +#endif +], +[ + (void)getaddrinfo(NULL, NULL, NULL, NULL); +] +)], +[ +ac_cv_func_getaddrinfo="yes" +AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) +USE_WINSOCK="1" +], + ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( @@ -904,6 +958,7 @@ ac_cv_func_getaddrinfo="no" LIBS="$ORIGLIBS" ]) ) +) AC_MSG_RESULT($ac_cv_func_getaddrinfo) if test $ac_cv_func_getaddrinfo = yes; then diff --git a/contrib/unbound/configure b/contrib/unbound/configure index c87c669c8435..6aa1aeb80676 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.19.1. +# Generated by GNU Autoconf 2.69 for unbound 1.19.3. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.19.1' -PACKAGE_STRING='unbound 1.19.1' +PACKAGE_VERSION='1.19.3' +PACKAGE_STRING='unbound 1.19.3' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -655,6 +655,8 @@ DNSTAP_SOCKET_TESTBIN DNSTAP_SOCKET_PATH opt_dnstap_socket_path ENABLE_DNSTAP +PROTOBUFC_LIBS +PROTOBUFC_CFLAGS PROTOC_C UBSYMS EXTRALINK @@ -926,7 +928,9 @@ SYSTEMD_CFLAGS SYSTEMD_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS -PYTHON_VERSION' +PYTHON_VERSION +PROTOBUFC_CFLAGS +PROTOBUFC_LIBS' # Initialize some variables set by options. @@ -1477,7 +1481,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.19.1 to adapt to many kinds of systems. +\`configure' configures unbound 1.19.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1547,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.19.1:";; + short | recursive ) echo "Configuration of unbound 1.19.3:";; esac cat <<\_ACEOF @@ -1718,6 +1722,10 @@ Some influential environment variables: The installed Python version to use, for example '2.3'. This string will be appended to the Python interpreter canonical name. + PROTOBUFC_CFLAGS + C compiler flags for PROTOBUFC, overriding pkg-config + PROTOBUFC_LIBS + linker flags for PROTOBUFC, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1785,7 +1793,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.19.1 +unbound configure 1.19.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2494,7 +2502,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.19.1, which was +It was created by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2846,11 +2854,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=19 -UNBOUND_VERSION_MICRO=1 +UNBOUND_VERSION_MICRO=3 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2942,6 +2950,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -14416,7 +14426,7 @@ CC=$lt_save_CC # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then @@ -18104,19 +18114,86 @@ else $as_echo "no" >&6; } LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 $as_echo_n "checking if -lcrypto needs -ldl... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18127,28 +18204,28 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 $as_echo_n "checking if -lcrypto needs -ldl -pthread... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18159,14 +18236,22 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext \ @@ -19847,7 +19932,7 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" @@ -19892,7 +19977,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19951,7 +20040,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19998,13 +20091,40 @@ if test "$ac_cv_header_windows_h" = "yes"; then $as_echo "#define USE_WINSOCK 1" >>confdefs.h USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" fi fi +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef HAVE_WS2TCPIP_H +#include +#endif + +int +main () +{ + + (void)getaddrinfo(NULL, NULL, NULL, NULL); + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +ac_cv_func_getaddrinfo="yes" + +$as_echo "#define USE_WINSOCK 1" >>confdefs.h + +USE_WINSOCK="1" + else ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -20047,6 +20167,10 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5 $as_echo "$ac_cv_func_getaddrinfo" >&6; } if test $ac_cv_func_getaddrinfo = yes; then @@ -20166,7 +20290,11 @@ else WINDRES="$ac_cv_prog_WINDRES" fi - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" @@ -21199,7 +21327,7 @@ fi # check for dnstap if requested - # Check whether --enable-dnstap was given. + # Check whether --enable-dnstap was given. if test "${enable_dnstap+set}" = set; then : enableval=$enable_dnstap; opt_dnstap=$enableval else @@ -21216,8 +21344,8 @@ else fi - if test "x$opt_dnstap" != "xno"; then - # Extract the first word of "protoc-c", so it can be a program name with args. + if test "x$opt_dnstap" != "xno"; then + # Extract the first word of "protoc-c", so it can be a program name with args. set dummy protoc-c; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -21257,36 +21385,132 @@ $as_echo "no" >&6; } fi - if test -z "$PROTOC_C"; then - as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 - fi + if test -z "$PROTOC_C"; then + as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 + fi # Check whether --with-protobuf-c was given. if test "${with_protobuf_c+set}" = set; then : withval=$with_protobuf_c; - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f $withval/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I$withval/include/google" - else - CFLAGS="$CFLAGS -I$withval/include" - fi - LDFLAGS="$LDFLAGS -L$withval/lib" + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f $withval/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I$withval/include/google" + else + CFLAGS="$CFLAGS -I$withval/include" + fi + LDFLAGS="$LDFLAGS -L$withval/lib" else - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f /usr/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/include/google" - else - if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/local/include/google" - LDFLAGS="$LDFLAGS -L/usr/local/lib" - fi - fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROTOBUFC" >&5 +$as_echo_n "checking for PROTOBUFC... " >&6; } + +if test -n "$PROTOBUFC_CFLAGS"; then + pkg_cv_PROTOBUFC_CFLAGS="$PROTOBUFC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_CFLAGS=`$PKG_CONFIG --cflags "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PROTOBUFC_LIBS"; then + pkg_cv_PROTOBUFC_LIBS="$PROTOBUFC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_LIBS=`$PKG_CONFIG --libs "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprotobuf-c" 2>&1` + else + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprotobuf-c" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PROTOBUFC_PKG_ERRORS" >&5 + + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + + +else + PROTOBUFC_CFLAGS=$pkg_cv_PROTOBUFC_CFLAGS + PROTOBUFC_LIBS=$pkg_cv_PROTOBUFC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CFLAGS="$CFLAGS $PROTOBUFC_CFLAGS" + LIBS="$LIBS $PROTOBUFC_LIBS" + +fi + + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 $as_echo_n "checking for library containing protobuf_c_message_pack... " >&6; } if ${ac_cv_search_protobuf_c_message_pack+:} false; then : $as_echo_n "(cached) " >&6 @@ -21368,13 +21592,13 @@ _ACEOF DNSTAP_OBJ="dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo" - else + else ENABLE_DNSTAP=0 - fi + fi # check for dnscrypt if requested @@ -21895,7 +22119,7 @@ _ACEOF -version=1.19.1 +version=1.19.3 date=`date +'%b %e, %Y'` @@ -22414,7 +22638,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.19.1, which was +This file was extended by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22480,7 +22704,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.19.1 +unbound config.status 1.19.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 70fc7e7fdf49..e0dedbef9add 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[19]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MICRO],[3]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -110,6 +110,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -407,7 +409,7 @@ AC_CHECK_TOOL(STRIP, strip) ACX_LIBTOOL_C_ONLY # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then PKG_PROG_PKG_CONFIG fi @@ -1526,13 +1528,17 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1549,7 +1555,11 @@ if test x_$enable_fully_static = x_yes; then LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1569,7 +1579,11 @@ if test "$USE_WINSOCK" = 1; then #include ]) AC_CHECK_TOOL(WINDRES, windres) - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" AC_SUBST(WINAPPS) WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" diff --git a/contrib/unbound/daemon/remote.c b/contrib/unbound/daemon/remote.c index 3eb711ce6428..5d79eafd23be 100644 --- a/contrib/unbound/daemon/remote.c +++ b/contrib/unbound/daemon/remote.c @@ -553,7 +553,7 @@ ssl_print_text(RES* res, const char* text) static int ssl_print_vmsg(RES* ssl, const char* format, va_list args) { - char msg[1024]; + char msg[65535]; vsnprintf(msg, sizeof(msg), format, args); return ssl_print_text(ssl, msg); } @@ -3181,10 +3181,10 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd, do_flush_bogus(ssl, worker); } else if(cmdcmp(p, "flush_negative", 14)) { do_flush_negative(ssl, worker); - } else if(cmdcmp(p, "rpz_enable", 10)) { - do_rpz_enable(ssl, worker, skipwhite(p+10)); - } else if(cmdcmp(p, "rpz_disable", 11)) { - do_rpz_disable(ssl, worker, skipwhite(p+11)); + } else if(cmdcmp(p, "rpz_enable", 10)) { + do_rpz_enable(ssl, worker, skipwhite(p+10)); + } else if(cmdcmp(p, "rpz_disable", 11)) { + do_rpz_disable(ssl, worker, skipwhite(p+11)); } else { (void)ssl_printf(ssl, "error unknown command '%s'\n", p); } diff --git a/contrib/unbound/daemon/worker.c b/contrib/unbound/daemon/worker.c index 8ae05eb67e66..176abf57d56e 100644 --- a/contrib/unbound/daemon/worker.c +++ b/contrib/unbound/daemon/worker.c @@ -1151,7 +1151,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, log_assert(sldns_buffer_limit(c->buffer) >= LDNS_HEADER_SIZE && LDNS_QDCOUNT(sldns_buffer_begin(c->buffer)) == 1); - sldns_buffer_skip(c->buffer, LDNS_HEADER_SIZE); /* skip header */ + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); /* skip header */ /* check additional section is present and that we respond with EDEs */ if(LDNS_ARCOUNT(sldns_buffer_begin(c->buffer)) != 1 @@ -1163,6 +1163,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, LDNS_QR_SET(sldns_buffer_begin(c->buffer)); LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), LDNS_RCODE_REFUSED); + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); *** 18928 LINES SKIPPED *** From nobody Sun Mar 24 03:04:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2LWr5rh5z5DmkX; Sun, 24 Mar 2024 03:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2LWr5DQPz4t1R; Sun, 24 Mar 2024 03:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pR6LThwsMzx4Q0Q8u1HR80upGVPMEx5sPD91sqFg2tY=; b=k3BBT7YwKhHxIh17Y+njIqEAx+3KSUmqMUcnBQVpiOXmrzTvwVxkm0M9KAWgAqS/HzYAQy E8bADInSuu05fdLHUBQxHaeLD2QZVYEcxaPXkKy3SQG3LZQNw7s9EuETG45bDEJFTPfdmq vZSnoLQ8VyaBQXEBo1H9O8Vt1EFl1OawH1tyrV6s6PEdTtnc9ojZ302/ViREIAjtD/hvjn gRXRDEThFGjwe9k60uNecbqG8CoHtoDYmqbfTsk0euR16ZvoCRkPUAjiG+nFWOTwo8fBP2 iR9N2BhyndiqQd+XIMnBaYJ9MUqFHexcYimhGB8zcIrLZCj2ha6gOzsCcS4CBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711249480; a=rsa-sha256; cv=none; b=GWBDc6o+40xMrm976du1Xa2cB+btDeBX0MU4Fq7tOPlLwtnUWUi7x9FP72+i0DwchX+NSo mqGxCYYdnKMmTRvhZ7jpTgjzkEcd0ZkiQ8MKslSuQ+hf1KO4OLXw0O9oL0oMNTydc5V9uG X+TZOxxtuwribWDM6pw3gHpUbKdciJq4F0U3deQzbhltMndW9lOhHCel3j8/VHddlFYsls qZ9n5pta6yWP0jLQn/0buBOXVw65/4zcG7gpNXsDaiDc4QCbBoKo4yv5W5tlbAhHKfEv2M 9YPyJ8VFWW9xX1O4zQRn+lfDRH4s9PE8g0sjqsPNCfnqeQW4kUgN+HtTlgf7Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pR6LThwsMzx4Q0Q8u1HR80upGVPMEx5sPD91sqFg2tY=; b=hqE8l/14F0cwMtJ2+5IVrXVNoffeA/Uld5VXB36gswe1gFrVEoZG242iwwtqJNKTUz96qV IoPuswh6xV6riSREu5V+PvicpO9qhA1kfVFp0k6dY/fdWQ0TEE4DMV7mKJOq8/WycZpjNU HWe+YTgjVysHPfCrdJAFSv2oj8J1LuCVx3ppNgSWintVDfYP3X8SnWoEDpD8BYHweH7BVx 1/d90puW82wgta+zaeIk99XNGOZ1XCHJKDoB0pZr8ecuNk48Og+B9iqqfxFVypcxg8rePi v6a2U/9wVaEqK3r0Efy5CVvF+jkMBgvrJ/hBXHRO4bUCt4zEn7zPEHvJXY9Bng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2LWr4qTlzFq1; Sun, 24 Mar 2024 03:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O34e45038492; Sun, 24 Mar 2024 03:04:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O34eAK038489; Sun, 24 Mar 2024 03:04:40 GMT (envelope-from git) Date: Sun, 24 Mar 2024 03:04:40 GMT Message-Id: <202403240304.42O34eAK038489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: b09b120818a8 - stable/14 - vn_lock_pair(): allow lkflags1/lkflags2 to be 0 if vp1/vp2 is NULL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b09b120818a81b83a3e3201b4c301335d0c48fac Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=b09b120818a81b83a3e3201b4c301335d0c48fac commit b09b120818a81b83a3e3201b4c301335d0c48fac Author: Jason A. Harmening AuthorDate: 2024-02-23 17:31:08 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-24 02:55:37 +0000 vn_lock_pair(): allow lkflags1/lkflags2 to be 0 if vp1/vp2 is NULL It's a bit strange to require the caller to pass contrived lock flags if the corresponding vnode is NULL, simply to appease the assertion that exactly one of LK_SHARED or LK_EXCLUSIVE must be set. On the other hand, we still want to catch cases in which completely bogus or corrupt flags are passed even if the corresponding vnode is NULL. Therefore, specifically allow empty flags for lkflags1/lkflags2 iff the respective vp1/vp2 param is NULL. Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D44046 (cherry picked from commit fa26f46dc29f5ee1ac8e7b10fc12aa1f93cce702) --- sys/kern/vfs_vnops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 62339387d7d0..a16e137755b1 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -4103,9 +4103,11 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, { int error, locked1; - MPASS(((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)); + MPASS((((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)) || + (vp1 == NULL && lkflags1 == 0)); MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); - MPASS(((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)); + MPASS((((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)) || + (vp2 == NULL && lkflags2 == 0)); MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); if (vp1 == NULL && vp2 == NULL) From nobody Sun Mar 24 03:04:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2LWs6FVnz5DmX7; Sun, 24 Mar 2024 03:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2LWs5zqMz4tDN; Sun, 24 Mar 2024 03:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=efjxvOF6MmowthPie+Hoijca+kIdqz7Qfk4VpbbZINc=; b=nurZvyTHYERLd1BCmQDA3dbJh9V4VI24X6YjJLAP0SOolYIPVVXglVFfCi4eKmEUAhEr52 JD/tAU8KQWFRY/nYTSetQs/trc/v08MP+HX+qkue2JjuvbTqjq5+DMWd7VvpeSPJ0h2+Ok LyLqqv0qJtvMy7irm8cdmlQF10QymZPVyO9sPtqFObbXMRTjBZ2JxUZAf/VkAPtQ0/Q6XT SSUqnCc0lZXBsnFjRWQ0jlGbCPY1utD+7daz1YKVrzqiYsqAcK9L/LZ6ObB0q5XCV22Iqy 5OFI+nwixlLbvjiaU5LfVwMmkQ4ofrARr20CF123jYBnEAhpT8CsMZqfRbTfCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711249481; a=rsa-sha256; cv=none; b=RUX2g7uCtNsXGAr3dwDuLs3hEMMVDdQ8s4Al0v0/ZwHyG7j5QeNov87N9iH68EPTTC/fkB pyDAFonCkuSK3Dl9lWhxzt8lAsaU7UqCBwoXyaB3Kzg4iuntxMPqAbRPR5zyx2kQJNBP28 2OK7OfvFVFkcgyOu+BArSRhqQiJol4M/dgs0wjbIMic6c9pMkI8U2TJ9BRcK0CCdBlY2DA wEsuCq257i3bnTiLGPgK8c/K9sT5vGpQLTsEsq8rLZtUN/F4n+a+86BE5EhQAVEbUfS2dV rUyUeGf63hrz+ue2QtGP9vh7UJ/24wFmIqD/fszc3EU5Wnos/LLSkPE/4luPXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=efjxvOF6MmowthPie+Hoijca+kIdqz7Qfk4VpbbZINc=; b=bPXb5/vKcRKCBwfJEHrjGu7K8/blIKCkpbBOKEMwqQtdcT9rcXRn/hYQSDAs/AyCtadwyb p33f9/gzMIV5SBf6IPhfek/4Uo5594v+EQ5A59HVst00RCbdutzkBsx51m4vNpLox7XzaI j5ZYEvJNG9UM/k/TznnNsgieRLNAB6loOBpFI0sKyFekF6cmszF1/JISFwTsOr17UKxDUv bxmmD/TqhlH9nAosDtPZL19hsPKnBpCnmPO12ogwS8wl5Oe007KwXUGuqvbBS9Xjt/tHUa uatcrrd0lHv6wihTj03E+PjkMOdC/xT7XBMyhgSjbrFvFg9sO4Q3zxif9+4Mmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2LWs5bWPzFhG; Sun, 24 Mar 2024 03:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O34f0G038547; Sun, 24 Mar 2024 03:04:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O34fkq038544; Sun, 24 Mar 2024 03:04:41 GMT (envelope-from git) Date: Sun, 24 Mar 2024 03:04:41 GMT Message-Id: <202403240304.42O34fkq038544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 6d118b958612 - stable/14 - unionfs: accommodate underlying FS calls that may re-lock List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d118b95861220fdbbe82e933429091f7c0501eb Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=6d118b95861220fdbbe82e933429091f7c0501eb commit 6d118b95861220fdbbe82e933429091f7c0501eb Author: Jason A. Harmening AuthorDate: 2024-01-02 21:22:24 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-24 02:55:37 +0000 unionfs: accommodate underlying FS calls that may re-lock Since non-doomed unionfs vnodes always share their primary lock with either the lower or upper vnode, any forwarded call to the base FS which transiently drops that upper or lower vnode lock may result in the unionfs vnode becoming completely unlocked during that transient window. The unionfs vnode may then become doomed by a concurrent forced unmount, which can lead to either or both of the following: --Complete loss of the unionfs lock: in the process of being doomed, the unionfs vnode switches back to the default vnode lock, so even if the base FS VOP reacquires the upper/lower vnode lock, that no longer translates into the unionfs vnode being relocked. This will then violate that caller's locking assumptions as well as various assertions that are enabled with DEBUG_VFS_LOCKS. --Complete less of reference on the upper/lower vnode: the caller normally holds a reference on the unionfs vnode, while the unionfs vnode in turn holds references on the upper/lower vnodes. But in the course of being doomed, the unionfs vnode will drop the latter set of references, which can effectively lead to the base FS VOP executing with no references at all on its vnode, violating the assumption that vnodes can't be recycled during these calls and (if lucky) violating various assertions in the base FS. Fix this by adding two new functions, unionfs_forward_vop_start_pair() and unionfs_forward_vop_finish_pair(), which are intended to bookend any forwarded VOP which may transiently unlock the relevant vnode(s). These functions are currently only applied to VOPs that modify file state (and require vnode reference and lock state to be identical at call entry and exit), as the common reason for transiently dropping locks is to update filesystem metadata. Reviewed by: olce Tested by: pho Differential Revision: https://reviews.freebsd.org/D44076 (cherry picked from commit 6c8ded001540fd969ebc2eabd45a0066ebcc662b) --- sys/fs/unionfs/union.h | 22 +++++- sys/fs/unionfs/union_subr.c | 179 ++++++++++++++++++++++++++++++++++++++++--- sys/fs/unionfs/union_vnops.c | 148 +++++++++++++++++++++++------------ 3 files changed, 289 insertions(+), 60 deletions(-) diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h index 6c7db47ff209..57a281e55ede 100644 --- a/sys/fs/unionfs/union.h +++ b/sys/fs/unionfs/union.h @@ -146,8 +146,8 @@ int unionfs_create_uppervattr(struct unionfs_mount *, struct vnode *, struct vattr *, struct ucred *, struct thread *); int unionfs_mkshadowdir(struct unionfs_mount *, struct vnode *, struct unionfs_node *, struct componentname *, struct thread *); -int unionfs_mkwhiteout(struct vnode *, struct componentname *, - struct thread *, char *, int); +int unionfs_mkwhiteout(struct vnode *, struct vnode *, + struct componentname *, struct thread *, char *, int); int unionfs_relookup(struct vnode *, struct vnode **, struct componentname *, struct componentname *, struct thread *, char *, int, u_long); @@ -157,6 +157,24 @@ int unionfs_relookup_for_delete(struct vnode *, struct componentname *, struct thread *); int unionfs_relookup_for_rename(struct vnode *, struct componentname *, struct thread *); +void unionfs_forward_vop_start_pair(struct vnode *, int *, + struct vnode *, int *); +bool unionfs_forward_vop_finish_pair(struct vnode *, struct vnode *, int, + struct vnode *, struct vnode *, int); + +static inline void +unionfs_forward_vop_start(struct vnode *basevp, int *lkflags) +{ + unionfs_forward_vop_start_pair(basevp, lkflags, NULL, NULL); +} + +static inline bool +unionfs_forward_vop_finish(struct vnode *unionvp, struct vnode *basevp, + int lkflags) +{ + return (unionfs_forward_vop_finish_pair(unionvp, basevp, lkflags, + NULL, NULL, 0)); +} #define UNIONFSVPTOLOWERVP(vp) (VTOUNIONFS(vp)->un_lowervp) #define UNIONFSVPTOUPPERVP(vp) (VTOUNIONFS(vp)->un_uppervp) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 469ba0775e7c..ae2d417758f0 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -938,14 +938,21 @@ unionfs_mkshadowdir(struct unionfs_mount *ump, struct vnode *udvp, *pathend = pathterm; if (!error) { - unionfs_node_update(unp, uvp, td); - /* * XXX The bug which cannot set uid/gid was corrected. * Ignore errors. */ va.va_type = VNON; VOP_SETATTR(uvp, &va, nd.ni_cnd.cn_cred); + + /* + * VOP_SETATTR() may transiently drop uvp's lock, so it's + * important to call it before unionfs_node_update() transfers + * the unionfs vnode's lock from lvp to uvp; otherwise the + * unionfs vnode itself would be transiently unlocked and + * potentially doomed. + */ + unionfs_node_update(unp, uvp, td); } vn_finished_write(mp); @@ -957,28 +964,180 @@ unionfs_mkshadowdir_abort: return (error); } +static inline void +unionfs_forward_vop_ref(struct vnode *basevp, int *lkflags) +{ + ASSERT_VOP_LOCKED(basevp, __func__); + *lkflags = VOP_ISLOCKED(basevp); + vref(basevp); +} + +/* + * Prepare unionfs to issue a forwarded VOP to either the upper or lower + * FS. This should be used for any VOP which may drop the vnode lock; + * it is not required otherwise. + * The unionfs vnode shares its lock with the base-layer vnode(s); if the + * base FS must transiently drop its vnode lock, the unionfs vnode may + * effectively become unlocked. During that window, a concurrent forced + * unmount may doom the unionfs vnode, which leads to two significant + * issues: + * 1) Completion of, and return from, the unionfs VOP with the unionfs + * vnode completely unlocked. When the unionfs vnode becomes doomed + * it stops sharing its lock with the base vnode, so even if the + * forwarded VOP reacquires the base vnode lock the unionfs vnode + * lock will no longer be held. This can lead to violation of the + * caller's sychronization requirements as well as various failed + * locking assertions when DEBUG_VFS_LOCKS is enabled. + * 2) Loss of reference on the base vnode. The caller is expected to + * hold a v_usecount reference on the unionfs vnode, while the + * unionfs vnode holds a reference on the base-layer vnode(s). But + * these references are released when the unionfs vnode becomes + * doomed, violating the base layer's expectation that its caller + * must hold a reference to prevent vnode recycling. + * + * basevp1 and basevp2 represent two base-layer vnodes which are + * expected to be locked when this function is called. basevp2 + * may be NULL, but if not NULL basevp1 and basevp2 should represent + * a parent directory and a filed linked to it, respectively. + * lkflags1 and lkflags2 are output parameters that will store the + * current lock status of basevp1 and basevp2, respectively. They + * are intended to be passed as the lkflags1 and lkflags2 parameters + * in the subsequent call to unionfs_forward_vop_finish_pair(). + * lkflags2 may be NULL iff basevp2 is NULL. + */ +void +unionfs_forward_vop_start_pair(struct vnode *basevp1, int *lkflags1, + struct vnode *basevp2, int *lkflags2) +{ + /* + * Take an additional reference on the base-layer vnodes to + * avoid loss of reference if the unionfs vnodes are doomed. + */ + unionfs_forward_vop_ref(basevp1, lkflags1); + if (basevp2 != NULL) + unionfs_forward_vop_ref(basevp2, lkflags2); +} + +static inline bool +unionfs_forward_vop_rele(struct vnode *unionvp, struct vnode *basevp, + int lkflags) +{ + bool unionvp_doomed; + + if (__predict_false(VTOUNIONFS(unionvp) == NULL)) { + if ((lkflags & LK_EXCLUSIVE) != 0) + ASSERT_VOP_ELOCKED(basevp, __func__); + else + ASSERT_VOP_LOCKED(basevp, __func__); + unionvp_doomed = true; + } else { + vrele(basevp); + unionvp_doomed = false; + } + + return (unionvp_doomed); +} + + +/* + * Indicate completion of a forwarded VOP previously prepared by + * unionfs_forward_vop_start_pair(). + * basevp1 and basevp2 must be the same values passed to the prior + * call to unionfs_forward_vop_start_pair(). unionvp1 and unionvp2 + * must be the unionfs vnodes that were initially above basevp1 and + * basevp2, respectively. + * basevp1 and basevp2 (if not NULL) must be locked when this function + * is called, while unionvp1 and/or unionvp2 may be unlocked if either + * unionfs vnode has become doomed. + * lkflags1 and lkflag2 represent the locking flags that should be + * used to re-lock unionvp1 and unionvp2, respectively, if either + * vnode has become doomed. + * + * Returns true if any unionfs vnode was found to be doomed, false + * otherwise. + */ +bool +unionfs_forward_vop_finish_pair( + struct vnode *unionvp1, struct vnode *basevp1, int lkflags1, + struct vnode *unionvp2, struct vnode *basevp2, int lkflags2) +{ + bool vp1_doomed, vp2_doomed; + + /* + * If either vnode is found to have been doomed, set + * a flag indicating that it needs to be re-locked. + * Otherwise, simply drop the base-vnode reference that + * was taken in unionfs_forward_vop_start(). + */ + vp1_doomed = unionfs_forward_vop_rele(unionvp1, basevp1, lkflags1); + + if (unionvp2 != NULL) + vp2_doomed = unionfs_forward_vop_rele(unionvp2, basevp2, lkflags2); + else + vp2_doomed = false; + + /* + * If any of the unionfs vnodes need to be re-locked, that + * means the unionfs vnode's lock is now de-coupled from the + * corresponding base vnode. We therefore need to drop the + * base vnode lock (since nothing else will after this point), + * and also release the reference taken in + * unionfs_forward_vop_start_pair(). + */ + if (__predict_false(vp1_doomed && vp2_doomed)) + VOP_VPUT_PAIR(basevp1, &basevp2, true); + else if (__predict_false(vp1_doomed)) { + /* + * If basevp1 needs to be unlocked, then we may not + * be able to safely unlock it with basevp2 still locked, + * for the same reason that an ordinary VFS call would + * need to use VOP_VPUT_PAIR() here. We might be able + * to use VOP_VPUT_PAIR(..., false) here, but then we + * would need to deal with the possibility of basevp2 + * changing out from under us, which could result in + * either the unionfs vnode becoming doomed or its + * upper/lower vp no longer matching basevp2. Either + * scenario would require at least re-locking the unionfs + * vnode anyway. + */ + if (unionvp2 != NULL) { + VOP_UNLOCK(unionvp2); + vp2_doomed = true; + } + vput(basevp1); + } else if (__predict_false(vp2_doomed)) + vput(basevp2); + + if (__predict_false(vp1_doomed || vp2_doomed)) + vn_lock_pair(unionvp1, !vp1_doomed, lkflags1, + unionvp2, !vp2_doomed, lkflags2); + + return (vp1_doomed || vp2_doomed); +} + /* * Create a new whiteout. * - * dvp should be locked on entry and will be locked on return. + * udvp and dvp should be locked on entry and will be locked on return. */ int -unionfs_mkwhiteout(struct vnode *dvp, struct componentname *cnp, - struct thread *td, char *path, int pathlen) +unionfs_mkwhiteout(struct vnode *dvp, struct vnode *udvp, + struct componentname *cnp, struct thread *td, char *path, int pathlen) { struct vnode *wvp; struct nameidata nd; struct mount *mp; int error; + int lkflags; wvp = NULLVP; NDPREINIT(&nd); - if ((error = unionfs_relookup(dvp, &wvp, cnp, &nd.ni_cnd, td, path, + if ((error = unionfs_relookup(udvp, &wvp, cnp, &nd.ni_cnd, td, path, pathlen, CREATE))) { return (error); } if (wvp != NULLVP) { - if (dvp == wvp) + if (udvp == wvp) vrele(wvp); else vput(wvp); @@ -986,9 +1145,11 @@ unionfs_mkwhiteout(struct vnode *dvp, struct componentname *cnp, return (EEXIST); } - if ((error = vn_start_write(dvp, &mp, V_WAIT | V_PCATCH))) + if ((error = vn_start_write(udvp, &mp, V_WAIT | V_PCATCH))) goto unionfs_mkwhiteout_free_out; - error = VOP_WHITEOUT(dvp, &nd.ni_cnd, CREATE); + unionfs_forward_vop_start(udvp, &lkflags); + error = VOP_WHITEOUT(udvp, &nd.ni_cnd, CREATE); + unionfs_forward_vop_finish(dvp, udvp, lkflags); vn_finished_write(mp); diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 31d30ffb8971..d74d6736e580 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -371,21 +371,27 @@ unionfs_create(struct vop_create_args *ap) error = EROFS; if (udvp != NULLVP) { + int lkflags; + bool vp_created = false; + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_CREATE(udvp, &vp, cnp, ap->a_vap); - if (error != 0) - goto unionfs_create_abort; - - if (vp->v_type == VSOCK) + if (error == 0) + vp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + lkflags)) && error == 0) { + error = ENOENT; + } + if (error == 0 && vp->v_type == VSOCK) *(ap->a_vpp) = vp; - else { + else if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); vrele(vp); - } + } else if (vp_created) + vput(vp); } -unionfs_create_abort: UNIONFS_INTERNAL_DEBUG("unionfs_create: leave (%d)\n", error); return (error); @@ -409,11 +415,14 @@ unionfs_whiteout(struct vop_whiteout_args *ap) error = EOPNOTSUPP; if (udvp != NULLVP) { + int lkflags; switch (ap->a_flags) { case CREATE: case DELETE: case LOOKUP: + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_WHITEOUT(udvp, cnp, ap->a_flags); + unionfs_forward_vop_finish(ap->a_dvp, udvp, lkflags); break; default: error = EINVAL; @@ -445,21 +454,27 @@ unionfs_mknod(struct vop_mknod_args *ap) error = EROFS; if (udvp != NULLVP) { + int lkflags; + bool vp_created = false; + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_MKNOD(udvp, &vp, cnp, ap->a_vap); - if (error != 0) - goto unionfs_mknod_abort; - - if (vp->v_type == VSOCK) + if (error == 0) + vp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + lkflags)) && error == 0) { + error = ENOENT; + } + if (error == 0 && vp->v_type == VSOCK) *(ap->a_vpp) = vp; - else { + else if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); vrele(vp); - } + } else if (vp_created) + vput(vp); } -unionfs_mknod_abort: UNIONFS_INTERNAL_DEBUG("unionfs_mknod: leave (%d)\n", error); return (error); @@ -892,8 +907,12 @@ unionfs_setattr(struct vop_setattr_args *ap) uvp = unp->un_uppervp; } - if (uvp != NULLVP) + if (uvp != NULLVP) { + int lkflags; + unionfs_forward_vop_start(uvp, &lkflags); error = VOP_SETATTR(uvp, vap, ap->a_cred); + unionfs_forward_vop_finish(ap->a_vp, uvp, lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_setattr: leave (%d)\n", error); @@ -927,6 +946,7 @@ unionfs_write(struct vop_write_args *ap) struct unionfs_node *unp; struct vnode *tvp; int error; + int lkflags; /* UNIONFS_INTERNAL_DEBUG("unionfs_write: enter\n"); */ @@ -935,7 +955,9 @@ unionfs_write(struct vop_write_args *ap) unp = VTOUNIONFS(ap->a_vp); tvp = (unp->un_uppervp != NULLVP ? unp->un_uppervp : unp->un_lowervp); + unionfs_forward_vop_start(tvp, &lkflags); error = VOP_WRITE(tvp, ap->a_uio, ap->a_ioflag, ap->a_cred); + unionfs_forward_vop_finish(ap->a_vp, tvp, lkflags); /* UNIONFS_INTERNAL_DEBUG("unionfs_write: leave (%d)\n", error); */ @@ -1001,6 +1023,7 @@ unionfs_fsync(struct vop_fsync_args *ap) struct unionfs_node_status *unsp; struct vnode *ovp; enum unionfs_lkupgrade lkstatus; + int error, lkflags; KASSERT_UNIONFS_VNODE(ap->a_vp); @@ -1019,7 +1042,11 @@ unionfs_fsync(struct vop_fsync_args *ap) if (ovp == NULLVP) return (EBADF); - return (VOP_FSYNC(ovp, ap->a_waitfor, ap->a_td)); + unionfs_forward_vop_start(ovp, &lkflags); + error = VOP_FSYNC(ovp, ap->a_waitfor, ap->a_td); + unionfs_forward_vop_finish(ap->a_vp, ovp, lkflags); + + return (error); } static int @@ -1048,6 +1075,7 @@ unionfs_remove(struct vop_remove_args *ap) udvp = dunp->un_uppervp; cnp = ap->a_cnp; td = curthread; + unp = NULL; if (ap->a_vp->v_op != &unionfs_vnodeops) { if (ap->a_vp->v_type != VSOCK) @@ -1097,12 +1125,17 @@ unionfs_remove(struct vop_remove_args *ap) * XXX: if the vnode type is VSOCK, it will create whiteout * after remove. */ + int udvp_lkflags, uvp_lkflags; if (ump == NULL || ump->um_whitemode == UNIONFS_WHITE_ALWAYS || lvp != NULLVP) cnp->cn_flags |= DOWHITEOUT; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + ((unp == NULL) ? NULL : uvp), &uvp_lkflags); error = VOP_REMOVE(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, + ((unp == NULL) ? NULL : ap->a_vp), uvp, uvp_lkflags); } else if (lvp != NULLVP) - error = unionfs_mkwhiteout(udvp, cnp, td, path, pathlen); + error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, path, pathlen); UNIONFS_INTERNAL_DEBUG("unionfs_remove: leave (%d)\n", error); @@ -1158,8 +1191,14 @@ unionfs_link(struct vop_link_args *ap) if (needrelookup != 0) error = unionfs_relookup_for_create(ap->a_tdvp, cnp, td); - if (error == 0) + if (error == 0) { + int udvp_lkflags, uvp_lkflags; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + uvp, &uvp_lkflags); error = VOP_LINK(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_tdvp, udvp, udvp_lkflags, + ap->a_vp, uvp, uvp_lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_link: leave (%d)\n", error); @@ -1415,7 +1454,6 @@ unionfs_mkdir(struct vop_mkdir_args *ap) udvp = dunp->un_uppervp; if (udvp != NULLVP) { - vref(udvp); /* check opaque */ if (!(cnp->cn_flags & ISWHITEOUT)) { error = VOP_GETATTR(udvp, &va, cnp->cn_cred); @@ -1425,38 +1463,27 @@ unionfs_mkdir(struct vop_mkdir_args *ap) cnp->cn_flags |= ISWHITEOUT; } - if ((error = VOP_MKDIR(udvp, &uvp, cnp, ap->a_vap)) == 0) { + int udvp_lkflags; + bool uvp_created = false; + unionfs_forward_vop_start(udvp, &udvp_lkflags); + error = VOP_MKDIR(udvp, &uvp, cnp, ap->a_vap); + if (error == 0) + uvp_created = true; + if (__predict_false(unionfs_forward_vop_finish(dvp, udvp, + udvp_lkflags)) && error == 0) + error = ENOENT; + if (error == 0) { VOP_UNLOCK(uvp); cnp->cn_lkflags = LK_EXCLUSIVE; - /* - * The underlying VOP_MKDIR() implementation may have - * temporarily dropped the parent directory vnode lock. - * Because the unionfs vnode ordinarily shares that - * lock, this may allow the unionfs vnode to be reclaimed - * and its lock field reset. In that case, the unionfs - * vnode is effectively no longer locked, and we must - * explicitly lock it before returning in order to meet - * the locking requirements of VOP_MKDIR(). - */ - if (__predict_false(VTOUNIONFS(dvp) == NULL)) { - error = ENOENT; - goto unionfs_mkdir_cleanup; - } error = unionfs_nodeget(dvp->v_mount, uvp, NULLVP, dvp, ap->a_vpp, cnp); - cnp->cn_lkflags = lkflags; vrele(uvp); - } + cnp->cn_lkflags = lkflags; + } else if (uvp_created) + vput(uvp); } unionfs_mkdir_cleanup: - - if (__predict_false(VTOUNIONFS(dvp) == NULL)) { - vput(udvp); - vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); - } else if (udvp != NULLVP) - vrele(udvp); - UNIONFS_INTERNAL_DEBUG("unionfs_mkdir: leave (%d)\n", error); return (error); @@ -1523,10 +1550,16 @@ unionfs_rmdir(struct vop_rmdir_args *ap) */ if (error == 0 && VN_IS_DOOMED(uvp)) error = ENOENT; - if (error == 0) + if (error == 0) { + int udvp_lkflags, uvp_lkflags; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + uvp, &uvp_lkflags); error = VOP_RMDIR(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, + ap->a_vp, uvp, uvp_lkflags); + } } else if (lvp != NULLVP) - error = unionfs_mkwhiteout(udvp, cnp, td, + error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, unp->un_path, unp->un_pathlen); if (error == 0) { @@ -1560,15 +1593,24 @@ unionfs_symlink(struct vop_symlink_args *ap) udvp = dunp->un_uppervp; if (udvp != NULLVP) { + int udvp_lkflags; + bool uvp_created = false; + unionfs_forward_vop_start(udvp, &udvp_lkflags); error = VOP_SYMLINK(udvp, &uvp, cnp, ap->a_vap, ap->a_target); + if (error == 0) + uvp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + udvp_lkflags)) && error == 0) + error = ENOENT; if (error == 0) { VOP_UNLOCK(uvp); cnp->cn_lkflags = LK_EXCLUSIVE; error = unionfs_nodeget(ap->a_dvp->v_mount, uvp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); - cnp->cn_lkflags = lkflags; vrele(uvp); - } + cnp->cn_lkflags = lkflags; + } else if (uvp_created) + vput(uvp); } UNIONFS_INTERNAL_DEBUG("unionfs_symlink: leave (%d)\n", error); @@ -2277,8 +2319,12 @@ unionfs_setacl(struct vop_setacl_args *ap) uvp = unp->un_uppervp; } - if (uvp != NULLVP) + if (uvp != NULLVP) { + int lkflags; + unionfs_forward_vop_start(uvp, &lkflags); error = VOP_SETACL(uvp, ap->a_type, ap->a_aclp, ap->a_cred, td); + unionfs_forward_vop_finish(ap->a_vp, uvp, lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_setacl: leave (%d)\n", error); @@ -2460,9 +2506,13 @@ unionfs_setextattr_reopen: ovp = uvp; } - if (ovp == uvp) + if (ovp == uvp) { + int lkflags; + unionfs_forward_vop_start(ovp, &lkflags); error = VOP_SETEXTATTR(ovp, ap->a_attrnamespace, ap->a_name, ap->a_uio, cred, td); + unionfs_forward_vop_finish(ap->a_vp, ovp, lkflags); + } unionfs_setextattr_abort: UNIONFS_INTERNAL_DEBUG("unionfs_setextattr: leave (%d)\n", error); From nobody Sun Mar 24 03:04:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2LWv29Myz5Dmxt; Sun, 24 Mar 2024 03:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2LWt721nz4tN1; Sun, 24 Mar 2024 03:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7gF6a0lPs3v1J4uAlJWQ7dytUBjiNj7DvWGMEJL1Xo=; b=Vs+Xo0R3NufQCOagjLB73CDz/yjN+6d/JGQ5hqQpC11cooABypfC0r60EvQmYLkDybhxgB ZDTgFG0fzqD8sPvAZyICnxgXAGB1Cv2UX1fS+YM0rik4tQJmaoA1TJRHhrN/czGkSsiQ2d RLDMfcyYIvIt/maS3zPq9Cc9RmM7YA9c9MKxNT1NsrPD2xuSfq7RnH6To3esn5l3p3i+xd 5DaOMNSGwQhHy9xdwrazJ+fmUdc3O5TOX11LAp1tZ+15cms9Af5zy4s1w9EUiEwWMnE8V+ NIpdd0+RfomwcoOs6QK52FibIu6rz2PH14ylyOLj4zU0ysWGK1UdwW4jwlhuZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711249483; a=rsa-sha256; cv=none; b=gSqAuW4dZbgbQN4xmCq8l7ztIKbPmTtnGuguLVnpdv8DsUC0qv8HNtswiby9K6GmENuw/N QT8TqV1myTvbiYI9EMLZR3UrlB5BT8yQD82KdLwksM0LdV5lHkmxsaqPdH3VQHMjZC8BDu zq+q8xe01q0SfYwWVuFmG/gB8/ZSdSmoEgMGAxhEK5xwmlr80cGr3jxVN26q5miUmh9gyY nEXm4JvGBJLdfMkBzENdyRPzkGNYmCouZOR0ZzRuRQsY+l6ZRVPV/NeGV7BEyYakvqZHVv 9bs+pcMgTQ3IWrYs2wqBUpRezZy7AjO4EfOwpi0hZ1W2ShdYVKU5YJS7tH9HaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7gF6a0lPs3v1J4uAlJWQ7dytUBjiNj7DvWGMEJL1Xo=; b=jkiEeh6UWhUdUL+WP0o7dTn/CaIObGazloaoOzbNEkLREhSuNzZPOJBNdOui9OymUyS7kG 4IlkpwzU3f4Hv/WnlM2Ow2onhYNpPhQmA8GwKjpk3cjZxiRbBOCG1SLbL/a+5vEqyAb5m/ USfV6yhO0zqOryL9ob6TvVuWKUpEowfgzb2qkXSejquLTKdRpxjMmXQ8wRzEz9Nonk4EvV hs4TeynISsCIVjXjS2X5ioIVnjPGMMkO6MLbIi4bC6WBRizZVaOSCbtgIiIV0Rjk7f5sL0 gMj0OFLjzVnReMFah1DkvO7r9NNXn0OVdy/GMR7CyZltyqfa8sEXbPEDZbTi9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2LWt6dWzzG3p; Sun, 24 Mar 2024 03:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O34gHC038604; Sun, 24 Mar 2024 03:04:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O34ge2038601; Sun, 24 Mar 2024 03:04:42 GMT (envelope-from git) Date: Sun, 24 Mar 2024 03:04:42 GMT Message-Id: <202403240304.42O34ge2038601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 61d9b0cb38bb - stable/14 - uipc_bindat(): Explicitly specify exclusive locking for the new vnode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 61d9b0cb38bb0b057929997c7eab689105bfdeb6 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=61d9b0cb38bb0b057929997c7eab689105bfdeb6 commit 61d9b0cb38bb0b057929997c7eab689105bfdeb6 Author: Jason A. Harmening AuthorDate: 2024-02-03 17:07:16 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-24 02:55:38 +0000 uipc_bindat(): Explicitly specify exclusive locking for the new vnode When calling VOP_CREATE(), uipc_bindat() reuses the componentname object from the preceding lookup operation, which is likely to specify LK_SHARED. Furthermore, the VOP_CREATE() interface technically only requires the newly-created vnode to be returned with a shared lock. However, the socket layer requires the new vnode to be locked exclusive and asserts to that effect. In most cases, this is not a practical concern because most if not all base-layer filesystems (certainly FFS, ZFS, and msdosfs at least) always return the vnode locked exclusive regardless of the lock flags. However, it is an issue for unionfs which uses cn_lkflags to determine how the new unionfs wrapper vnode should be locked. While it would be easy enough to work around this issue within unionfs itself, it seems better for the socket layer to be explicit about its locking requirements when issuing VOP_CREATE(). Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D44047 (cherry picked from commit d56c175ac9353bd701a488bb2606a3372623dcc5) --- sys/kern/uipc_usrreq.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 5d39e5ea91c1..e54cd01956bf 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -622,8 +622,19 @@ restart: error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif - if (error == 0) + if (error == 0) { + /* + * The prior lookup may have left LK_SHARED in cn_lkflags, + * and VOP_CREATE technically only requires the new vnode to + * be locked shared. Most filesystems will return the new vnode + * locked exclusive regardless, but we should explicitly + * specify that here since we require it and assert to that + * effect below. + */ + nd.ni_cnd.cn_lkflags = (nd.ni_cnd.cn_lkflags & ~LK_SHARED) | + LK_EXCLUSIVE; error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + } NDFREE_PNBUF(&nd); if (error) { VOP_VPUT_PAIR(nd.ni_dvp, NULL, true); From nobody Sun Mar 24 05:13:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2PN302pkz5F1rn; Sun, 24 Mar 2024 05:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2PN256J2z45wP; Sun, 24 Mar 2024 05:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ul9GZ0LXkxW3h04xJfjQSu/v1qF6vCi1Rsn/rKdROko=; b=trXhkY4E0WnpuJ7nOnIzLwT1s68wftJnDXa343NukFXaJ3AhpGgjswGNfC7lSECPofGX46 HLDnaFO5sYz6KCKXr2dtH03DgkVbOjEOpwq5DplKMLw7cuni8zMAmC1/s5gRFf+mzmDf7p SeAjBo7BeUGbeuMLh+GReYmTVR2uQ5URM3TEcNHNbwDv48DJTUrv3/KFJhH0iGFADpGyt2 0PPIdcJyuAeTNcL0yGB3/hrnKz8KzxqNjKFlTcrOgeQqsPD6DxEMq8KkV/2joQFACQ9n41 qxV0l5Q7WRXMUT6Uc+cDSS9pYTI1zsiIBqgd5RwjXiF5k+q8sFYk+HdPhMqIkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711257186; a=rsa-sha256; cv=none; b=eBbwKvnkIfPqpkVDBvUbfrSN5guGdH2+QMy0Jma9+AGiT7z7zzq/TWyKEX5PN/nY9/YSaT 5i2ZyH4Sfv8Usjmve6Saf2zgJA1v65j8uVMmf8yt7kePxGE8k+q1TB3knDvmuw6Pr52dGv rBUmRD42rOJEfoMS3BCYNT35CYCnLtQEUJ/jQEFsPzSDxVfsitPUN23IADDmnbGclF0Mdk X3LtdxznxS5w6/c6VzsUnZ+KCZqmxLeLYCraWbd4wiinG9UFPLW2s7MCeJzFPMweMPiYQD /WsTSx3NvBoM15YcCpqwwpNdgH9VXnlKoQzhQ3TcvE6f26h/t3PWsRPkakkzFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ul9GZ0LXkxW3h04xJfjQSu/v1qF6vCi1Rsn/rKdROko=; b=hOb9ye8zo/v/lgLocT2P1TO57gzSxdgRRD4FiRdqP6/LBFeAtrVMFjF1P7DuCwYswof+4Z xBRc8fW5NyzcTFNdTih0H3/3niiUvKer1TGFqmuUnGJkdynZghWYpYPogp7j9EaYnqPBgP DMEx1hTiRNdm078jcNZSt0eV2sYUxCrCGMImQxnSvNxuDDyCIy31hIkIH1Uv+KbTEb8chr KuUeN6jbw1Tphi8WS2e0Xw0c5TZHZzCeEqLi/YFgqMe0GXrVMMZH5mSc0QngQHUHaj/EKO 5vu+eDruYduX2hFtPWGQFdNJGGNRxfE1uTDSdupupEUHw+6bn1iim3Rkk2EFcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2PN24kLfzJyf; Sun, 24 Mar 2024 05:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O5D64S058095; Sun, 24 Mar 2024 05:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O5D601058092; Sun, 24 Mar 2024 05:13:06 GMT (envelope-from git) Date: Sun, 24 Mar 2024 05:13:06 GMT Message-Id: <202403240513.42O5D601058092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e87a6f886046 - stable/14 - wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e87a6f8860463c71773c5a02f9824d940a27d2d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e87a6f8860463c71773c5a02f9824d940a27d2d7 commit e87a6f8860463c71773c5a02f9824d940a27d2d7 Author: Konstantin Belousov AuthorDate: 2024-03-21 08:38:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-24 05:12:39 +0000 wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() PR: 277855 (cherry picked from commit 69d5783ae81b74295118950d01b6dddb3e504a56) --- lib/libc/string/wmemchr.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3 index 4466a7e9b1b4..ebb0881dac16 100644 --- a/lib/libc/string/wmemchr.3 +++ b/lib/libc/string/wmemchr.3 @@ -33,7 +33,7 @@ .\" .\" from: @(#)strcpy.3 8.1 (Berkeley) 6/4/93 .\" -.Dd July 14, 2021 +.Dd March 21, 2024 .Dt WMEMCHR 3 .Os .Sh NAME @@ -82,9 +82,9 @@ .Ft wchar_t * .Fn wmemset "wchar_t *s" "wchar_t c" "size_t n" .Ft wchar_t * -.Fn wcpcpy "wchar_t *s1" "wchar_t *s2" +.Fn wcpcpy "wchar_t * restrict s1" "const wchar_t * restrict s2" .Ft wchar_t * -.Fn wcpncpy "wchar_t *s1" "wchar_t *s2" "size_t n" +.Fn wcpncpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n" .Ft int .Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2" .Ft wchar_t * From nobody Sun Mar 24 05:13:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2PNj4vZhz5F1dx; Sun, 24 Mar 2024 05:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2PNj3tttz467M; Sun, 24 Mar 2024 05:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nUiQHY8gX+AzCsuaAvW/C+OWtm0iY75W6M9iIfx9qY=; b=aRl7wSz47+RyWSAugJJM/DzEQ2xDsfmNf7P8OnB1hzeckq6V71RukTvjWccmpUPMyAiJCh c2obf9K+RnePE02+b41B06IZSd2vbL4JSZZKGOe7yqMpcZizc8/UHJIfuYxZBRCgbgr1+O W0oJNjKwA1PJlT/8Q8fKHU3fWXDd8MYrH5ieOO05ZpQ7O0/AeYqbjTmTRE+KzTYdQR1FCw 2IEtYQbOz4kRC6Lndiblqrs0HBQg+L7Ychh1w4bN7BHIL3XjFc2kWsOWZnNofZyCKn7kS1 MsCAT1HlM8PVQq/UxIXPFx2p7Ah4wTkAtXccyi51cyWJltTh5JKrXzPCIn/1/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711257221; a=rsa-sha256; cv=none; b=vR8DWv6PgxMrvLPtq9Usig0THLmxQcpBou9MF6bLTBXiJ4nD4rvJIseliL4eOUb2PaZzhj 2JN4XV+pWKFtVt7iPVzJaahbCrWTjvTG1w35bmdJ4VzncMPFdjTDDvpKVyrze7Wwjg5Zs6 nksyh5NUZ6CKGQ8vjFdM3bV2pidIrpvLXx1xBdA8Dhcq5rQBCuqOEhFNcsupUzqgHP772z wA919n4avxOH98Dl2cKIBs3fFAXrNpJ0d4v3mRAS3eZOrQjxbIjddpre7fzuP68MKJk0IT XWd97pf+9QtoHCJQ96byxv6OPBRTHAh964TESKLvOYD4f0N2XbMW74KkELRHZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nUiQHY8gX+AzCsuaAvW/C+OWtm0iY75W6M9iIfx9qY=; b=L7kLccWOWxw/4UiatfGsvd0aQXWkBfPIfnRjosngduLnB1czjmp4l66ZjrgRU7uc2vuQ9J d4RMZJccI34pmdLQ92FGS6JMK6aimC+cgrEwkWzY3J3BnhZy7p5cIbMx3c0J3MIbV7ISK/ 61iGGLxwpAqjqMquU8qbr2bsOPbo2bR2rUqyhgiI0JUt30G1Gno6s1Moy5ZgpZrOil5GdH R2RIa1TtJMIv+7QfaVWZ+0AwK4EpO6NocNcI9hzICACLsZpfOrMP0mKEZtFOZaoAeIHdoS 0BCRhQVbjk0o6HLYiJ0OUjVc8vLkk/lWdnvZ05RclghKVe6r1ILLYwzabZt0rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2PNj3TjkzJY5; Sun, 24 Mar 2024 05:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42O5DffY058293; Sun, 24 Mar 2024 05:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O5DfO1058290; Sun, 24 Mar 2024 05:13:41 GMT (envelope-from git) Date: Sun, 24 Mar 2024 05:13:41 GMT Message-Id: <202403240513.42O5DfO1058290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ed995c67e059 - stable/13 - wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ed995c67e0596edf30c21a402ed9678a6c86478f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed995c67e0596edf30c21a402ed9678a6c86478f commit ed995c67e0596edf30c21a402ed9678a6c86478f Author: Konstantin Belousov AuthorDate: 2024-03-21 08:38:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-24 05:13:20 +0000 wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() PR: 277855 (cherry picked from commit 69d5783ae81b74295118950d01b6dddb3e504a56) --- lib/libc/string/wmemchr.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3 index 4466a7e9b1b4..ebb0881dac16 100644 --- a/lib/libc/string/wmemchr.3 +++ b/lib/libc/string/wmemchr.3 @@ -33,7 +33,7 @@ .\" .\" from: @(#)strcpy.3 8.1 (Berkeley) 6/4/93 .\" -.Dd July 14, 2021 +.Dd March 21, 2024 .Dt WMEMCHR 3 .Os .Sh NAME @@ -82,9 +82,9 @@ .Ft wchar_t * .Fn wmemset "wchar_t *s" "wchar_t c" "size_t n" .Ft wchar_t * -.Fn wcpcpy "wchar_t *s1" "wchar_t *s2" +.Fn wcpcpy "wchar_t * restrict s1" "const wchar_t * restrict s2" .Ft wchar_t * -.Fn wcpncpy "wchar_t *s1" "wchar_t *s2" "size_t n" +.Fn wcpncpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n" .Ft int .Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2" .Ft wchar_t * From nobody Sun Mar 24 17:49:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2k8n1WRlz5G7gR; Sun, 24 Mar 2024 17:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2k8n0xWNz4Qf4; Sun, 24 Mar 2024 17:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNjgwOS0hG3BckfjDhLYWtmacgvFTnGcnjT5MP09FhU=; b=k3cItUDWagpzfVCweQ/vEJEVfvBrS20+B4BGL/ZrSBuv7aSWANM0aqp4GMIDmOeM5MmE6Q o+bJPUgd8YB8L5xN2WqsZw2D3kj11P47r874w281WknZ4r1Q75xXNG/FKyuDSG7til3WzV Ano0hsOriqS8BuODGoy5vCrwLUiugOxzqx7oFh+i5hS8+/MRSCZMBTRVawqgLdEG6YWRdr 3COP+W1Hq6aaEvb7YJfJ98QI/HLNOw0zmlpUdgG8aO92erev6uO+31hevtQpZsC8KLl+zA mdbmajfybY7yXYrOhu7eyun80Nq9NK4sKZO8e6N4MQuUwAhd2fSBsd7Yxh2D+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711302569; a=rsa-sha256; cv=none; b=KY2Xq/ymAf1B6nminXpd37/QxjXUbpaQddYCe49mklNnU/UkL+PRAZrFwyEnYaWh0I3pfG TdkvQaxv6rmnW5vvOkeXALNROAN8syERzf4s8Q4XlmVfhV01G41Pia+u+N9aHni6YK1sJl 0lqt7VpeX31/EhzkTR7IodzCjavrUQmmfhCxU/Mxr2dEY2fb26Zq9T5Phep13ICcHYIq3r MFTt4zlKHH99PptVuVwYSJ4uBcmwA9hnCA1G9iBxi1CbxfsQrC//swwEMRv5KgPg50t3cQ sDWOhzl0nxYNd3do1Pagl+6u0jTiwdxxuJtVi42e2UQwFdkE+EnCNaovQVVz7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNjgwOS0hG3BckfjDhLYWtmacgvFTnGcnjT5MP09FhU=; b=VY5kEJ5RcBY3ai1pot/58s8rnjFhCQm8ZNo4w5yU4XY06Gr35d3XRxRSoMfVrJ1KOm8fay kue2vuyoaCcrLcr6atTVwfB2drdX6v0bnHd954lXDObcH88jvUckTgZJ0CXu/JNQPYvJTR JrTMPR5eHQr3LQqNQEjl5ESui5bWtyHOWs/gsZ/W6EYfzNz+bBECWtFp2m1eqMBNDaRXWB bnAQscldD4tFHgDIEPO+AQOcOoQU0xh7ThuJ0SZoRsIVXaj7N+LglVsfohQwEIWsv3WX1n HWws14mBaZo6RihzX3npFb7UxueobKK0s4+FyLlXZBvFnOukamUyKYM1BzclZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2k8n0Y7Hzj3Q; Sun, 24 Mar 2024 17:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42OHnSks031012; Sun, 24 Mar 2024 17:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OHnSxH031009; Sun, 24 Mar 2024 17:49:28 GMT (envelope-from git) Date: Sun, 24 Mar 2024 17:49:28 GMT Message-Id: <202403241749.42OHnSxH031009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c3c2233c9673 - stable/14 - gpioevents: Fix build with newer Clang List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3c2233c9673f6ce39109d26f934b848b3749b18 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3c2233c9673f6ce39109d26f934b848b3749b18 commit c3c2233c9673f6ce39109d26f934b848b3749b18 Author: John F. Carr AuthorDate: 2024-03-02 15:38:04 +0000 Commit: Ed Maste CommitDate: 2024-03-24 17:48:55 +0000 gpioevents: Fix build with newer Clang PR: 277422 (cherry picked from commit 42b117a4bd104246589149fa9f7b9b7ddc144f23) --- tools/test/gpioevents/Makefile | 2 ++ tools/test/gpioevents/gpioevents.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/test/gpioevents/Makefile b/tools/test/gpioevents/Makefile index 7976bd03174a..4bc4422ae333 100644 --- a/tools/test/gpioevents/Makefile +++ b/tools/test/gpioevents/Makefile @@ -8,4 +8,6 @@ MK_MAN= no BINDIR= /usr/bin +CWARNFLAGS += -Wno-gnu-folding-constant + .include diff --git a/tools/test/gpioevents/gpioevents.c b/tools/test/gpioevents/gpioevents.c index f1bc8e8ee224..43bad610cb68 100644 --- a/tools/test/gpioevents/gpioevents.c +++ b/tools/test/gpioevents/gpioevents.c @@ -61,7 +61,7 @@ sigio_handler(int sig __unused){ } static void -usage() +usage(void) { fprintf(stderr, "usage: %s [-f ctldev] [-m method] [-s] [-n] [-S] [-u]" "[-t timeout] [-d delay-usec] pin intr-config pin-mode [pin intr-config pin-mode ...]\n\n", @@ -152,7 +152,7 @@ print_poll_events(short event) } static void -calc_utc_offset() +calc_utc_offset(void) { struct timespec monotime, utctime; From nobody Sun Mar 24 17:49:30 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V2k8p2jSYz5G7x4; Sun, 24 Mar 2024 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V2k8p2HQnz4Qf7; Sun, 24 Mar 2024 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tS/JsFkPOny+ZcspvMT/wgYu8mfYWffwSpoNS4bg6vM=; b=T9qYAxmqkELNg0qxPgfIVS8ycJlCVdYiCLhMWIcp4LFQseGT3efx9UrVMsJo/hyHo4x5zh 3ohlPvlHknyhf/w1eUhReVUgM92Yvrj1tId5RKMYXmwQp/0efjDjwDI4u+eKPyIJnKmc6s ngJIphCLZBO+6tb1Fh115KlR7q1eTSZ36SL6y3aCjTyq3ZDxhYenM5zazCJIU0KS2AdVCx sY340HGD/sUpgLkL8l94LC4Dsb4glIgvVEOY0R/SJ08D9gUaoJX/jsUd1qkFTqwFWtuMUf eSed37o30bXwxdMLDSciwn9feHJMieBAbi/Cj5qyjwOTsKblFUWgv/mAGC4sEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711302570; a=rsa-sha256; cv=none; b=llB8hirr98DmMyUcvX9IdetXAK+yW4yLvUWvyJcdyPnRVH89kCLeahWRg7wAF728D7COib 5S+hYAlBE5PEJox2FOOMndIPZoRRKkqZ/LLbby+jj6v8k8ZCG4j3uvILADkiPkV3eLHEtl 5Egr03nc2cdiixQi4omHrh6bNGKSgZBRqXh+vMj1QviQVc930XivXNMPvcKkwT4q7fnCOu 92gSoSXm4CmSPxBrqo32uyOk8TTGKAVaJtz96CFgRyGm5obDZCebVxiNJ9F3hbnTOpRoHd 5hEqQ8VucxmSQd7m3FtY+ag2dbowRyuoLW2rf+J6EckN5Jqjl1K97h5BWrqVPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tS/JsFkPOny+ZcspvMT/wgYu8mfYWffwSpoNS4bg6vM=; b=JdLItUc74S0Kl8deJOxud3ViYm4jOQWeiEWecJNkI5mblVqTlCkRbF/8ghmHWoqnsNuyPT plAEE95mGpAXpoaRNjDCdrweufBuTLP2Njmznb1YnKqOF684DLbFt1ILVI7hWXx7RSssch VatLPT5+lFPpxvScd7YXxOAGlyFEZwDZ55dIz62czpmufri2/BzNd188sTZComdL+eh0Nf LYmVDzUlPeJ3IsjG6WUge2UUtvh6prgjKmeLbTMANm8vA7e9DdP6J9Hra6P6hCHuO0Go/1 6yKKEjGDQnZVxgnCF/yFulPE1om5CS08Vl83SDCgQjCzWtPC6qNX2bawWAV8Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V2k8p1cFRzj3R; Sun, 24 Mar 2024 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42OHnUjJ031063; Sun, 24 Mar 2024 17:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OHnUQl031060; Sun, 24 Mar 2024 17:49:30 GMT (envelope-from git) Date: Sun, 24 Mar 2024 17:49:30 GMT Message-Id: <202403241749.42OHnUQl031060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: adc61137fdf7 - stable/14 - Cirrus-CI: bump Clang versions to 16 and 17 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: adc61137fdf7b31b5f32354b970a8d824347b0de Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=adc61137fdf7b31b5f32354b970a8d824347b0de commit adc61137fdf7b31b5f32354b970a8d824347b0de Author: Ed Maste AuthorDate: 2024-02-29 22:00:39 +0000 Commit: Ed Maste CommitDate: 2024-03-24 17:48:55 +0000 Cirrus-CI: bump Clang versions to 16 and 17 Clang/LLVM 17 is currently the in-tree default compiler, so use it as the default Cirrus-CI toolchain. Clang/LLVM 18 is coming soon and needs to be added here, but I ran into trouble with llvm18-lite package availability so will look at that later. Reviewed by: dim (earlier), Jose Luis Duran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44162 (cherry picked from commit 51c6bf0478bd331225121eb4a0a60510cc3920b1) --- .cirrus.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 96fbb873136c..d84614321145 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,36 +14,36 @@ env: task: matrix: - - name: amd64-llvm15 World and kernel build and boot smoke test + - name: amd64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: amd64-llvm16 World and kernel build and boot smoke test + - name: amd64-llvm17 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: arm64-llvm15 World and kernel build and boot smoke test + - name: arm64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN} - - name: arm64-llvm16 World and kernel build and boot smoke test + - name: arm64-llvm17 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'