From nobody Sun Sep 10 04:28:19 2023 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 4Rjxfq6JLzz4sMKL; Sun, 10 Sep 2023 04:28: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 4Rjxfq5q38z3WgP; Sun, 10 Sep 2023 04:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694320099; 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=zfP8UqCKbYUISDi4g5esV/uKbQPirL5aBfygXXpGyrc=; b=hifshi2q7D4UoxfAc6yqeKOb4irEwOYzS3KRKwprIF/CO6zPHr2M0/3s5rz5SSg9DVAozB YxHSUA91l8JfBIOY1msiuLWbokAZy47PPRhC1OkdhBAavvG/BzRODNCAFiKeJ/9xSo/unM n1FWs9DUF58qvETjsNLWpkjCdhTumkJ4ukipR/CNG6kDnoj7OOuFYC9KXBz+iX5dKbrCke fp8TmFAU2r9hwGPPDQUUkyCATebYI0FLdgKiNnSMPBcxYtyAb9Ot1BEh1ZcO69OSyFRtNG 27L4YUbLox8cV6S00dS57EVyiW3ylLYJFsMhqPL9tFi9V1uaJaV4/8zbT1VxUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694320099; a=rsa-sha256; cv=none; b=wHXPIPT/VLyOxgHCp/ci2AzzulsjrQzLwF7fGUwg3Ns7+guRCb/SKzMjGde1RRL3FAMKxA YxOwWy4TMmOWmdsCMN7pqlwO2ZAVm4SdWDv+j4lERU7TVwKjCqNPVDsua3WpG1mddHd9Rw cq521hDK07Dw4t7DTQOre0OviHDzPu7GVF/BjAR6961SUrP6QnVZQa1TfGdSeyw/mswnbt 8mWI6izjfHJCXko1KIOJm0Pl+MFczdAPT65gTJtyvuXGhDyDE/jBWd8R4uF2yJOe7+F1vX kft84E1ovhckH7Ld8P8PrS3IY+ew+Ky+OLtQwv+o6RLZjUbZxs5NTWwoZUsBlw== 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=1694320099; 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=zfP8UqCKbYUISDi4g5esV/uKbQPirL5aBfygXXpGyrc=; b=hTyiOuGfydXz+11bZE2/crtB8SLMDWKgfWE+/YeJyDdCw17OS5D2S70xCICFipQP0uJkbn NbMZRCFDhCmV+gNeLe9t74kxTcjb+nN8Q6UMHvTWq99cc3RuccVUVr95wZj2ZADg4eSU24 GhrIVtJdc8iMTiYQmNKwZavfMkAala/sga68nFV6skIovgnljoyHppMBRV1lVHESo4aIas zcZIrCgLwr0XTsz+iKxtO+CAastLwnV7D0StsuE8B8eC3v77UtPFa4EpeUsicvGAhUI/L+ jXRWjXThoPwPlsDCIcMXkP3lJk3OnPcjziqw1GY3uB36RluA2eqJt0tHItds3w== 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 4Rjxfq4n3Lzsp1; Sun, 10 Sep 2023 04:28: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 38A4SJOJ046396; Sun, 10 Sep 2023 04:28:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A4SJpI046393; Sun, 10 Sep 2023 04:28:19 GMT (envelope-from git) Date: Sun, 10 Sep 2023 04:28:19 GMT Message-Id: <202309100428.38A4SJpI046393@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: 3d36161bc3aa - releng/14.0 - localedef: correct definition of right-parenthesis in default charmap 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3d36161bc3aa90d329c10b10bbb27a17d33a2b13 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3d36161bc3aa90d329c10b10bbb27a17d33a2b13 commit 3d36161bc3aa90d329c10b10bbb27a17d33a2b13 Author: Kyle Evans AuthorDate: 2023-09-02 05:56:31 +0000 Commit: Kyle Evans CommitDate: 2023-09-10 04:27:50 +0000 localedef: correct definition of right-parenthesis in default charmap It turns out that right parentheses do exist and are different than left parentheses, so let's switch to that. Approved by: re (kib) Sponsored by: Klara, Inc. (cherry picked from commit 07bc20e4740d09f554c3787bb1940fc503300822) (cherry picked from commit 8d98eb4e51eb1777b6bdb3682dbd7472c9cc2c71) --- usr.bin/localedef/charmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c index bc302965de1a..44b7e3292eae 100644 --- a/usr.bin/localedef/charmap.c +++ b/usr.bin/localedef/charmap.c @@ -86,7 +86,7 @@ static const struct { { "ampersand", '&' }, { "apostrophe", '\'' }, { "left-parenthesis", '(' }, - { "right-parenthesis", '(' }, + { "right-parenthesis", ')' }, { "asterisk", '*' }, { "plus-sign", '+' }, { "comma", ','}, From nobody Sun Sep 10 04:28:20 2023 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 4Rjxfs0KGCz4sMVQ; Sun, 10 Sep 2023 04:28: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 4Rjxfr6rk8z3WZT; Sun, 10 Sep 2023 04:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694320101; 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=8S2+ikeR08FbFDDOQTcKrmhK5ydrFjld4dWfq9dt1kw=; b=S2NgBl/xeHapYJOnX93JGkj7tekuTiDOyqIjx3J0EFeJCx9rcCMh8XLxAjVFSkT/SL9JqU B2hEznTPGJItgGBL3Rq9DybkA6MvPol12pnKEJTngMH8d06YDMXNMZqcej5KGqqPG9XvHw RdzHHMZBdjdFFVwSg7An/V3L3BLv4E1QCsC5nabBoRPGwV5FjCZZvRZ8TCzmVKxoGGipTL 94bzZPYJFAd6wR08+IJ62GZsLqmI65MWlN6BjnuvaIYWjukqT0F9BZAi+QrbG+Xv7F1I0G bPIJixejn1HMqN88Ckb4UZgqMfyFWUCdDQdBZAeBTFd7rf5R0gOhHqN86tXj4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694320101; a=rsa-sha256; cv=none; b=eYn3qrMFn3+JJMxHSfu5c1Wld83BTPCQRXwafBpwH/ZYNqkezW1kJ3D5sImLhUgkj0EKuh QHBHHiF6T7rJGDYUb6zjfNOl98T3EYrtdR7gOh4Qd2iTamk7hOTm60+ac0JpUgFaKYvQ7A 7JylOSGvUtmcsZoYc28VtBRJd57IHtKa2ulszNcLznzsfX8Ul4zcF9AGqBbCUrp+s+eHkg 8yBkvuJGbPQLPzjudi+pyfbSn3FI5BvwT6vxLsKKITDYILwK3fDNX7yQJeeZi/qcJ376zF W23aI+qdDe4XtU1FezqU1eLe8mlz7aRRadtEf3epVk4sRNBR7tiAkh6Mlyg1FA== 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=1694320101; 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=8S2+ikeR08FbFDDOQTcKrmhK5ydrFjld4dWfq9dt1kw=; b=ypWZ7vjY5nSHcX3fvsYklO49Om71gdmWDZG6Ynub5xtZt2R6ee1GrYVQmsKft3bKIKCZMn nkaJRYxjlo9p0tt1Wkfd3yFJEU3O4Avq6xPp2BMV3TO3JqlDMlna2DODZ5ItaC2lQDJoSj UkfTqt/88cblwwqJwUPuhSFxyusTReF/FBOeSFWc5UnKpGJvwc9RaT3KuA3oodgmjtAOKc kM4rJyvr1XoP8kGyXpEQHqitrfPfKdETVE87No3Hn93j11FSlveIexsbDkf1u8OuDcx4rE HRT0+ptv5PtC2xEQUSrtUNOWvhdaoSP3uj2laCfI5dkMXBYIjtjljUJ8XzKfQA== 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 4Rjxfr5kgHzsFr; Sun, 10 Sep 2023 04:28: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 38A4SKMF046449; Sun, 10 Sep 2023 04:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38A4SKNB046446; Sun, 10 Sep 2023 04:28:20 GMT (envelope-from git) Date: Sun, 10 Sep 2023 04:28:20 GMT Message-Id: <202309100428.38A4SKNB046446@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: 2f215895ef67 - releng/14.0 - localedef: add newlines to error messages 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 2f215895ef67d0fdc8a2bf6f8c3d70c2b3b791a9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2f215895ef67d0fdc8a2bf6f8c3d70c2b3b791a9 commit 2f215895ef67d0fdc8a2bf6f8c3d70c2b3b791a9 Author: Kyle Evans AuthorDate: 2023-09-02 06:24:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-10 04:28:02 +0000 localedef: add newlines to error messages These won't be added elsewhere, so add a little bit of room to make these messages a little easier to read. The existing set is a mixed bag, there are somewhere in the ballpark of 45, 46 printfs to stderr and 19 of those had newlines. Reviewed by: yuripv Approved by: re (kib) Sponsored by: Klara, Inc. (cherry picked from commit 3141e51d2e38fa7b9e6d81477dfa860d087c514d) (cherry picked from commit dc8ee27074d4060549c6ecdc88eeec386691b479) --- usr.bin/localedef/collate.c | 34 +++++++++++++++++----------------- usr.bin/localedef/localedef.c | 4 ++-- usr.bin/localedef/localedef.h | 2 +- usr.bin/localedef/monetary.c | 4 ++-- usr.bin/localedef/numeric.c | 2 +- usr.bin/localedef/time.c | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index d76c2c2c08b2..2a080773a95e 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -272,7 +272,7 @@ new_pri(void) maxpri = maxpri ? maxpri * 2 : 1024; prilist = realloc(prilist, sizeof (collpri_t) * maxpri); if (prilist == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return (-1); } for (i = numpri; i < maxpri; i++) { @@ -333,7 +333,7 @@ resolve_pri(int32_t ref) if (pri->pass == pass) { /* report a line with the circular symbol */ lineno = pri->lineno; - fprintf(stderr,"circular reference in order list"); + fprintf(stderr,"circular reference in order list\n"); return (-1); } if ((pri->pri < 0) || (pri->pri >= numpri)) { @@ -494,7 +494,7 @@ define_collsym(char *name) collsym_t *sym; if ((sym = calloc(1, sizeof(*sym))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } sym->name = name; @@ -541,7 +541,7 @@ get_collundef(char *name) if ((ud = RB_FIND(collundefs, &collundefs, &srch)) == NULL) { if (((ud = calloc(1, sizeof(*ud))) == NULL) || ((ud->name = strdup(name)) == NULL)) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); free(ud); return (NULL); } @@ -565,7 +565,7 @@ get_collchar(wchar_t wc, int create) cc = RB_FIND(collchars, &collchars, &srch); if ((cc == NULL) && create) { if ((cc = calloc(1, sizeof(*cc))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return (NULL); } for (i = 0; i < NUM_WT; i++) { @@ -687,7 +687,7 @@ start_order(int type) /* this is used to protect ELLIPSIS processing */ if ((lastorder == T_ELLIPSIS) && (type != T_CHAR)) { - fprintf(stderr, "character value expected"); + fprintf(stderr, "character value expected\n"); } for (i = 0; i < COLL_WEIGHTS_MAX; i++) { @@ -728,7 +728,7 @@ start_order_char(wchar_t wc) int i; if (wc < ellipsis_start) { - fprintf(stderr, "malformed range!"); + fprintf(stderr, "malformed range!\n"); return; } while (ellipsis_start < wc) { @@ -776,7 +776,7 @@ start_order_ellipsis(void) start_order(T_ELLIPSIS); if (lastorder != T_CHAR) { - fprintf(stderr, "illegal starting point for range"); + fprintf(stderr, "illegal starting point for range\n"); return; } @@ -792,12 +792,12 @@ define_collelem(char *name, wchar_t *wcs) int i; if (wcslen(wcs) >= COLLATE_STR_LEN) { - fprintf(stderr,"expanded collation element too long"); + fprintf(stderr,"expanded collation element too long\n"); return; } if ((e = calloc(1, sizeof(*e))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } e->expand = wcs; @@ -816,7 +816,7 @@ define_collelem(char *name, wchar_t *wcs) /* A character sequence can only reduce to one element. */ if ((RB_FIND(elem_by_symbol, &elem_by_symbol, e) != NULL) || (RB_FIND(elem_by_expand, &elem_by_expand, e) != NULL)) { - fprintf(stderr, "duplicate collating element definition"); + fprintf(stderr, "duplicate collating element definition\n"); free(e); return; } @@ -932,7 +932,7 @@ add_order_subst(void) if (s == NULL) { if ((s = calloc(1, sizeof(*s))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } s->key = new_pri(); @@ -976,7 +976,7 @@ static void add_subst_pri(int32_t ref) { if (curr_subst >= COLLATE_STR_LEN) { - fprintf(stderr,"substitution string is too long"); + fprintf(stderr,"substitution string is too long\n"); return; } subst_weights[curr_subst] = ref; @@ -1040,7 +1040,7 @@ add_weight(int32_t ref, int pass) return; if ((w = calloc(1, sizeof(*w))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } w->pri = srch.pri; @@ -1214,7 +1214,7 @@ dump_collate(void) RB_COUNT(temp, substs, &substs[i], n); subst_count[i] = n; if ((st = calloc(n, sizeof(collate_subst_t))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1245,7 +1245,7 @@ dump_collate(void) RB_NUMNODES(collelem_t, elem_by_expand, &elem_by_expand, chain_count); chain = calloc(chain_count, sizeof(collate_chain_t)); if (chain == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1265,7 +1265,7 @@ dump_collate(void) RB_NUMNODES(collchar_t, collchars, &collchars, n); large = calloc(n, sizeof(collate_large_t)); if (large == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c index ae0bd052b40c..5ff146d6f655 100644 --- a/usr.bin/localedef/localedef.c +++ b/usr.bin/localedef/localedef.c @@ -167,7 +167,7 @@ copy_category(char *src) } if (rv != 0) { - fprintf(stderr,"source locale data unavailable: %s", src); + fprintf(stderr,"source locale data unavailable: %s\n", src); return; } @@ -182,7 +182,7 @@ copy_category(char *src) (void) mkdir(dirname(category_file()), 0755); if (link(srcpath, category_file()) != 0) { - fprintf(stderr,"unable to copy locale data: %s", + fprintf(stderr,"unable to copy locale data: %s\n", strerror(errno)); return; } diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h index 2aece1543d5b..4b141ac8dc09 100644 --- a/usr.bin/localedef/localedef.h +++ b/usr.bin/localedef/localedef.h @@ -174,4 +174,4 @@ const char *get_wide_encoding(void); int max_wide(void); //#define _(x) gettext(x) -#define INTERR fprintf(stderr,"internal fault (%s:%d)", __FILE__, __LINE__) +#define INTERR fprintf(stderr,"internal fault (%s:%d)\n", __FILE__, __LINE__) diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c index 659c495a71fe..7a77ac7e256c 100644 --- a/usr.bin/localedef/monetary.c +++ b/usr.bin/localedef/monetary.c @@ -93,7 +93,7 @@ add_monetary_num(int n) (void) asprintf(&str, "%d", n); if (str == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } @@ -167,7 +167,7 @@ add_monetary_group(int n) (void) asprintf(&s, "%s;%d", mon.mon_grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)mon.mon_grouping); mon.mon_grouping = s; diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c index 358355fe96ae..5533b7c10e1a 100644 --- a/usr.bin/localedef/numeric.c +++ b/usr.bin/localedef/numeric.c @@ -93,7 +93,7 @@ add_numeric_group(int n) (void) asprintf(&s, "%s;%d", numeric.grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)numeric.grouping); numeric.grouping = s; diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c index 2de922a8eb12..7a56e244c921 100644 --- a/usr.bin/localedef/time.c +++ b/usr.bin/localedef/time.c @@ -104,7 +104,7 @@ add_list(const char *ptr[], char *str, int limit) return; } } - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); } void @@ -137,7 +137,7 @@ add_time_list(wchar_t *wcs) } else if (tm.pm == NULL) { tm.pm = str; } else { - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); free(str); } break; @@ -180,11 +180,11 @@ check_time_list(void) case T_ALT_DIGITS: return; default: - fprintf(stderr,"unknown list"); + fprintf(stderr,"unknown list\n"); break; } - fprintf(stderr,"too few items in list (%d)", last_kw); + fprintf(stderr,"too few items in list (%d)\n", last_kw); } void From nobody Mon Sep 11 07:02:15 2023 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 4Rkd1z755Jz4t8NQ; Mon, 11 Sep 2023 07:02: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 4Rkd1z6f9Kz4VZ2; Mon, 11 Sep 2023 07:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415735; 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=tRgeB3VIbIItdajM/2XKS4i+sGhBJHZDjRIWlnowoak=; b=D7UL5Yd3kW+Urez777aeRiNjghJinBRJdFsIsDO6Oapt2HMkqnwIS+R9VtLl19Ox4aOxV8 22MbCFyDNTGHmZQHgDtiz3LclPNbtxap57Pk5tdjHyV4XGQwFhknBzQzZb/T1VOKYpR971 PD4FEIX9S6loNX81AFl6VbSrcpuSuRA6MalMjsI2XrVfZu8q6QVh5gpJYv4ypcQnYf+UQ7 HS7waU/pw26LJhFdyTQbPq++OhD0wDfwDnK2wamtoBZIcLNRszC6XR5hWONp30toV0EWwA aNkOPjgFmTVSQeGEKZznfquQkYJ/IPfKBsnvt2Ox+nLfKbux0JtsZSFTnuZKqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415735; a=rsa-sha256; cv=none; b=su1jwCibaIEeeoNHYYdaAD9eFsmHdw6R17wcyqB7KkqR//X1pAdkYC5+a893atb2F4DMFJ Oo2uDON7NCTww+S9SeurMq7t256U5jsm/kS9L2kfs/LLyRopqky3N1kCY2uFEbpOaOSJWF yAh513P4tOSY8YVog9eDsZP/4ASsRAge6yDKuotYpgBDgvpidw2p/UZTwoz54MEnlkXeLi DVXjHrQNK5fQpWyZdclbefOF8vyL/Alxcd1rcipNvjSv5eOkGD9Z5oVl/QsD4tTr33+xGy S/5FUbkAPXrEIDjwgralQ6N0w3vLR456tVE3K0cvsTP31W+1Ga7FPSOno/gYaQ== 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=1694415735; 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=tRgeB3VIbIItdajM/2XKS4i+sGhBJHZDjRIWlnowoak=; b=x6rUSni7VXM51TjQY38XoHPOZ7YLxPuOj3jqvK3ST5rJjF9qkZ6KNvw7C0j0rP8QSsTYwY gk7OI1/GoIvIGEo1vX7IX4sbj8KHAPDupG+K8aYpJOSQFSb+Ek+Me4tLXrPwrFXSsXym8P 6bgxbC+XMj8D/gLNirFv/DKBg5jMh70NtW5q46n6LJRNFKJ9TurtC7IglhbY4xCrtPfwce R13R3N9cEQaZ0W0KtpgG/iGVet/DVDSfE9KYendDpSlLlU2HkC0bydAaRqUOZFh7UxyFff XAGJLpzqQeNibNJ9RRzf9wMguIpY8kB4R5MhkAGqhjS6av2zMElU5Dt6fsZlHw== 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 4Rkd1z5jx2zgN1; Mon, 11 Sep 2023 07:02: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 38B72FUw007530; Mon, 11 Sep 2023 07:02:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B72F2u007512; Mon, 11 Sep 2023 07:02:15 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:02:15 GMT Message-Id: <202309110702.38B72F2u007512@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: 0c9b0086715b - stable/14 - libarchive: merge security fix from vendor branch 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: 0c9b0086715b3b354d471de9dee2ea113aa94481 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=0c9b0086715b3b354d471de9dee2ea113aa94481 commit 0c9b0086715b3b354d471de9dee2ea113aa94481 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:02:07 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index 661b7013e0d2..8ce1d18c61e5 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -368,10 +368,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -404,17 +406,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -423,6 +430,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:03:05 2023 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 4Rkd2y20tvz4t9L8; Mon, 11 Sep 2023 07:03: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 4Rkd2y1ZTzz4WGJ; Mon, 11 Sep 2023 07:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415786; 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=Ube8wdr/a4L13S2wdmx6nkz98GBry9D3gFAifL/qQG8=; b=INpV7GztidsexeyUlPPPDWfx3RTINjGwRfpHCtzToUrddi0VNJKHA6iEgZ8wepsdQoQOuH tMPGJwhtiwAvoXHsKZhJJterJyY2CCaF0Z1VXqeB7ZyhP87mmzByVxTE3XxjXgHYFeu4tU zkHjr7XK/toIUXeqZoSjeyhRNa5oNuGXUtQQTTjj72jlxLNKUMZVmRPYHYs0PxIA22rF3W RIznsxPGIHMdJJMluq/fKp0M4D0VM6zzt+0GOGJuI7dibAhjUzwc37SUN0a00bJRtFRWZe jRtsjdan+WnQpOMgqqfrflEsO8i+KGpD0f64+gjTE0l2luvyi85KdAClzp0yXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415786; a=rsa-sha256; cv=none; b=EmthzXQGrdSmi/cmkEufPmJ4JSURbuKfWiT8AlELDP8ashi38C7HvK2bsSoeAlOSYZQ7qT Ypy0YVbpHL2A5YPm6yggvuTXt3fEhF/Ba2WCsM6YaM8FZK0yl1a8AgXVRHA9lf91zq9hvb 5o8bfwpMZes6bUqbh66lvawJ1I8TMvTEtEpmT1084422v/snXS+Qt9TzeHLnsXic7nnsXW pnG6MDr1Nk2KcI8PKFRhohmo7ltkymISKv39y/HP1Lu8X1UVTVZf0QIqo3Cu/uO/k14iX9 QskEyA/aOB0xWmxOHjZ1we/afHn4QBwmFBnvNepQmxM0/MLIzndhClUX7/XoBw== 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=1694415786; 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=Ube8wdr/a4L13S2wdmx6nkz98GBry9D3gFAifL/qQG8=; b=Ai+yuaNS7zR2q+RuYM6KuhscJ7Wt81Fw5lLHXMCuVyvDV9WAqOr3Mdtwuzb0ZhDyG9h2xh YdtYvHQTTRTHI51DaB3PvrWqd5SaZsNGbOSkJVyyCgpp5T9eIGqiBghaPw2zRbH9kUfrJh b02rhSf56TpoUqv6HelhaGUGgFcQxZ14D1Xo7SZxUCk3aV1Lx9U1XM3FNoUwkaLg5ZEP6p YteMca/68rUKpX9qeJfhqjdMkPQw2goqKPF4Qq+8pugIIqPpHVGq6BH87kiRL2WjHx4abC tVyhyN/h+05JXG2+xmD4g8nMLRb9OSSkOoZ6R8zCpQbyWLkDcMVdWGta0+c6fQ== 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 4Rkd2y0gK0zg8G; Mon, 11 Sep 2023 07:03: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 38B735ZW009923; Mon, 11 Sep 2023 07:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B735Da009920; Mon, 11 Sep 2023 07:03:05 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:03:05 GMT Message-Id: <202309110703.38B735Da009920@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: 914c7f5f2a67 - stable/13 - libarchive: merge security fix from vendor branch 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/13 X-Git-Reftype: branch X-Git-Commit: 914c7f5f2a6764eeabe4446d47ab3521526f5f5c Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=914c7f5f2a6764eeabe4446d47ab3521526f5f5c commit 914c7f5f2a6764eeabe4446d47ab3521526f5f5c Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:02:52 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index a2e6d9ad1c53..2d3c7086e1f9 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -367,10 +367,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -403,17 +405,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -422,6 +429,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:04:02 2023 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 4Rkd42554jz4t9kR; Mon, 11 Sep 2023 07:04: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 4Rkd423xXPz4WcX; Mon, 11 Sep 2023 07:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415842; 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=KVzUyLLwdfjnYe/BL3Df3U+eIZuD86O0SSVZEUyYndo=; b=BHrtXaeUI3syephMsnjWrG0Vk0ZpEpPD/vU3FD1l5XlIun1fvQsgEmUYGmJCcXQu7Nm4l5 AkShV2rMsaRUqBaWx9HeYCzWq03Q9DNw744ZW8Q51nvQRss5VhiDJrv439mf67ztz2gZjh cuSgWwaxaChHXZq/Eh3Kr8L+01NwMAvjsYVqZiq8iJcS9hNG/POGXwvuOAvQ+6l8FsgBAA GtevLMw5HhqK/6i/D3YSt0PQWooyXlQDsQKpZ4+34keTeNh+PfvrCcEyRA0D+qB0PB92gB Fegt04djd6AIFWZoypuv1H7IaN+wLHOJHDxzAKOe6OLnThygFCdFVD9WfSgT3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415842; a=rsa-sha256; cv=none; b=r/dAX7hwkncGRhRx4ZNN9azHOaSftoS7ZgEPhOOi3TfO7+/mpCYBV2PYz/pMFh9wGYEgsB A1eT2Hv3AVIuQyQFJscVM5gD6ACa9Aafz6Dm8f7QWmK1tWeK8jwq0x1Pm1ZJtS4OxwNOk6 8wzc7PW9f+SRVMSrktflhaESTrdtp0pdSkPbu4OoTJbs6iwpuJNS1VzwTqzTkOnUOtFhmg w/EdSbUpnZyrMqCs8ugYMuXtJ4Qcri/eqI79fSHtbnM6WrGc6jCKDt8lboNpfAJTY6nBx/ NZEvzXp1U5mXDz7oV6uf8m2mcvKl0Khtn0JxEb448GHWbZCbWDpp0G06wGGFzA== 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=1694415842; 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=KVzUyLLwdfjnYe/BL3Df3U+eIZuD86O0SSVZEUyYndo=; b=F0yVVPe0GBwh4QHntc+ia2nuwlcW5ryJdbV3tlkCoNgCqL0PjC3s3ECTVgN+hdfwloLBdJ 27O4+nXWbMuypzfUzo07SDFX5Z51y27LrXE3Y6jYZEWUcOyEi5/z8q7QoFDQqSw3dr9v75 fbkfhmmmXnRnbLctzwkcsD0FZ4vcVEU4Tqaa/FL78TwTv2ThhYmFgm20jzr3H4xWmWqbbl 3jdnzogllDhzQcu2GPcs8yC7FmA/QgmKMTKJbyIWeDIAiqOx/ouP7wFF2G4oj3786K6yjv AhH/ChsAcVknhicj3yx1YeU+ZTXIDxpP7f+gSAQgnh9wHkSvsh0zNRvK7seHaA== 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 4Rkd4232VpzgN8; Mon, 11 Sep 2023 07:04: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 38B742nE010164; Mon, 11 Sep 2023 07:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B742jB010161; Mon, 11 Sep 2023 07:04:02 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:04:02 GMT Message-Id: <202309110704.38B742jB010161@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: af386f70fa0c - stable/12 - libarchive: merge security fix from vendor branch 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/12 X-Git-Reftype: branch X-Git-Commit: af386f70fa0c8d0a605c50710283f6f59525bd05 Auto-Submitted: auto-generated The branch stable/12 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=af386f70fa0c8d0a605c50710283f6f59525bd05 commit af386f70fa0c8d0a605c50710283f6f59525bd05 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:03:43 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 MFC after: 3 days (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index a2e6d9ad1c53..2d3c7086e1f9 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -367,10 +367,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -403,17 +405,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -422,6 +429,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:05:48 2023 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 4Rkd645lyqz4tB4B; Mon, 11 Sep 2023 07:05:48 +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 4Rkd645JjBz4ZDK; Mon, 11 Sep 2023 07:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415948; 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=57RFNqGA7KJdmAH0j/itJdVo8AkPjSdq9inbYJjrSKs=; b=JxYyQ4wstpglzDSqsM+WY8xAg0jhwOXkYJb/oNopprhDKbniaQ5+ualOOE9SvJnUSxTfxG S7qj5pdhRFVwT7DAcUscPlykucdQXGeO/dKkO9tCHfiR1PRAkO7Yipb0a5KAoz7DGv8sid fvlC2OjQW99eNcu30YIIVUWhEZPi3TM6t2LU0MEuWY5Sl7a+4s+iOHbsyu2OLtKfp4/pr/ rHOYXO2cFUIrdMUiQA7SLDpDtGJ9qrESFyuyX36cMaG75GkA40EgkSDqvd8pYtREbG6ETE KgcWd0qR5KcfNsuJnq7lxlx9eZvBYYcmQ71VN5VZFy7k/MU0XBHmhxIi2bWL/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415948; a=rsa-sha256; cv=none; b=BdulzxmZq9EHFxpXI6/D8GboLwy51VxeOt8g9j5xxQAJIRS56ka7Zt79XCEwJm41R6pdCo stUd1kXZ/YzERdH+1mq5818M2zKJ/pSs85vNuRHz3odsvm4g0zYtToMGlWH3Z7XNpI921T 6dDKMqn2a4c7WlMzXXnM9RiV60l7RwVba5Pmbi43hNQbAmlaFRU5NCFd0NbWtSwMGSi3BS Bc1nGTE2KjvGSNBw0YARKlnIwF0hqn2ysKaeGLE6p6jdSjvjehLmNWeSAiVdVc7yxgSd6A HtwFS/xfgLDceWuBB9YgM4MPxf7L+Qu+duRL5SnBTmCHbAKKy4ibXwwKNrePRQ== 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=1694415948; 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=57RFNqGA7KJdmAH0j/itJdVo8AkPjSdq9inbYJjrSKs=; b=FICYsdXlqZ8Fme9XYF3STvaqb8Sz8UCqTEvFhmFF5IVt0AGL++dlRDBCtEOKyZEcieKF+H CU1uci1sVL23rEt9HdxSbjmcUdc2pfMZ2D3FrNFRA70aKcaK629j8z+S0mb4AfGdu68qrU 9kBviYa+qQTl34mAFhzJBdBErdlhslcmEXDCpzpG0EHtntvlaa7VhOioF82yTpZm7sdtcy NMDl4/mcwBSSE6Jk8A0GoyipCFO8jEYi/nxFIDRT27uoEq6IL4ohKru6OjN2zXa1lGfYBK 6DJgONJjtTyMxjPQvpIQlf5J3jX0Dq21VrnuFnHwOTKmdtKniMRBDt88UaYMew== 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 4Rkd644Pf3zffk; Mon, 11 Sep 2023 07:05:48 +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 38B75mla010516; Mon, 11 Sep 2023 07:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B75mF6010513; Mon, 11 Sep 2023 07:05:48 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:05:48 GMT Message-Id: <202309110705.38B75mF6010513@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: 5ed7eb0d97ba - stable/11 - libarchive: merge security fix from vendor branch 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/11 X-Git-Reftype: branch X-Git-Commit: 5ed7eb0d97ba4436218e810f61bd059acba984c2 Auto-Submitted: auto-generated The branch stable/11 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=5ed7eb0d97ba4436218e810f61bd059acba984c2 commit 5ed7eb0d97ba4436218e810f61bd059acba984c2 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:05:29 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 MFC after: 3 days (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index a2e6d9ad1c53..2d3c7086e1f9 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -367,10 +367,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -403,17 +405,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -422,6 +429,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 07:27:02 2023 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 4RkdZh4xdLz4sRtW; Mon, 11 Sep 2023 07:27: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 4RkdZh4nv7z3G86; Mon, 11 Sep 2023 07:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694417228; 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=qQ3VTuDBQIEGHfzv/EsrV6voNtQz61pDZGG61X3l+YQ=; b=nvtmuRbKr47PUFgbsv1cnOchKqVvheaPDdidHyjdD4qErvc3E9eZoUQ/+xmLzOYNWr+6FJ 3UK1Lv0qJ90pjIfA4K4dTNFdZpwGIvLe4nF1ZwUmLl9+56AHZU+3KsB68EuqntgkxQDSfv Fxn6aAuQhhuVii+CVztgWhlyHPTUhrMVZnS1LtNhKhLKtxGa9/+GU7fNLt78VYZWzkfXY2 WhPcE875yomaZ8jJpQyobL/IhwUnyw+XQ2mXwRI1BC/cHI+6c+DLYLEaowLl5teO8p6RvC QjqLhrcouN8yMcBGNzsZuGYGTYZ/XTmnh2krtaz0U46O0PgwmBWJ3KCb8zFiSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694417228; a=rsa-sha256; cv=none; b=XIA/ngKWNnEZ4nVarxYpxSzBKkv1U9ST264vzYVrp8pVBYStiZReYZQ6tRvWr2zfhTLjUe WhZGj9xWXlGHz0X6IdWoL2e1htcHjfDKNsND83Gb9QDXXWvUrCiKC4t71DUE7wfyk+OZ2p oeQlBWUOn0UMQUrS3R9/h6vgtLtFsMg6DkqiHRUgp7CnhNoepwSxWk+PlEcaIJdLt3icQW sdIRG2wvOVnMg1uYzTUOPi5zGgmGF9pyRBtktRTgDDA61WB3MF1Ehpr/HufhNoewDassMJ WFlcPOW13hOVoy8WAWlDYl1P6FVFYvIJ7wNiokRWr6Bk6Extsg9rDECduInZxw== 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=1694417228; 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=qQ3VTuDBQIEGHfzv/EsrV6voNtQz61pDZGG61X3l+YQ=; b=YdQ8UW8sH5u9CxnKYhtsygTkiLgmVd6CTAAv6G7JQvaMStRU1GQnUNupBuz32iQ0H+EZLk Rl2qLzLzoC+XRVorP6KttUxu1/DrgMDeBrxofKQ1YAIbvBSjrWE1o5r2eeXLkJLOpvYn+6 kY+nEvHaUCOijL0hrmXJ8UgZc3N6WHj/ubt0inIzdBqSq6uznYHWaC/BRx1jndDv+WLNKB Aq5+UWkA1rQDaAcehdlGQYsLDiZlosc1vxqppnpmWe9pddn5Gvt0Wtq9cEo4tAbgJpXbrd j3/xxbCsdFZZvYHslg4DuFmyIiFwEk/jZozcJ1vSVTYHqJKZobPr70NnvnA+mw== 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 4RkdZh3tGmzgst; Mon, 11 Sep 2023 07:27:08 +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 38B7R8Oc044013; Mon, 11 Sep 2023 07:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B7R2lO043997; Mon, 11 Sep 2023 07:27:02 GMT (envelope-from git) Date: Mon, 11 Sep 2023 07:27:02 GMT Message-Id: <202309110727.38B7R2lO043997@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: 2b2fbeb3a97b - stable/14 - zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 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: 2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f commit 2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f Merge: 0c9b0086715b e96fbdba344e Author: Martin Matuska AuthorDate: 2023-09-11 07:20:55 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 07:24:58 +0000 zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 Notable upstream pull request merges: #15251 Add more constraints for block cloning Obtained from: OpenZF OpenZFS commit: e96fbdba344e9c25cad624a10d4a4b300fd35f6c sys/contrib/openzfs/META | 2 +- .../openzfs/module/os/linux/zfs/qat_compress.c | 2 ++ sys/contrib/openzfs/module/zfs/zfs_vnops.c | 21 +++++++++++++++++++-- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index 29425d3368e0,000000000000..122a7a3f032e mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1113 -1,0 +1,1113 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + +/* fops->iterate() is available */ +/* #undef HAVE_VFS_ITERATE */ + +/* fops->iterate_shared() is available */ +/* #undef HAVE_VFS_ITERATE_SHARED */ + +/* fops->readdir() is available */ +/* #undef HAVE_VFS_READDIR */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* fops->read/write_iter() are available */ +/* #undef HAVE_VFS_RW_ITERATE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +/* yes */ +/* #undef HAVE_WAIT_ON_BIT_ACTION */ + +/* wait_queue_entry_t exists */ +/* #undef HAVE_WAIT_QUEUE_ENTRY_T */ + +/* wq_head->head and wq_entry->entry exist */ +/* #undef HAVE_WAIT_QUEUE_HEAD_ENTRY */ + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry */ +/* #undef HAVE_XATTR_GET_DENTRY */ + +/* xattr_handler->get() wants both dentry and inode */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->get() wants xattr_handler */ +/* #undef HAVE_XATTR_GET_HANDLER */ + +/* xattr_handler has name */ +/* #undef HAVE_XATTR_HANDLER_NAME */ + +/* xattr_handler->list() wants dentry */ +/* #undef HAVE_XATTR_LIST_DENTRY */ + +/* xattr_handler->list() wants xattr_handler */ +/* #undef HAVE_XATTR_LIST_HANDLER */ + +/* xattr_handler->list() wants simple */ +/* #undef HAVE_XATTR_LIST_SIMPLE */ + +/* xattr_handler->set() wants dentry */ *** 169 LINES SKIPPED *** From nobody Mon Sep 11 12:00:14 2023 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 4Rkldp2lmHz4stvC; Mon, 11 Sep 2023 12:00: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 4Rkldp2JWkz3QWW; Mon, 11 Sep 2023 12:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433614; 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=gL78C7Fj8ONWK031i3KE0hmi/Ol8R7jbJEsyG5N6y60=; b=lBdRQnOT/Vc/la2f59mqRsp3PcIaUB5Yipq4EqpVCLNUNup3S7Urx6P/Awtz5SQsgHbv39 ETaPNNrHPS9qMONJx3m1ez4otafz9LD7nl2/RYjL3165gPyv0Zo+cigWYNXYZF8GugveN/ IlmLlq37mWHicGJkU1MqALx4O0ghJP5wxMBGL8meo551loyvocRoKddMHVjRXD+Jwdw3SN c1P12fgIxWy6sPn35/tt0uj8gw8O4l6cXBUU0usw4U2148y9Q4oGSYTMcknCiPBHTnomD7 fckXaCDXUY3+t+GWfy5H5eaJl2x3JYk8lu/AOZdMgd9aIhUB71bOKP6f/kNKBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433614; a=rsa-sha256; cv=none; b=Lfsm/S40OhTc+v8Qx8UNZYqUW0MqK7GqfjP0zMHLj0i2WPNpsFF+eqnucncLNxjQ8D9SnL weUr/yEJuCZ4d9JKobRAm/whCgiA8s1DGa6LF+QYTE+uFgKSw8WFb1o7Y+BU3ALaO+rkLc huIkNSDdVwWXKSoOcdqtiQq5vU9J0E897NFlAU8aH30SZmP4kMfJWdW/0rXkNuyTvk/YiC 1xyvjEGJJ642bACT0X1PbZFS3rc5/Pjt7lHtigBllZb5FxlPRuc8djTt1ndV0EmMLpi5GY EAsrI928ZuKFDk8G8nfkqJe3CT0fX4zjgZFPou0Jy0E976OCM4xfod+5AMMUAg== 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=1694433614; 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=gL78C7Fj8ONWK031i3KE0hmi/Ol8R7jbJEsyG5N6y60=; b=EvR4BNcOlmh5NO3UFynM5i1UQhSYJSyP6jRLh1EeAOc9kUqj+fWZaJIvmyp+yOpdt4cw9t 9pESTRFaq7jTKjPs19Y5E5+qMwoWy2Mv8Z4JcjJ1HenDHnxLd9aSBMgDEYEzsJioYx/PN4 qn9cpnElskRmkrGt0Fc5rxhZupRath3N9dVD1y9L7YcSxevdVnS0z9K5wF+5EbvwRoPBLk nO7KWvMk2FBWeyeJNBODSNTYxv3J/c7p0EdMg+PdBGWLECFC83GAHr5u88X28Vk0460y8k Mm04jtAcYC+xZut5T4VrIT6QZXv0JIKBRj3yQSC0dmdUvne+gTlNmtUvrUbJ2g== 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 4Rkldp1NgYzpJg; Mon, 11 Sep 2023 12:00: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 38BC0EDp098946; Mon, 11 Sep 2023 12:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0EBZ098937; Mon, 11 Sep 2023 12:00:14 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:14 GMT Message-Id: <202309111200.38BC0EBZ098937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 803280ea07e9 - stable/14 - linux(4): Merge getxattr for future error recode 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 803280ea07e9c07007e0acd3864a18d40b86de2a Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=803280ea07e9c07007e0acd3864a18d40b86de2a commit 803280ea07e9c07007e0acd3864a18d40b86de2a Author: Dmitry Chagin AuthorDate: 2023-09-01 08:09:49 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:58:50 +0000 linux(4): Merge getxattr for future error recode Tested by: zirias MFC after: 1 week (cherry picked from commit 6b46ec66129d9490c91876f72d98e514121996a6) --- sys/compat/linux/linux_xattr.c | 62 ++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b54a0d2f89ad..901123684154 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -68,6 +68,15 @@ struct setxattr_args { int follow; }; +struct getxattr_args { + int fd; + const char *path; + const char *name; + void *value; + l_size_t size; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -262,47 +271,66 @@ linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) } static int -linux_path_getxattr(struct thread *td, const char *upath, const char *uname, - void *value, l_size_t size, int follow) +getxattr(struct thread *td, struct getxattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_get_path(td, upath, attrnamespace, - attrname, value, size, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_get_path(td, args->path, attrnamespace, + attrname, args->value, args->size, args->follow, UIO_USERSPACE); + else + error = kern_extattr_get_fd(td, args->fd, attrnamespace, + attrname, args->value, args->size); + return (error); } int linux_getxattr(struct thread *td, struct linux_getxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = FOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, FOLLOW)); + return (getxattr(td, &eargs)); } int linux_lgetxattr(struct thread *td, struct linux_lgetxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = NOFOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, NOFOLLOW)); + return (getxattr(td, &eargs)); } int linux_fgetxattr(struct thread *td, struct linux_fgetxattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct getxattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_get_fd(td, args->fd, attrnamespace, - attrname, args->value, args->size)); + return (getxattr(td, &eargs)); } static int From nobody Mon Sep 11 12:00:15 2023 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 4Rkldq5Kslz4sv1R; Mon, 11 Sep 2023 12:00: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 4Rkldq2yRRz3QTM; Mon, 11 Sep 2023 12:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433615; 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=zXsIuI8FnnA2dOxs3KxTT7QunUBdzz3hZDKvSeapGmc=; b=Py/3niSib4gv5ePmniDdFlRVsRJ5nRP8bWdGrJwpyCq9zB5lTsoBEuudzl6b1PIwRtmNfz iCm9S/gyVInHc6EBty6EvD3lj2+rxoB9H9C0KabTjmv6WNuG8Esyq8HayiBNiOBTeHQXBY aL9wO9qDntKMVyPxewEaTC8ANOMekEy2PlnzOzuqCGbeoceUmBPEyr+xD+lRILf/ziQ2aE YPsL0avwLelN9GJgWtx8vVNNdTXt146sWHeajt+c05P4jHECQf9roqyBLJi/ZIBUnxYxx0 4eSfuKDXONeGkW506oaCZnx93cEiMRK9lBbM50n3zK370OfhF6n1MsWf1t47zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433615; a=rsa-sha256; cv=none; b=UXj0nvHBlDMvmWkS7VQho+6lKPxdQhHq13SO4MBok6l5u5+iA6dzr1lkHmarbg7xSC4Amf ciDoyHAXLRmgRz4sLqZu6BB4Zgnh1SjFvxS4fDvNxC/CnB4K1RqgNhIwj3K6RmQ0TXjz6s 6O5E6EtryXuGMJbDl3nra6OjOxADVJ1SRgn/ZHWyUjv986x1reKd12/B3SN+M/K0jgQ63L h9rx9GJC9GIYPGXqWm4ZtyrRidAbJzujke1LrMHGIONau3hd/6kfOnw5onRmN0RfZ0uvUG 7D2V7KgxhklKa6XFR+3Ccar+4idtTIyd2xuqoa8Q3hc60Zeft4yQ12zgWn1nGA== 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=1694433615; 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=zXsIuI8FnnA2dOxs3KxTT7QunUBdzz3hZDKvSeapGmc=; b=eWAPrD/Nilgj9rxZ3DZGCuJ+vqjZPWrz9JHHGih6HeK4gP/7jXQshfrpyGedAxKb6iJ47h LI7bcb1IIeodJHft6K5LG/cYQtzljErEpWy4+A23KPXfICR7RPZimqOmhjoph0jFKqqppk 3AQpWtpkgRjyLLEqPHpaSGCbWLrnW1TFoYUpZEiIjHLe+MveV54MbQyrbZR2QCXGxPV1W+ IgPIBCUdaYomua33eH6ZCGq6vDY4kjGLQw+SEzMHRiPzRxSWIDdK98p+3pwxYHPq4l2PrD UqCYjK+Va+wLl2jknlwgBgI/lFY5rmxHePLlIqmm/P/8Yqq1/a5kAizh3w0uAQ== 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 4Rkldq20jTzp7R; Mon, 11 Sep 2023 12:00: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 38BC0FF4099648; Mon, 11 Sep 2023 12:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0FaJ099642; Mon, 11 Sep 2023 12:00:15 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:15 GMT Message-Id: <202309111200.38BC0FaJ099642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: a9b8a0ced46e - stable/14 - linux(4): Return ENODATA from getxattr syscalls instead of EPERM 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a9b8a0ced46efe72ec118a749d191b29ce47712b Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a9b8a0ced46efe72ec118a749d191b29ce47712b commit a9b8a0ced46efe72ec118a749d191b29ce47712b Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:58:50 +0000 linux(4): Return ENODATA from getxattr syscalls instead of EPERM On Linux ENODATA mean the named attribute does not exist, or the process has no access to this attribute. Reported by: zirias PR: 273517 Tested by: zirias MFC after: 1 week (cherry picked from commit 4d59b790553ef75b9a4b6a673eab3354f3d012b3) --- sys/compat/linux/linux_xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 901123684154..b9717c62133c 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -285,7 +285,7 @@ getxattr(struct thread *td, struct getxattr_args *args) else error = kern_extattr_get_fd(td, args->fd, attrnamespace, attrname, args->value, args->size); - return (error); + return (error == EPERM ? ENOATTR : error); } int From nobody Mon Sep 11 12:00:16 2023 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 4Rkldr4WFzz4stn9; Mon, 11 Sep 2023 12:00:16 +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 4Rkldr3jp0z3Qcg; Mon, 11 Sep 2023 12:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433616; 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=LE494aq4ByRDJUBRidFVYUR9S8JppemvaT5iV7f2WKc=; b=eFZ/Kvw7F38YN456Q+2Y75rbO5+J4BedzKN/UiuBpDiFJRnMdIOWj2TeDAAREmZv/HPxqw XeB6ggi4v2ERc5HTl90zySybVdF7SGYs3dk/eUa9mILb9aT7Q9CkGUsRmtfZuk+dU+yP5D VIBq/sukQgFYOrvpsREgaevev8Bs5zM1s8gu//fK8Dy0DOLi4vWWpeOS5d87Jf7Xpgi1N7 MqwezRTTd7TyZ6/fStkDQh+2+BAEcbCYxE4iEAIQ0DiPU7RZHlkvz6Ri1DjEyUkHnxd2YD hj5/RUoBzgDE3Gg3Adi5UzhFFMd4MXvJc/8IlBgtOCbDQo3pD+tgRa0koV2FEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433616; a=rsa-sha256; cv=none; b=VwthqqIk4PbFTT2s0P4i1dMhqG0hdgqBQc9ShpbWNjHSDkhx8K9bvvRm4KfwF4Dbe6gj0U VSc8wWvxDZbzjyKOjz0ME3Is/j17IL2f7d8GNc0tYIPCoMmFOuZLl6o9rR9cJqXnf8onLx x1dErgK7oXVFmMOEmjqY86yutP0MKd6TX+bQaBccQPt18ZHoMUVeVj18tn9Xk87QCcq12y F/ovYqMq/ZyTW7jSOZxLP9JQlQs2Ib+X4Ywjedn2lzt00TN38njyq6Z1Iqf+ZjH8sAWIBo Vg1S4b9ulvxsRbd6dyuXvhjX2OprmUzXEul0rOXL0K2oouSNjcZ/jde5YVp0bA== 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=1694433616; 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=LE494aq4ByRDJUBRidFVYUR9S8JppemvaT5iV7f2WKc=; b=rCYRdCCJp9umbacOCT+YtRxwXzWk5OZnTDEwVNhRU+GsWFvQKEKAM/t6v1tk7KNN/DPyoO /IWFbsxK5pxhtuBTmwL/SVspMv+f4UwD8PKpsdpVHc3aEXnPBLq+bhNaVdPwK8q8ZmW7Kd 7g3tvS+UFYlNU2TvF3Eyy+hNtjEFiUlG8bDFI7W/RQ85a+sl+W4Ww0U/ejV/IYuUkaWg3L zP3ysqK8266zYseS1b+jcg4yYw/KfPtyv6YjwGQ7gPjWRFcsfC82XoyUveIJeP+EPyFjsG 5E3nZ8dzptD4DBroIcJxiYwOszfFyvUS1BwG2Fp0FLMiukl3U1ZDFLSVhDKIrw== 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 4Rkldr2Yxzzp5J; Mon, 11 Sep 2023 12:00:16 +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 38BC0Gb1000354; Mon, 11 Sep 2023 12:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0GHN000346; Mon, 11 Sep 2023 12:00:16 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:16 GMT Message-Id: <202309111200.38BC0GHN000346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 0f35bf8b294e - stable/14 - linux(4): Merge removexattr for future error recode 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be commit 0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:44 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Merge removexattr for future error recode Tested by: zirias MFC after: 1 week (cherry picked from commit dfcc0237c3a97f4f7962da854389f3c5d976145a) --- sys/compat/linux/linux_xattr.c | 54 +++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b9717c62133c..2b46cf708c7d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -77,6 +77,13 @@ struct getxattr_args { int follow; }; +struct removexattr_args { + int fd; + const char *path; + const char *name; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -227,47 +234,60 @@ linux_flistxattr(struct thread *td, struct linux_flistxattr_args *args) } static int -linux_path_removexattr(struct thread *td, const char *upath, const char *uname, - int follow) +removexattr(struct thread *td, struct removexattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_delete_path(td, upath, attrnamespace, - attrname, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_delete_path(td, args->path, attrnamespace, + attrname, args->follow, UIO_USERSPACE); + else + error = kern_extattr_delete_fd(td, args->fd, attrnamespace, + attrname); + return (error); } int linux_removexattr(struct thread *td, struct linux_removexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = FOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - FOLLOW)); + return (removexattr(td, &eargs)); } int linux_lremovexattr(struct thread *td, struct linux_lremovexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = NOFOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - NOFOLLOW)); + return (removexattr(td, &eargs)); } int linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct removexattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_delete_fd(td, args->fd, attrnamespace, - attrname)); + return (removexattr(td, &eargs)); } static int From nobody Mon Sep 11 12:00:17 2023 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 4Rklds4bGdz4sts3; Mon, 11 Sep 2023 12:00: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 4Rklds436gz3QMW; Mon, 11 Sep 2023 12:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433617; 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=XIiBv3HVuNsqGwODix3BL2g5d1ETfcjXCV9s7g7WCcI=; b=pjYHsxovpzTPmOCz4iAJdNqZh5poRpAbgOjL59bCcAJastzGaagEzEU+clEvc/Gee+KBGT dvab+gAgQnz0Pq5QjrgFf3vulGJxhOP2cPkcCZWmW0sGt5uBe0qg3cpo7r4FkR6haVlj3o CnKiD8rDWxIN56IDI0JxDNsgcD970pmdROe08kcN5uilOv9rF9XyFmcBiFyWcSzmZ/SSc3 ZfWvzeDzSrTu5VkM5A8PUukoZzlL4XCpNfAHx+FXBFHo0gk136fS4n24E+RRJYgR7BlxAI /9u/+D0Ojn6jJOwgkFnrlZ2MIGfZlc1LsoUPOzNZOKbj7EH1dMWbjd63CBdmjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433617; a=rsa-sha256; cv=none; b=ItTonDkp6qQWe8fn1U9u/E7Sl6TWeLqSCcbLHgLwUZMLduQsOEjLswEsvgH2vy86w1//cb lLeunppQnW1WCnPX6pry5pd1ik6pQjhfj2y4yExBCNdEjXsyRQBHrxuDZKLWZ+/3lvIry9 0g7WaW7IjXOTWQCnjI2hK5ZdejNBpmSwMroz4v24kzNktpYk2vqJ2xms8R0dDU7AXqnwjh pnXwSGoyDz8UPNHjC3xTRvomeBlPlpPvgCyfmr5e230Q6IlBNSjBK2AOH0F3lnU169Jq/P qzwaIVgG5btsaVSdSVQjH7dtW5KXgtw+M1aLEqBjRYfoAelxrfsFmjBKY1MNiQ== 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=1694433617; 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=XIiBv3HVuNsqGwODix3BL2g5d1ETfcjXCV9s7g7WCcI=; b=My7V4uD96xR3jBm1ZmFT7btcpWQQM00ou1ExuOpZd/z0Sp5ZpLNRQx5TFYefwDXXrs/h7W xVQejz1uhGMaipoRTEihgBURQhJAKd9GqkUDAkoIj7snbNZpcvzD65G/o9Z+Rk8LZF+iur iFL0mlsq3ZBMyQ3kh+woNN8fPs7kdT8dVR9ZG0PP0qeAg7QHLso0Yemwg3M6WbBLUAnUFQ 2kJFrAnkc2jaV4bE7w8eFIbOPtpOax4EayCv4SvwumZCTpuUeSrUF/m7CC5yKzIJJO5GJs Cdew7iGka81mIdsWu+4fMrsJySpTJYmS0m+CsBSQzglx/FGTrou5+63RrQbIqw== 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 4Rklds37qbznbX; Mon, 11 Sep 2023 12:00: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 38BC0Hxx000976; Mon, 11 Sep 2023 12:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0HGd000969; Mon, 11 Sep 2023 12:00:17 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:17 GMT Message-Id: <202309111200.38BC0HGd000969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: bce9c2e34006 - stable/14 - linux(4): Return ENOTSUP from xattr syscalls instead of EPERM 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bce9c2e34006dd70fb77a72f8cce1ead8a01db9e Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bce9c2e34006dd70fb77a72f8cce1ead8a01db9e commit bce9c2e34006dd70fb77a72f8cce1ead8a01db9e Author: Dmitry Chagin AuthorDate: 2023-09-01 08:11:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Return ENOTSUP from xattr syscalls instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 1bfc4574f78653e4b64ac9dd31518c96a17fe52b) --- sys/compat/linux/linux_xattr.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 2b46cf708c7d..74b47f1cbaec 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -87,6 +87,16 @@ struct removexattr_args { static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; +static int +error_to_xattrerror(int attrnamespace, int error) +{ + + if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM && error == EPERM) + return (ENOTSUP); + else + return (error); +} + static int xatrr_to_extattr(const char *uattrname, int *attrnamespace, char *attrname) { @@ -188,7 +198,7 @@ listxattr(struct thread *td, struct listxattr_args *args) if (error == 0) td->td_retval[0] = cnt; free(data, M_LINUX); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -248,7 +258,7 @@ removexattr(struct thread *td, struct removexattr_args *args) else error = kern_extattr_delete_fd(td, args->fd, attrnamespace, attrname); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -392,7 +402,7 @@ setxattr(struct thread *td, struct setxattr_args *args) attrname, args->value, args->size); out: td->td_retval[0] = 0; - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int From nobody Mon Sep 11 12:00:18 2023 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 4Rkldt5q9rz4sts9; Mon, 11 Sep 2023 12:00: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 4Rkldt4zRhz3Qdc; Mon, 11 Sep 2023 12:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433618; 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=dLcb5dnF0MTQjG353yQcUDHgUvm8Nx9pdNFbUSWTlPY=; b=PF6Vngr2nVrNTKQ4PXILd5xNsAkJ0q3y/1R5RYVL/MeFtH57X0VfQMWsuv5AhvxAZlKzcY txHYjFYtnIK9CdBujEJxlM/V2qBmKmFOl5hqtrnZjKa4HcjcMpO8ySVV0ZpMYTsg5/xFEz EJWO6kLhFOZ5jyCq5woPFzQMdvz+KASysaGuKpY/Q6vobv6SMt/4wE40NVSQqXlok/glg2 tDc9nlr7TjNoVD0K6cisrDZdzKGVD32XU1dUDJx3+QWG7ziPNsHwu4JlKRs6oPTTJ9nHdF 5d+Az4FZilyqRTnKPGd9wzbcfW/DBbP9MQEYhLPjLp3wq9BuCbqogKe0S5k42Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433618; a=rsa-sha256; cv=none; b=b6gsIQm3mgBWylw2q4ez6HZt2wm9G01GkEw1UZ2EkccJs85D5i0ejjHHn7akDgv8SIDcvF R4Eu3RCV1DCJhgS47WhBm7SvOi1kuGLMavzXdggiH+Nx5msj7VAlgaolNBsujr57rW4Sm2 FKr62OxiNZ28aXXrO6lzISlRrBaDFkUtdi+96u2/xbM+QrmMC8QxXX7uWH1oMOA6U1JuZg ZzsvU71RiomHyhlFtMVF8F2Qg8jXLHPD+8SL2PiF7tbgbIjrNStvrYN1V5kK8ZeuVUvXkZ qJ0hKo3GP4W/HxHLxceVENlAJtH5v04J1ulUUNJhHZQxkZqRpVihMtkYVQJODw== 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=1694433618; 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=dLcb5dnF0MTQjG353yQcUDHgUvm8Nx9pdNFbUSWTlPY=; b=G5TFE80ldjHtVb+UZNrOYw9/76PjongXwwjl7V6uvvQz5gDN4wc1dpcpm86bfOgBIlFIYi VvRoHz5qxHTVaTTzDJLxJJjxltzMWOZxAxnUpdJRin9RfOcHDKTNR5Je4iePXFVf4x5nQq 5QufqhkjQ5+gJkNEsDfYb1148whBFrvIf8kvOUhzoXfE+zv4Wpz7wigpao56/FUNOGrSk/ qgi3uTY+pGcqtXjbJSZ3VrHpwekMAVsTM0V1tJn/OpUkIDKssrhXCfnvvfKkUoy+S3EcQf e99fP5xDuih2O55SLYTKEKnvakY51KpxBljAyBtqmSJYL2tDR4Hg90n5RJb5Qw== 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 4Rkldt3xZCznpJ; Mon, 11 Sep 2023 12:00: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 38BC0IuS001505; Mon, 11 Sep 2023 12:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0I86001502; Mon, 11 Sep 2023 12:00:18 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:18 GMT Message-Id: <202309111200.38BC0I86001502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 53b3e15d732f - stable/14 - linux(4): Fix listxattr for the case when the size is 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53b3e15d732ff6ff0df7870107d45a371a376e73 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=53b3e15d732ff6ff0df7870107d45a371a376e73 commit 53b3e15d732ff6ff0df7870107d45a371a376e73 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:51:46 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Fix listxattr for the case when the size is 0 If size is specified as zero, these calls return the current size of the list of extended attribute names (and leave list unchanged). Tested by: zirias MFC after: 1 week (cherry picked from commit 18d1c86788f66f42c4e096142f4f8d168f68732c) --- sys/compat/linux/linux_xattr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 74b47f1cbaec..71d7ae58439e 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -173,24 +173,28 @@ listxattr(struct thread *td, struct listxattr_args *args) while (rs > 0) { keylen = (unsigned char)key[0]; pairlen = prefixlen + 1 + keylen + 1; - if (cnt + pairlen > LINUX_XATTR_LIST_MAX) { + cnt += pairlen; + if (cnt > LINUX_XATTR_LIST_MAX) { error = E2BIG; break; } - if ((args->list != NULL && cnt > args->size) || + /* + * If size is specified as zero, return the current size + * of the list of extended attribute names. + */ + if ((args->size > 0 && cnt > args->size) || pairlen >= sizeof(attrname)) { error = ERANGE; break; } ++key; - if (args->list != NULL) { + if (args->list != NULL && args->size > 0) { sprintf(attrname, "%s.%.*s", prefix, keylen, key); error = copyout(attrname, args->list, pairlen); if (error != 0) break; args->list += pairlen; } - cnt += pairlen; key += keylen; rs -= (keylen + 1); } From nobody Mon Sep 11 12:00:19 2023 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 4Rkldv6S6wz4stsK; Mon, 11 Sep 2023 12:00: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 4Rkldv5qXFz3Qhd; Mon, 11 Sep 2023 12:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694433619; 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=s76PCtNkuZYDRnTcf7579S+mY2+nKVY9psE1+tF/0hk=; b=Qg00NCXj+jySzHdKTA254KuwUmGe+SvWEsl2+pTtoiFBFCl+C3zBeFrPtdtRwE9Y4lKHpQ 1GqY3plRQSv/RX747lQ/3m5wiF8Ti3pI80tnV0sGB4lqwywvLrjsaXYiGA2fUaeG4m0kx+ nMlYnHdJjhSsmvasWoH3RVZ5gi85uP/CfEtSIdduAlTc/+PB89DEf86bFxaAiyG0CDnCUu HM7j8v79juvBHJYFve4ajwyDRw/+cODft65oqZImtJfSG3luWa6ScIEDtlK9zG6uA0Z5pM Uhcu0uMNywQcn3OMhcJfuTq4T8Z243ELbCK5/yBW/9VHY8XPI+EX+zCs4dHKDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694433619; a=rsa-sha256; cv=none; b=WvjNbBRawm0aD35DhHN5rcF3pxjrX5CcHyCyklz6a/R+vjfKvnM0IXtwQs3epykiTV7sF4 txnoRDTfb/zoYj2ba1r9w4zbSOPHfRpZ1HBCG0A+vRS+PQEJSSqqsmwQdQR0kDZjHZ9pO6 w7AgWDlFTSxJ0JpwMAdDC4dtSFrjFdr7yOFajTfFNYI3W/g6zsWr4L1KRdFtHFrxb99KaY 72ZfsMlWJXV7YasdFXQ4XD1CX1ZMasnd40JgHTVGuq6zBP/5G+ujRS//6/FdQQcP/c5XYh 58ySyrnJjFPBvOFINBAEfmJPd+XMosz+L63SuBgFRCoeSxc9PTE3DuXBAlQEbA== 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=1694433619; 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=s76PCtNkuZYDRnTcf7579S+mY2+nKVY9psE1+tF/0hk=; b=d+XRdIm5l0n5WdVFWAAccCOd2lUXEItTNVbpy01/kubGn2tnNRlL30kKkYZHi9fEYSfEwl anZRmvGe3+X9d/OMNjx7TjSx5/l+dBp0U82NW7Su4yp0p8qsRA8jbLrpiMZPDX0vxNhkdd ooloNNSjnYRR7DTbVHr+uzxaY94l06Qv2sCWtIN2Y4BPETPToJn5/02c+A0N7o1f5Wyj5T GgP48LEAeUnIbnSU17+ozw0pCcutoIXJkD6jQWekKkhxfQQxhY93Fx7eVe+eCNYVn2vIYC xINc+yRkytQUjcONzQ2CxQdYVBpgVY58HsMQMqOs1SNQ9FShyLH9rJqZ+d+d+w== 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 4Rkldv4xHXznrg; Mon, 11 Sep 2023 12:00: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 38BC0JNr001556; Mon, 11 Sep 2023 12:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BC0J2s001553; Mon, 11 Sep 2023 12:00:19 GMT (envelope-from git) Date: Mon, 11 Sep 2023 12:00:19 GMT Message-Id: <202309111200.38BC0J2s001553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: e975d1b72507 - stable/14 - linux(4): Return ENOTSUP from listxattr instead of EPERM 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e975d1b72507def7a699adf1cb38c68b48d80f51 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e975d1b72507def7a699adf1cb38c68b48d80f51 commit e975d1b72507def7a699adf1cb38c68b48d80f51 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:52:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-11 11:59:38 +0000 linux(4): Return ENOTSUP from listxattr instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls, cp. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 11e37048db35d7fcfc285b867965de1aeefec2c8) --- sys/compat/linux/linux_xattr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 71d7ae58439e..6979fff9c82d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -165,6 +165,8 @@ listxattr(struct thread *td, struct listxattr_args *args) error = kern_extattr_list_fd(td, args->fd, attrnamespace, &auio); rs = sz - auio.uio_resid; + if (error == EPERM) + break; if (error != 0 || rs == 0) continue; prefix = extattr_namespace_names[attrnamespace]; From nobody Mon Sep 11 17:17:26 2023 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 4Rktgp3y8fz4sRk5; Mon, 11 Sep 2023 17:17: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 4Rktgp2kHvz4QHQ; Mon, 11 Sep 2023 17:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452646; 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=09q9POFHoWjbmsBj+wlI+VGav0W0bjiF1pw/NTfP784=; b=tOZ8XAsI8zoPvdMSbvG9WNSFXpd6IFwj8Jja9zME2zVMqz40bo4fhHCq+thS1iPBasbMwY NiRpKucxMMZ/D4kBMCDlIc4JqkxKBSbDKoXBFX1k/DXCcgKbrkc04N5cuNtm++UkC9RhAP NzM0TGU39q87kSDV3a9kVg3rKA7Sxriy0BVdH83h5ExGWdUv4cHI7rNShsaT0YsZ3dmCog g5p8p1cmtvskEcmOCPz3Ajrm307MdjpWwp3h9cgs6Klh0tC0zxXd5l+i+FLBxu94GdZawy W7fBPy1g6V3JQL27zX46vqVNNoEsUmbpp3R+exRFmbK1QjGZqtpOyayb7UO+IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694452646; a=rsa-sha256; cv=none; b=Wl17cluBTMDOCEhm+SHM/2Tt0sO32H4WJCKvW8F9MffvDWiVpu76CqbbRVTTtpwc7+UHyg OH3EaZ+SoKb4Qjt0sQeqkOaSI9kPlR0Op4n4Yz9oG8zTpgPv2Gnv3d2ei0pxekNwjyAPIO /qyARSTCmaeQU2Teiy42IAUYSMFPqaDVdLnrgCi9zqR1Q3K+uYZDcblKBuc2FYEyb+VhQM sIbgEhxBUF+ppuyPyrijR4w6qp+WONCT183p7uT7phaS2/zc0BXnjVHcNNY00UnutfrNsJ jcQuIOgtC/LeG97Y0JBnvdomy6Yqlcs0+TgFsZsrl3COQZM8CK3VZyyczqZQrg== 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=1694452646; 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=09q9POFHoWjbmsBj+wlI+VGav0W0bjiF1pw/NTfP784=; b=NPJzbQhNc5lJedBo87DyZc4AnUVHkrtfoFLJQQl2D2xRt0KeCwrXLTe0WmhsmsVVR2npCq I/1gH5QoZJ/MrgOfSiny1N+GlmYJl9pQI4pCYJKajoIoB3quWILrMqbQs9SyvBhz7O3pXZ V0wly1F33oNtjFFFO/rvo3ZcgTiBXvBWCEcRKu/9p7cjoWxNRZSOQ+CSH+heXEwQbY4Dyi gHBsQCQq98f9GdI9BV86Cck+ILs4Fxn/xKyOg+G2lOv0ivAuLGWA30YlpDl2s1sKcAFiPx LvD2ru86lsuIkkiENTNoP5w9n1EU8TJQ8pwppeAECLJxRzFD4XPB7b0+WXklrw== 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 4Rktgp1lNBzxNJ; Mon, 11 Sep 2023 17:17: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 38BHHQYV023898; Mon, 11 Sep 2023 17:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHHQuC023895; Mon, 11 Sep 2023 17:17:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:17:26 GMT Message-Id: <202309111717.38BHHQuC023895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: cf3d446e18bf - stable/13 - OpenSSL: Merge OpenSSL 1.1.1w 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf3d446e18bf2ddb6739fa4495e9f5ad6538aa54 Auto-Submitted: auto-generated The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=cf3d446e18bf2ddb6739fa4495e9f5ad6538aa54 commit cf3d446e18bf2ddb6739fa4495e9f5ad6538aa54 Author: Jung-uk Kim AuthorDate: 2023-09-11 16:50:12 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:14:49 +0000 OpenSSL: Merge OpenSSL 1.1.1w (cherry picked from commit a1860b94f62494288804faebb1bf6ea8110ca148) --- crypto/openssl/CHANGES | 24 +++++++ crypto/openssl/NEWS | 5 ++ crypto/openssl/README | 2 +- crypto/openssl/appveyor.yml | 78 ---------------------- crypto/openssl/crypto/asn1/ameth_lib.c | 11 ++- crypto/openssl/crypto/cms/cms_asn1.c | 17 ++++- crypto/openssl/crypto/cms/cms_local.h | 3 +- crypto/openssl/crypto/cms/cms_sd.c | 16 ++++- crypto/openssl/crypto/cms/cms_smime.c | 5 +- crypto/openssl/crypto/ec/ec_ameth.c | 19 ++++-- .../openssl/crypto/poly1305/asm/poly1305-x86_64.pl | 6 +- crypto/openssl/crypto/rsa/rsa_ameth.c | 7 +- crypto/openssl/doc/man3/CMS_sign.pod | 4 +- crypto/openssl/include/openssl/opensslv.h | 4 +- crypto/openssl/ssl/ssl_sess.c | 7 +- 15 files changed, 102 insertions(+), 106 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 612aaf56f6e6..12d965d47521 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,30 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1v and 1.1.1w [11 Sep 2023] + + *) Fix POLY1305 MAC implementation corrupting XMM registers on Windows. + + The POLY1305 MAC (message authentication code) implementation in OpenSSL + does not save the contents of non-volatile XMM registers on Windows 64 + platform when calculating the MAC of data larger than 64 bytes. Before + returning to the caller all the XMM registers are set to zero rather than + restoring their previous content. The vulnerable code is used only on newer + x86_64 processors supporting the AVX512-IFMA instructions. + + The consequences of this kind of internal application state corruption can + be various - from no consequences, if the calling application does not + depend on the contents of non-volatile XMM registers at all, to the worst + consequences, where the attacker could get complete control of the + application process. However given the contents of the registers are just + zeroized so the attacker cannot put arbitrary values inside, the most likely + consequence, if any, would be an incorrect result of some application + dependent calculations or a crash leading to a denial of service. + + (CVE-2023-4807) + [Bernd Edlinger] + + Changes between 1.1.1u and 1.1.1v [1 Aug 2023] *) Fix excessive time spent checking DH q parameter value. diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index c71c02911db0..1b849cdf7686 100644 --- a/crypto/openssl/NEWS +++ b/crypto/openssl/NEWS @@ -5,6 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.1v and OpenSSL 1.1.1w [11 Sep 2023] + + o Fix POLY1305 MAC implementation corrupting XMM registers on Windows + (CVE-2023-4807) + Major changes between OpenSSL 1.1.1u and OpenSSL 1.1.1v [1 Aug 2023] o Fix excessive time spent checking DH q parameter value (CVE-2023-3817) diff --git a/crypto/openssl/README b/crypto/openssl/README index dbe6bf756e94..e924e1529a9c 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1v 1 Aug 2023 + OpenSSL 1.1.1w 11 Sep 2023 Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/openssl/appveyor.yml b/crypto/openssl/appveyor.yml deleted file mode 100644 index 6210391f204a..000000000000 --- a/crypto/openssl/appveyor.yml +++ /dev/null @@ -1,78 +0,0 @@ -image: - - Visual Studio 2017 - -platform: - - x64 - - x86 - -environment: - fast_finish: true - matrix: - - VSVER: 15 - -configuration: - - shared - - plain - - minimal - -before_build: - - ps: >- - Install-Module VSSetup -Scope CurrentUser - - ps: >- - Get-VSSetupInstance -All - - ps: >- - gci env:* | sort-object name - - ps: >- - If ($env:Platform -Match "x86") { - $env:VCVARS_PLATFORM="x86" - $env:TARGET="VC-WIN32 no-asm --strict-warnings" - } Else { - $env:VCVARS_PLATFORM="amd64" - $env:TARGET="VC-WIN64A-masm" - } - - ps: >- - If ($env:Configuration -Match "shared") { - $env:SHARED="no-makedepend" - } ElseIf ($env:Configuration -Match "minimal") { - $env:SHARED="no-shared no-dso no-makedepend no-aria no-async no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine no-filenames no-gost no-idea no-mdc2 no-md4 no-multiblock no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3 no-ssl3-method no-ts no-ui-console no-whirlpool no-asm -DOPENSSL_SMALL_FOOTPRINT" - } Else { - $env:SHARED="no-shared no-makedepend" - } - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% - - mkdir _build - - cd _build - - perl ..\Configure %TARGET% %SHARED% - - perl configdata.pm --dump - - cd .. - - ps: >- - if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER` - -or (&git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT | - Select-String "\[extended tests\]") ) { - $env:EXTENDED_TESTS="yes" - } - -build_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - cmd /c "nmake build_all_generated 2>&1" - cmd /c "nmake PERL=no-perl 2>&1" - } - - cd .. - -test_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - if ($env:EXTENDED_TESTS) { - cmd /c "nmake test V=1 2>&1" - } Else { - cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1" - } - } - - ps: >- - if ($env:EXTENDED_TESTS) { - mkdir ..\_install - cmd /c "nmake install DESTDIR=..\_install 2>&1" - } - - cd .. diff --git a/crypto/openssl/crypto/asn1/ameth_lib.c b/crypto/openssl/crypto/asn1/ameth_lib.c index 5e8c3ed1d5b0..4ab246e98719 100644 --- a/crypto/openssl/crypto/asn1/ameth_lib.c +++ b/crypto/openssl/crypto/asn1/ameth_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -264,6 +264,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->pkey_size = src->pkey_size; dst->pkey_bits = src->pkey_bits; + dst->pkey_security_bits = src->pkey_security_bits; dst->param_decode = src->param_decode; dst->param_encode = src->param_encode; @@ -271,6 +272,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->param_copy = src->param_copy; dst->param_cmp = src->param_cmp; dst->param_print = src->param_print; + dst->sig_print = src->sig_print; dst->pkey_free = src->pkey_free; dst->pkey_ctrl = src->pkey_ctrl; @@ -281,6 +283,13 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->siginf_set = src->siginf_set; dst->pkey_check = src->pkey_check; + dst->pkey_public_check = src->pkey_public_check; + dst->pkey_param_check = src->pkey_param_check; + + dst->set_priv_key = src->set_priv_key; + dst->set_pub_key = src->set_pub_key; + dst->get_priv_key = src->get_priv_key; + dst->get_pub_key = src->get_pub_key; } diff --git a/crypto/openssl/crypto/cms/cms_asn1.c b/crypto/openssl/crypto/cms/cms_asn1.c index 08069d72a29e..a62e11ecbd90 100644 --- a/crypto/openssl/crypto/cms/cms_asn1.c +++ b/crypto/openssl/crypto/cms/cms_asn1.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,6 +51,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, EVP_PKEY_free(si->pkey); X509_free(si->signer); EVP_MD_CTX_free(si->mctx); + EVP_PKEY_CTX_free(si->pctx); } return 1; } @@ -89,11 +90,21 @@ ASN1_SEQUENCE(CMS_OriginatorInfo) = { ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1) } static_ASN1_SEQUENCE_END(CMS_OriginatorInfo) -ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = { +static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, + void *exarg) +{ + CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval; + + if (operation == ASN1_OP_FREE_POST) + OPENSSL_clear_free(ec->key, ec->keylen); + return 1; +} + +ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = { ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT), ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR), ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0) -} static_ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo) +} ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo) ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = { ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32), diff --git a/crypto/openssl/crypto/cms/cms_local.h b/crypto/openssl/crypto/cms/cms_local.h index a0ce4448f603..09c0bdfe5a47 100644 --- a/crypto/openssl/crypto/cms/cms_local.h +++ b/crypto/openssl/crypto/cms/cms_local.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -342,6 +342,7 @@ struct CMS_Receipt_st { DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_ITEM(CMS_SignerInfo) +DECLARE_ASN1_ITEM(CMS_EncryptedContentInfo) DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber) DECLARE_ASN1_ITEM(CMS_Attributes_Sign) DECLARE_ASN1_ITEM(CMS_Attributes_Verify) diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c index 3f2a782565a8..9f67f91297ea 100644 --- a/crypto/openssl/crypto/cms/cms_sd.c +++ b/crypto/openssl/crypto/cms/cms_sd.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -375,6 +375,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, } else if (EVP_DigestSignInit(si->mctx, &si->pctx, md, NULL, pk) <= 0) goto err; + else + EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); } if (!sd->signerInfos) @@ -600,6 +602,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms, unsigned char md[EVP_MAX_MD_SIZE]; unsigned int mdlen; pctx = si->pctx; + si->pctx = NULL; if (!EVP_DigestFinal_ex(mctx, md, &mdlen)) goto err; siglen = EVP_PKEY_size(si->pkey); @@ -680,6 +683,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) EVP_MD_CTX_reset(mctx); if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); si->pctx = pctx; } @@ -745,8 +749,13 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si) return -1; } mctx = si->mctx; + if (si->pctx != NULL) { + EVP_PKEY_CTX_free(si->pctx); + si->pctx = NULL; + } if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); if (!cms_sd_asn1_ctrl(si, 1)) goto err; @@ -859,8 +868,11 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain) if (EVP_PKEY_CTX_set_signature_md(pkctx, md) <= 0) goto err; si->pctx = pkctx; - if (!cms_sd_asn1_ctrl(si, 1)) + if (!cms_sd_asn1_ctrl(si, 1)) { + si->pctx = NULL; goto err; + } + si->pctx = NULL; r = EVP_PKEY_verify(pkctx, si->signature->data, si->signature->length, mval, mlen); if (r <= 0) { diff --git a/crypto/openssl/crypto/cms/cms_smime.c b/crypto/openssl/crypto/cms/cms_smime.c index 6e7dbc4da1fa..f6c1c7d17705 100644 --- a/crypto/openssl/crypto/cms/cms_smime.c +++ b/crypto/openssl/crypto/cms/cms_smime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -211,7 +211,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, if (cms == NULL) return NULL; if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen)) - return NULL; + goto err; if (!(flags & CMS_DETACHED)) CMS_set_detached(cms, 0); @@ -220,6 +220,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, || CMS_final(cms, in, NULL, flags)) return cms; + err: CMS_ContentInfo_free(cms); return NULL; } diff --git a/crypto/openssl/crypto/ec/ec_ameth.c b/crypto/openssl/crypto/ec/ec_ameth.c index 5098bd7a6602..5a63590a9fbd 100644 --- a/crypto/openssl/crypto/ec/ec_ameth.c +++ b/crypto/openssl/crypto/ec/ec_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -38,7 +38,6 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key) ASN1_OBJECT *asn1obj = OBJ_nid2obj(nid); if (asn1obj == NULL || OBJ_length(asn1obj) == 0) { - ASN1_OBJECT_free(asn1obj); ECerr(EC_F_ECKEY_PARAM2TYPE, EC_R_MISSING_OID); return 0; } @@ -98,9 +97,7 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) ptype, pval, penc, penclen)) return 1; err: - if (ptype == V_ASN1_OBJECT) - ASN1_OBJECT_free(pval); - else + if (ptype == V_ASN1_SEQUENCE) ASN1_STRING_free(pval); OPENSSL_free(penc); return 0; @@ -256,24 +253,32 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) eplen = i2d_ECPrivateKey(&ec_key, NULL); if (!eplen) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } ep = OPENSSL_malloc(eplen); if (ep == NULL) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_MALLOC_FAILURE); return 0; } p = ep; if (!i2d_ECPrivateKey(&ec_key, &p)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0, ptype, pval, ep, eplen)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); return 0; } diff --git a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl index 5f834d8faf2a..5e2bb18f2bac 100755 --- a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl +++ b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -193,7 +193,7 @@ $code.=<<___ if ($avx>1); bt \$`5+32`,%r9 # AVX2? cmovc %rax,%r10 ___ -$code.=<<___ if ($avx>3); +$code.=<<___ if ($avx>3 && !$win64); mov \$`(1<<31|1<<21|1<<16)`,%rax shr \$32,%r9 and %rax,%r9 @@ -2722,7 +2722,7 @@ $code.=<<___; .cfi_endproc .size poly1305_blocks_avx512,.-poly1305_blocks_avx512 ___ -if ($avx>3) { +if ($avx>3 && !$win64) { ######################################################################## # VPMADD52 version using 2^44 radix. # diff --git a/crypto/openssl/crypto/rsa/rsa_ameth.c b/crypto/openssl/crypto/rsa/rsa_ameth.c index 2c9c46ea53c8..00ed9820b0d2 100644 --- a/crypto/openssl/crypto/rsa/rsa_ameth.c +++ b/crypto/openssl/crypto/rsa/rsa_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -82,13 +82,16 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) if (!rsa_param_encode(pkey, &str, &strtype)) return 0; penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc); - if (penclen <= 0) + if (penclen <= 0) { + ASN1_STRING_free(str); return 0; + } if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id), strtype, str, penc, penclen)) return 1; OPENSSL_free(penc); + ASN1_STRING_free(str); return 0; } diff --git a/crypto/openssl/doc/man3/CMS_sign.pod b/crypto/openssl/doc/man3/CMS_sign.pod index 79446b129889..884be8fdd315 100644 --- a/crypto/openssl/doc/man3/CMS_sign.pod +++ b/crypto/openssl/doc/man3/CMS_sign.pod @@ -95,7 +95,7 @@ The function CMS_sign() is a basic CMS signing function whose output will be suitable for many purposes. For finer control of the output format the B, B and B parameters can all be B and the B flag set. Then one or more signers can be added using the -function CMS_sign_add1_signer(), non default digests can be used and custom +function CMS_add1_signer(), non default digests can be used and custom attributes added. CMS_final() must then be called to finalize the structure if streaming is not enabled. @@ -119,7 +119,7 @@ it is supported for embedded data in OpenSSL 1.0.0 and later. =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index c1063dc589e4..65209e1f6d77 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1010116fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1v-freebsd 1 Aug 2023" +# define OPENSSL_VERSION_NUMBER 0x1010117fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1w-freebsd 11 Sep 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/crypto/openssl/ssl/ssl_sess.c b/crypto/openssl/ssl/ssl_sess.c index cda6b7cc5bcf..68d1737ac521 100644 --- a/crypto/openssl/ssl/ssl_sess.c +++ b/crypto/openssl/ssl/ssl_sess.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2005 Nokia. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use @@ -139,8 +139,11 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->references = 1; dest->lock = CRYPTO_THREAD_lock_new(); - if (dest->lock == NULL) + if (dest->lock == NULL) { + OPENSSL_free(dest); + dest = NULL; goto err; + } if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, dest, &dest->ex_data)) goto err; From nobody Mon Sep 11 17:17:27 2023 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 4Rktgq6CNtz4sRk7; Mon, 11 Sep 2023 17:17: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 4Rktgq53RGz4QVt; Mon, 11 Sep 2023 17:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694452647; 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=ttKVCjrwZbYZPTTlrzLiLky4eTT9wq1FjkKkkvtCntg=; b=pw9E+vVvuDaHdRB64AwF9fxVBZaJySGfwifj8OLOP2J8pP7t/dfgAOFkqd5gtK1V4O7KIe P6twSurkJfIr4nttqJ1iotioin3H9sv24zCq1ngPWw9foxyxBdV+1yZFDEGa+FCmEQcIbM NYLBQl3GPGd9wCSbHxvFUva3AB0l/6ZK9yuOY+8XriGNLrtAx84qvMR0HrUCoJXos2LCnq n+nvQ8LDdWXw1qGyu/VGm92IwJXsa7QXuoJPIHOKLdFIgVXjiNFTbxsuKy0ysUdGfSXOw7 /tFvfB7wtzfxG/gNoC1d45dBkHZRyOJQhBedhIx7mDYGPu1IUsRBuHmiXGZf/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694452647; a=rsa-sha256; cv=none; b=WZGidqF5zlWpHWj77bh9pXoG/qo2+tgjObQKCW1Q20Qv4afZIr/SdvPoEEY64sCQ7r3Ti+ YjT8Y4uZXCC+CNocT02ND3QyXTt77764Qs0ZsX2TbUR/KtWR8YUj5Xng8wk4gh1fIxh21C iVn8+eDQuVdozr6d4iVux9xXIuqbH0PajtWJohfD4GZSIeU2VXo0QtNR71MpJHe89pfD1p P6XAQXMF7njjvNRP69CUCsQcZrMt9RL9OHWTpc1gFPzZhFJ/WVzN7iYPwOzjOJ7LHD46JV Wj4NEjjtWZkYraZA72F4cS1PJ/BV5vPbvYwpvENd+juhah7Wfr765lZ//XEzmA== 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=1694452647; 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=ttKVCjrwZbYZPTTlrzLiLky4eTT9wq1FjkKkkvtCntg=; b=Cu9ki5CVxFxfwubP/RCwcdjSrDbHa5FniCINkOoNHuh0ghN2ZjFHSgbFTxFw9UWYjJoL0Z u6+bY3GqDzCw4rb2YKnZS5i8BhQIDYuU0bN3dOl8my51JT20anhL5/tkq5AYzvCUjISI8M 1+Mx1C/P9j9N/9e3oN89Zn+hp4pXjmmPuEgVRRmr6cyMA7VG7gRnTcZ5ov25LmkcFDW8v1 VV8PzK/bhOlC2/c8MYDMAP7Zen3equLV5QOgrXC2WeRKHD39LLPpYdjh93JjEbviKc4kCE J22hB9qzIIm/7e7CHU18Nam/RAg9hXRMcd/jsl/vbLI0O1IOfSUYy4oQNW5uhw== 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 4Rktgq3dtNzxd3; Mon, 11 Sep 2023 17:17: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 38BHHRkD023962; Mon, 11 Sep 2023 17:17:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHHRF2023953; Mon, 11 Sep 2023 17:17:27 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:17:27 GMT Message-Id: <202309111717.38BHHRF2023953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: ab5435791cc7 - stable/13 - OpenSSL: Regen manual pages for OpenSSL 1.1.1w 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ab5435791cc727316bb504b15fa019fcd134a007 Auto-Submitted: auto-generated The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=ab5435791cc727316bb504b15fa019fcd134a007 commit ab5435791cc727316bb504b15fa019fcd134a007 Author: Jung-uk Kim AuthorDate: 2023-09-11 17:16:21 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:16:21 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1w --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 4 ++-- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_printf.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_push.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add_word.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_rand.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_swap.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_zero.3 | 4 ++-- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_compress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_final.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_sign.3 | 8 ++++---- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 4 ++-- secure/lib/libcrypto/man/man3/DES_random_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 4 ++-- .../lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aes.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aria.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_des.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md5.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 4 ++-- secure/lib/libcrypto/man/man3/HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/MD5.3 | 4 ++-- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 4 ++-- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_egd.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_validate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_clear.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_pending.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_want.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_write.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_create_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_digest.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_X509.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 4 ++-- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 4 ++-- secure/lib/libcrypto/man/man5/x509v3_config.5 | 4 ++-- secure/lib/libcrypto/man/man7/Ed25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 4 ++-- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 4 ++-- secure/lib/libcrypto/man/man7/SM2.7 | 4 ++-- secure/lib/libcrypto/man/man7/X25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/bio.7 | 4 ++-- secure/lib/libcrypto/man/man7/ct.7 | 4 ++-- secure/lib/libcrypto/man/man7/des_modes.7 | 4 ++-- secure/lib/libcrypto/man/man7/evp.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store.7 | 4 ++-- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 4 ++-- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 4 ++-- secure/lib/libcrypto/man/man7/scrypt.7 | 4 ++-- secure/lib/libcrypto/man/man7/ssl.7 | 4 ++-- secure/lib/libcrypto/man/man7/x509.7 | 4 ++-- secure/usr.bin/openssl/man/CA.pl.1 | 4 ++-- secure/usr.bin/openssl/man/asn1parse.1 | 4 ++-- secure/usr.bin/openssl/man/ca.1 | 4 ++-- secure/usr.bin/openssl/man/ciphers.1 | 4 ++-- secure/usr.bin/openssl/man/cms.1 | 4 ++-- secure/usr.bin/openssl/man/crl.1 | 4 ++-- secure/usr.bin/openssl/man/crl2pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/dgst.1 | 4 ++-- secure/usr.bin/openssl/man/dhparam.1 | 4 ++-- secure/usr.bin/openssl/man/dsa.1 | 4 ++-- secure/usr.bin/openssl/man/dsaparam.1 | 4 ++-- secure/usr.bin/openssl/man/ec.1 | 4 ++-- secure/usr.bin/openssl/man/ecparam.1 | 4 ++-- secure/usr.bin/openssl/man/enc.1 | 4 ++-- secure/usr.bin/openssl/man/engine.1 | 4 ++-- secure/usr.bin/openssl/man/errstr.1 | 4 ++-- secure/usr.bin/openssl/man/gendsa.1 | 4 ++-- secure/usr.bin/openssl/man/genpkey.1 | 4 ++-- secure/usr.bin/openssl/man/genrsa.1 | 4 ++-- secure/usr.bin/openssl/man/list.1 | 4 ++-- secure/usr.bin/openssl/man/nseq.1 | 4 ++-- secure/usr.bin/openssl/man/ocsp.1 | 4 ++-- secure/usr.bin/openssl/man/openssl.1 | 4 ++-- secure/usr.bin/openssl/man/passwd.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs12.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs8.1 | 4 ++-- secure/usr.bin/openssl/man/pkey.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyparam.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyutl.1 | 4 ++-- secure/usr.bin/openssl/man/prime.1 | 4 ++-- secure/usr.bin/openssl/man/rand.1 | 4 ++-- secure/usr.bin/openssl/man/req.1 | 4 ++-- secure/usr.bin/openssl/man/rsa.1 | 4 ++-- secure/usr.bin/openssl/man/rsautl.1 | 4 ++-- secure/usr.bin/openssl/man/s_client.1 | 4 ++-- secure/usr.bin/openssl/man/s_server.1 | 4 ++-- secure/usr.bin/openssl/man/s_time.1 | 4 ++-- secure/usr.bin/openssl/man/sess_id.1 | 4 ++-- secure/usr.bin/openssl/man/smime.1 | 4 ++-- secure/usr.bin/openssl/man/speed.1 | 4 ++-- secure/usr.bin/openssl/man/spkac.1 | 4 ++-- secure/usr.bin/openssl/man/srp.1 | 4 ++-- secure/usr.bin/openssl/man/storeutl.1 | 4 ++-- secure/usr.bin/openssl/man/ts.1 | 4 ++-- secure/usr.bin/openssl/man/tsget.1 | 4 ++-- secure/usr.bin/openssl/man/verify.1 | 4 ++-- secure/usr.bin/openssl/man/version.1 | 4 ++-- secure/usr.bin/openssl/man/x509.1 | 4 ++-- 535 files changed, 1072 insertions(+), 1072 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index c34e0a4561c3..9d3be14562e3 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -2,8 +2,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 1.1.1v -OPENSSL_DATE= 2023-08-01 +OPENSSL_VER= 1.1.1w +OPENSSL_DATE= 2023-09-11 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 index 385b65a1f57a..2d8787d31487 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ADMISSIONS 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 index 3e7cfc2223f7..4421d0012528 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 index 056eb016fe06..6b83902a0521 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 index 9ad6dae7622d..a16f6153140c 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 index 631ac1c07009..eabb00f8ff57 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 index 157b2389eb33..e4f0ef5d03b1 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 index 38d8efcd109b..94d342e11a24 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 index fa6d233333c6..9cb79d051446 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 index 32f0f90b4422..71038b0131c3 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 index 6354f8053f24..c086ed1abefe 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 index 9d091a577ae0..43a657966d8d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 index 707354c38646..995482e568ac 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 index 94286577dceb..6a1dc5ed8577 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BF_encrypt.3 b/secure/lib/libcrypto/man/man3/BF_encrypt.3 index 6979284edb61..0e07eeefb911 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 index 1680ec8ddedd..978d6fd7e505 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDR 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 index d9ef260a9541..798a7e99ab35 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_connect.3 b/secure/lib/libcrypto/man/man3/BIO_connect.3 index ec4eda157305..d65c4609cc77 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CONNECT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 index 6a04ce5db063..4dca8d2e5d66 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CTRL 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 index 8e85ff854025..f7ed3c0af9b7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 index caecb053ed94..fb767e246edc 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 index 775a375f5bf9..b05cfd7ecf8e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_md.3 b/secure/lib/libcrypto/man/man3/BIO_f_md.3 index 7778f5a4cf49..526297c272bf 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_MD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_null.3 b/secure/lib/libcrypto/man/man3/BIO_f_null.3 index 799e399146e9..c557319fc30e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 *** 9742 LINES SKIPPED *** From nobody Mon Sep 11 17:28:58 2023 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 4Rktx623dlz4sWxb; Mon, 11 Sep 2023 17:28: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 4Rktx61w77z4TD2; Mon, 11 Sep 2023 17:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453338; 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=foCTafJAJSIAXr3YWRzDNo+v8rMUf1xVX+UtMZpD5bU=; b=nU2vQ55bMz7NVZtnH4HCQGIWuye2a/fQHhAlrBvU48XMd2HG1nmdGMUwVvt4Sid2oxwBMC 3BVgGwFizbCqdCbio37ykLsuStJo3el87VYcOUnIvCfPijITPiWT5MZNTGkU1mNmm8QnJ8 DvY7oUHVdccghGjOVPJmiuoSyThGZzOdd9d2zbBZUxJlfKb81MhaOKSTKUtw/g+koGezCb sSkfje7CDzEQYC/1E5RRTNivgCOrYPo6YJSbicVpVQz2eZEd2e9scdtGCzZX95Ek5Gh5Pd xpyd+bSBJP17WubZ8NSZPZ9NVY3pBvTHj5wZn987P5aOZP3pjTgVVBKIBOC85w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694453338; a=rsa-sha256; cv=none; b=kO6gvZ0PDgcjAZAV3FJDX15DdJIOiM3hSe+Yk2FxsfsI8H+Vb4ZuJLjjBPwtWEojJnUXEx 7Bd+KgHFUDrG8rwr+yjR55g4ruBAOMQLdmKYHVPHvIWI6+4zDu2YQnOpnC7UzMiGWNOYuX B9HWBO6vpOCMDQMUOjdkG5TBev/hFfcTQFyeWzTRyv0zcp3efHom6roJPtXHEcn4LzhUky wdpWtDyRfXpt/7QMkz8iaAAz3Xd3KkPFkAS2Jgu0HQl4ohAq2GeuHhgjKZsk5A4DDm4k7d SqjtDOdPbPQyFzUcgpxvMxGwrjWx3kfQfp+fanPDaLZPlpdtL2NABSX96ywvzw== 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=1694453338; 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=foCTafJAJSIAXr3YWRzDNo+v8rMUf1xVX+UtMZpD5bU=; b=QFrx/lIDxnVAEqsywHZ9KbJgw0kJQe156Cwsh6T9qHBd2/7IE7QaYaCnjxbO5x2V2vMJzS LvffOEfPBbtP0XOjv+Gj5mlfSnGesU+fwwzwQnj/Pug0D2F3a3wIK4ZZxK7rqxALb5ZoEK 0MBZIAYCjIJ6Nrz2wzQOJfJvjrmucerqatVkM6cRNx4WQksOzeI0CXHxN84WHxw1q4G++6 KeWfz1YkvzFvoAwpLywXepYZ72tXFk7EgZNt9qi0nyVYaEQtwVVnW47vVItABHhm3L/pEK kwHack5Mta/buTGkHAR6UFEmFnrMBHHS2U/u+a1u0VBx0WmHfbv2j/QcRJT1ZA== 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 4Rktx60zyXzyHL; Mon, 11 Sep 2023 17:28: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 38BHSwCW040561; Mon, 11 Sep 2023 17:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHSwxa040558; Mon, 11 Sep 2023 17:28:58 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:28:58 GMT Message-Id: <202309111728.38BHSwxa040558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 70337f73e914 - stable/12 - OpenSSL: Merge OpenSSL 1.1.1w 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 70337f73e914d684ffd832797cd07d68cdcf17bc Auto-Submitted: auto-generated The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=70337f73e914d684ffd832797cd07d68cdcf17bc commit 70337f73e914d684ffd832797cd07d68cdcf17bc Author: Jung-uk Kim AuthorDate: 2023-09-11 16:50:12 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:27:54 +0000 OpenSSL: Merge OpenSSL 1.1.1w (cherry picked from commit a1860b94f62494288804faebb1bf6ea8110ca148) --- crypto/openssl/CHANGES | 24 +++++++ crypto/openssl/NEWS | 5 ++ crypto/openssl/README | 2 +- crypto/openssl/appveyor.yml | 78 ---------------------- crypto/openssl/crypto/asn1/ameth_lib.c | 11 ++- crypto/openssl/crypto/cms/cms_asn1.c | 17 ++++- crypto/openssl/crypto/cms/cms_local.h | 3 +- crypto/openssl/crypto/cms/cms_sd.c | 16 ++++- crypto/openssl/crypto/cms/cms_smime.c | 5 +- crypto/openssl/crypto/ec/ec_ameth.c | 19 ++++-- .../openssl/crypto/poly1305/asm/poly1305-x86_64.pl | 6 +- crypto/openssl/crypto/rsa/rsa_ameth.c | 7 +- crypto/openssl/doc/man3/CMS_sign.pod | 4 +- crypto/openssl/include/openssl/opensslv.h | 4 +- crypto/openssl/ssl/ssl_sess.c | 7 +- 15 files changed, 102 insertions(+), 106 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 52c2edf150e9..c4409489e79e 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,30 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1v and 1.1.1w [11 Sep 2023] + + *) Fix POLY1305 MAC implementation corrupting XMM registers on Windows. + + The POLY1305 MAC (message authentication code) implementation in OpenSSL + does not save the contents of non-volatile XMM registers on Windows 64 + platform when calculating the MAC of data larger than 64 bytes. Before + returning to the caller all the XMM registers are set to zero rather than + restoring their previous content. The vulnerable code is used only on newer + x86_64 processors supporting the AVX512-IFMA instructions. + + The consequences of this kind of internal application state corruption can + be various - from no consequences, if the calling application does not + depend on the contents of non-volatile XMM registers at all, to the worst + consequences, where the attacker could get complete control of the + application process. However given the contents of the registers are just + zeroized so the attacker cannot put arbitrary values inside, the most likely + consequence, if any, would be an incorrect result of some application + dependent calculations or a crash leading to a denial of service. + + (CVE-2023-4807) + [Bernd Edlinger] + + Changes between 1.1.1u and 1.1.1v [1 Aug 2023] *) Fix excessive time spent checking DH q parameter value. diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index c71c02911db0..1b849cdf7686 100644 --- a/crypto/openssl/NEWS +++ b/crypto/openssl/NEWS @@ -5,6 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.1v and OpenSSL 1.1.1w [11 Sep 2023] + + o Fix POLY1305 MAC implementation corrupting XMM registers on Windows + (CVE-2023-4807) + Major changes between OpenSSL 1.1.1u and OpenSSL 1.1.1v [1 Aug 2023] o Fix excessive time spent checking DH q parameter value (CVE-2023-3817) diff --git a/crypto/openssl/README b/crypto/openssl/README index dbe6bf756e94..e924e1529a9c 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1v 1 Aug 2023 + OpenSSL 1.1.1w 11 Sep 2023 Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/openssl/appveyor.yml b/crypto/openssl/appveyor.yml deleted file mode 100644 index 6210391f204a..000000000000 --- a/crypto/openssl/appveyor.yml +++ /dev/null @@ -1,78 +0,0 @@ -image: - - Visual Studio 2017 - -platform: - - x64 - - x86 - -environment: - fast_finish: true - matrix: - - VSVER: 15 - -configuration: - - shared - - plain - - minimal - -before_build: - - ps: >- - Install-Module VSSetup -Scope CurrentUser - - ps: >- - Get-VSSetupInstance -All - - ps: >- - gci env:* | sort-object name - - ps: >- - If ($env:Platform -Match "x86") { - $env:VCVARS_PLATFORM="x86" - $env:TARGET="VC-WIN32 no-asm --strict-warnings" - } Else { - $env:VCVARS_PLATFORM="amd64" - $env:TARGET="VC-WIN64A-masm" - } - - ps: >- - If ($env:Configuration -Match "shared") { - $env:SHARED="no-makedepend" - } ElseIf ($env:Configuration -Match "minimal") { - $env:SHARED="no-shared no-dso no-makedepend no-aria no-async no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine no-filenames no-gost no-idea no-mdc2 no-md4 no-multiblock no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3 no-ssl3-method no-ts no-ui-console no-whirlpool no-asm -DOPENSSL_SMALL_FOOTPRINT" - } Else { - $env:SHARED="no-shared no-makedepend" - } - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM% - - mkdir _build - - cd _build - - perl ..\Configure %TARGET% %SHARED% - - perl configdata.pm --dump - - cd .. - - ps: >- - if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER` - -or (&git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT | - Select-String "\[extended tests\]") ) { - $env:EXTENDED_TESTS="yes" - } - -build_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - cmd /c "nmake build_all_generated 2>&1" - cmd /c "nmake PERL=no-perl 2>&1" - } - - cd .. - -test_script: - - cd _build - - ps: >- - If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - if ($env:EXTENDED_TESTS) { - cmd /c "nmake test V=1 2>&1" - } Else { - cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1" - } - } - - ps: >- - if ($env:EXTENDED_TESTS) { - mkdir ..\_install - cmd /c "nmake install DESTDIR=..\_install 2>&1" - } - - cd .. diff --git a/crypto/openssl/crypto/asn1/ameth_lib.c b/crypto/openssl/crypto/asn1/ameth_lib.c index 5e8c3ed1d5b0..4ab246e98719 100644 --- a/crypto/openssl/crypto/asn1/ameth_lib.c +++ b/crypto/openssl/crypto/asn1/ameth_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -264,6 +264,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->pkey_size = src->pkey_size; dst->pkey_bits = src->pkey_bits; + dst->pkey_security_bits = src->pkey_security_bits; dst->param_decode = src->param_decode; dst->param_encode = src->param_encode; @@ -271,6 +272,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->param_copy = src->param_copy; dst->param_cmp = src->param_cmp; dst->param_print = src->param_print; + dst->sig_print = src->sig_print; dst->pkey_free = src->pkey_free; dst->pkey_ctrl = src->pkey_ctrl; @@ -281,6 +283,13 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, dst->siginf_set = src->siginf_set; dst->pkey_check = src->pkey_check; + dst->pkey_public_check = src->pkey_public_check; + dst->pkey_param_check = src->pkey_param_check; + + dst->set_priv_key = src->set_priv_key; + dst->set_pub_key = src->set_pub_key; + dst->get_priv_key = src->get_priv_key; + dst->get_pub_key = src->get_pub_key; } diff --git a/crypto/openssl/crypto/cms/cms_asn1.c b/crypto/openssl/crypto/cms/cms_asn1.c index 08069d72a29e..a62e11ecbd90 100644 --- a/crypto/openssl/crypto/cms/cms_asn1.c +++ b/crypto/openssl/crypto/cms/cms_asn1.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -51,6 +51,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, EVP_PKEY_free(si->pkey); X509_free(si->signer); EVP_MD_CTX_free(si->mctx); + EVP_PKEY_CTX_free(si->pctx); } return 1; } @@ -89,11 +90,21 @@ ASN1_SEQUENCE(CMS_OriginatorInfo) = { ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1) } static_ASN1_SEQUENCE_END(CMS_OriginatorInfo) -ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = { +static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, + void *exarg) +{ + CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval; + + if (operation == ASN1_OP_FREE_POST) + OPENSSL_clear_free(ec->key, ec->keylen); + return 1; +} + +ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = { ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT), ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR), ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0) -} static_ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo) +} ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo) ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = { ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32), diff --git a/crypto/openssl/crypto/cms/cms_local.h b/crypto/openssl/crypto/cms/cms_local.h index a0ce4448f603..09c0bdfe5a47 100644 --- a/crypto/openssl/crypto/cms/cms_local.h +++ b/crypto/openssl/crypto/cms/cms_local.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -342,6 +342,7 @@ struct CMS_Receipt_st { DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_ITEM(CMS_SignerInfo) +DECLARE_ASN1_ITEM(CMS_EncryptedContentInfo) DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber) DECLARE_ASN1_ITEM(CMS_Attributes_Sign) DECLARE_ASN1_ITEM(CMS_Attributes_Verify) diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c index 3f2a782565a8..9f67f91297ea 100644 --- a/crypto/openssl/crypto/cms/cms_sd.c +++ b/crypto/openssl/crypto/cms/cms_sd.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -375,6 +375,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, } else if (EVP_DigestSignInit(si->mctx, &si->pctx, md, NULL, pk) <= 0) goto err; + else + EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); } if (!sd->signerInfos) @@ -600,6 +602,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms, unsigned char md[EVP_MAX_MD_SIZE]; unsigned int mdlen; pctx = si->pctx; + si->pctx = NULL; if (!EVP_DigestFinal_ex(mctx, md, &mdlen)) goto err; siglen = EVP_PKEY_size(si->pkey); @@ -680,6 +683,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) EVP_MD_CTX_reset(mctx); if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); si->pctx = pctx; } @@ -745,8 +749,13 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si) return -1; } mctx = si->mctx; + if (si->pctx != NULL) { + EVP_PKEY_CTX_free(si->pctx); + si->pctx = NULL; + } if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0) goto err; + EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX); if (!cms_sd_asn1_ctrl(si, 1)) goto err; @@ -859,8 +868,11 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain) if (EVP_PKEY_CTX_set_signature_md(pkctx, md) <= 0) goto err; si->pctx = pkctx; - if (!cms_sd_asn1_ctrl(si, 1)) + if (!cms_sd_asn1_ctrl(si, 1)) { + si->pctx = NULL; goto err; + } + si->pctx = NULL; r = EVP_PKEY_verify(pkctx, si->signature->data, si->signature->length, mval, mlen); if (r <= 0) { diff --git a/crypto/openssl/crypto/cms/cms_smime.c b/crypto/openssl/crypto/cms/cms_smime.c index 6e7dbc4da1fa..f6c1c7d17705 100644 --- a/crypto/openssl/crypto/cms/cms_smime.c +++ b/crypto/openssl/crypto/cms/cms_smime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -211,7 +211,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, if (cms == NULL) return NULL; if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen)) - return NULL; + goto err; if (!(flags & CMS_DETACHED)) CMS_set_detached(cms, 0); @@ -220,6 +220,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher, || CMS_final(cms, in, NULL, flags)) return cms; + err: CMS_ContentInfo_free(cms); return NULL; } diff --git a/crypto/openssl/crypto/ec/ec_ameth.c b/crypto/openssl/crypto/ec/ec_ameth.c index 5098bd7a6602..5a63590a9fbd 100644 --- a/crypto/openssl/crypto/ec/ec_ameth.c +++ b/crypto/openssl/crypto/ec/ec_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -38,7 +38,6 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key) ASN1_OBJECT *asn1obj = OBJ_nid2obj(nid); if (asn1obj == NULL || OBJ_length(asn1obj) == 0) { - ASN1_OBJECT_free(asn1obj); ECerr(EC_F_ECKEY_PARAM2TYPE, EC_R_MISSING_OID); return 0; } @@ -98,9 +97,7 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) ptype, pval, penc, penclen)) return 1; err: - if (ptype == V_ASN1_OBJECT) - ASN1_OBJECT_free(pval); - else + if (ptype == V_ASN1_SEQUENCE) ASN1_STRING_free(pval); OPENSSL_free(penc); return 0; @@ -256,24 +253,32 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) eplen = i2d_ECPrivateKey(&ec_key, NULL); if (!eplen) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } ep = OPENSSL_malloc(eplen); if (ep == NULL) { + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_MALLOC_FAILURE); return 0; } p = ep; if (!i2d_ECPrivateKey(&ec_key, &p)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB); return 0; } if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0, ptype, pval, ep, eplen)) { - OPENSSL_free(ep); + OPENSSL_clear_free(ep, eplen); + if (ptype == V_ASN1_SEQUENCE) + ASN1_STRING_free(pval); return 0; } diff --git a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl index 5f834d8faf2a..5e2bb18f2bac 100755 --- a/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl +++ b/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -193,7 +193,7 @@ $code.=<<___ if ($avx>1); bt \$`5+32`,%r9 # AVX2? cmovc %rax,%r10 ___ -$code.=<<___ if ($avx>3); +$code.=<<___ if ($avx>3 && !$win64); mov \$`(1<<31|1<<21|1<<16)`,%rax shr \$32,%r9 and %rax,%r9 @@ -2722,7 +2722,7 @@ $code.=<<___; .cfi_endproc .size poly1305_blocks_avx512,.-poly1305_blocks_avx512 ___ -if ($avx>3) { +if ($avx>3 && !$win64) { ######################################################################## # VPMADD52 version using 2^44 radix. # diff --git a/crypto/openssl/crypto/rsa/rsa_ameth.c b/crypto/openssl/crypto/rsa/rsa_ameth.c index 2c9c46ea53c8..00ed9820b0d2 100644 --- a/crypto/openssl/crypto/rsa/rsa_ameth.c +++ b/crypto/openssl/crypto/rsa/rsa_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -82,13 +82,16 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) if (!rsa_param_encode(pkey, &str, &strtype)) return 0; penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc); - if (penclen <= 0) + if (penclen <= 0) { + ASN1_STRING_free(str); return 0; + } if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id), strtype, str, penc, penclen)) return 1; OPENSSL_free(penc); + ASN1_STRING_free(str); return 0; } diff --git a/crypto/openssl/doc/man3/CMS_sign.pod b/crypto/openssl/doc/man3/CMS_sign.pod index 79446b129889..884be8fdd315 100644 --- a/crypto/openssl/doc/man3/CMS_sign.pod +++ b/crypto/openssl/doc/man3/CMS_sign.pod @@ -95,7 +95,7 @@ The function CMS_sign() is a basic CMS signing function whose output will be suitable for many purposes. For finer control of the output format the B, B and B parameters can all be B and the B flag set. Then one or more signers can be added using the -function CMS_sign_add1_signer(), non default digests can be used and custom +function CMS_add1_signer(), non default digests can be used and custom attributes added. CMS_final() must then be called to finalize the structure if streaming is not enabled. @@ -119,7 +119,7 @@ it is supported for embedded data in OpenSSL 1.0.0 and later. =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index 7a8ba63d9603..5598a9ea4989 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1010116fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1v-freebsd 1 Aug 2023" +# define OPENSSL_VERSION_NUMBER 0x1010117fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1w-freebsd 11 Sep 2023" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/crypto/openssl/ssl/ssl_sess.c b/crypto/openssl/ssl/ssl_sess.c index cda6b7cc5bcf..68d1737ac521 100644 --- a/crypto/openssl/ssl/ssl_sess.c +++ b/crypto/openssl/ssl/ssl_sess.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2005 Nokia. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use @@ -139,8 +139,11 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->references = 1; dest->lock = CRYPTO_THREAD_lock_new(); - if (dest->lock == NULL) + if (dest->lock == NULL) { + OPENSSL_free(dest); + dest = NULL; goto err; + } if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, dest, &dest->ex_data)) goto err; From nobody Mon Sep 11 17:28:59 2023 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 4Rktx74QZwz4sWkl; Mon, 11 Sep 2023 17:28: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 4Rktx73tsDz4TJh; Mon, 11 Sep 2023 17:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694453339; 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=jTpfwOJ9kSElM2HHMTqcPwtTbO118YiMCBULHrflOGo=; b=TwxQRjhUF8OeVnT1kT3ye9jR5AZrbYvCgZALL1it4w1cPQxXIB54gHg9PDZIPKd2K9BkKG jjSejBgQlxRhwDBMlT4hlS0Hc0VzueIBeLt5QcP6I3vjedEIctol5oj8Shsnp5u1UO5o0C RtOvC2i1Nj3UqlUuuO2eaIbWOgD+rAaJGk45O0c647X5OVJAiKjrs30RXiS8RwN3ikG6Xi QuMh9E8xE8mk0j+G4Wvyrwl7yfrztmYX1rxFzrFxHFFGqhDvOG6hiw/H7FgQ0FzTYZwXzC AEPehCPGGE9HunKvLLrZnrpw33eh0uEac8J5Hh+xJqqqZ71Ian/+bloOUY7hMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694453339; a=rsa-sha256; cv=none; b=YNRAba+PI5XQuznTvb+S44G3nJu1U//tWEy4tm2x34RpdsfgqyxK6XiEpZt546T0KK+AtU wketFSNb3NW6xESyf1aCUcPFwBA/VCZClqIoNAD9GhXXkQ/NGJMmIi/0s/N9/FI+meJD0M YTD+0YAIKmfde3HC1or56pWAbldsBa12c0JEGcm+j539yAhpdnwV5G1DSjHhsOmTBO+2lY y0O9OuNQyA2uEPNXPpBotPEcxqycwu/ykfYzkDanm4z59bRo0loC6fZcFBDq6t3QBcMXvo 1fI4Z9GTupfMUyUV5MgxWoLwiBd+Ul809WmA3LMrF2EeaNhiEiYhEFXlDxaO9Q== 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=1694453339; 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=jTpfwOJ9kSElM2HHMTqcPwtTbO118YiMCBULHrflOGo=; b=grqjXeo6PO86TvFZWZGERbslkl+bwQ29d9Ydh529wKP4y53SkkXPYK1GqV6UajY7YagmwT hyVS7WLPBmrIN/pp84dCwXwtfgZU/JfYlLdF3uoCK7JLcDH6vML9NJM1+Io96X3oYPM0hj 9ss/+8wk107ZHM0hExt160I7oOQrTkqhsomVl/Rz+S9yzRWhTSoW7RvjU+zA5dHPKB7a4n b+eFhp/hZHPQYBcAMIf4C5z+CslulrqNXrRb7vDDNnIKAlvcDbqMJilk9hcxh7drdgKKla Rnj4c7c79GzBrky3yV6aTdNWAda30RZ5pFROVn13SVp3ktPL/43ZPS0aQX0Hqg== 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 4Rktx72mZMzyHM; Mon, 11 Sep 2023 17:28: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 38BHSxmo040610; Mon, 11 Sep 2023 17:28:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BHSxPj040607; Mon, 11 Sep 2023 17:28:59 GMT (envelope-from git) Date: Mon, 11 Sep 2023 17:28:59 GMT Message-Id: <202309111728.38BHSxPj040607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 43842be195da - stable/12 - OpenSSL: Regen manual pages for OpenSSL 1.1.1w 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 43842be195dabebb0ae35169d042fe5e99c5418e Auto-Submitted: auto-generated The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=43842be195dabebb0ae35169d042fe5e99c5418e commit 43842be195dabebb0ae35169d042fe5e99c5418e Author: Jung-uk Kim AuthorDate: 2023-09-11 17:28:31 +0000 Commit: Jung-uk Kim CommitDate: 2023-09-11 17:28:31 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1w --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 4 ++-- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_printf.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_push.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_add_word.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_rand.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_swap.3 | 4 ++-- secure/lib/libcrypto/man/man3/BN_zero.3 | 4 ++-- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_compress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_final.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_sign.3 | 8 ++++---- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 4 ++-- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 4 ++-- secure/lib/libcrypto/man/man3/DES_random_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DH_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/DSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 4 ++-- .../lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aes.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_aria.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_des.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_md5.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 4 ++-- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 4 ++-- secure/lib/libcrypto/man/man3/HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/MD5.3 | 4 ++-- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 4 ++-- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 4 ++-- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 4 ++-- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 4 ++-- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_add.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_egd.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/RSA_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SCT_validate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 4 ++-- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 4 ++-- .../lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 4 ++-- .../libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_accept.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_clear.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_connect.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_free.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_pending.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_want.3 | 4 ++-- secure/lib/libcrypto/man/man3/SSL_write.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_STRING.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_create_method.3 | 4 ++-- secure/lib/libcrypto/man/man3/UI_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_host.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_digest.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_dup.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_get_version.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_new.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_sign.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 4 ++-- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 4 ++-- secure/lib/libcrypto/man/man3/d2i_X509.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 4 ++-- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 4 ++-- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 4 ++-- secure/lib/libcrypto/man/man5/x509v3_config.5 | 4 ++-- secure/lib/libcrypto/man/man7/Ed25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND.7 | 4 ++-- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 4 ++-- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 4 ++-- secure/lib/libcrypto/man/man7/SM2.7 | 4 ++-- secure/lib/libcrypto/man/man7/X25519.7 | 4 ++-- secure/lib/libcrypto/man/man7/bio.7 | 4 ++-- secure/lib/libcrypto/man/man7/ct.7 | 4 ++-- secure/lib/libcrypto/man/man7/des_modes.7 | 4 ++-- secure/lib/libcrypto/man/man7/evp.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 4 ++-- secure/lib/libcrypto/man/man7/ossl_store.7 | 4 ++-- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 4 ++-- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 4 ++-- secure/lib/libcrypto/man/man7/scrypt.7 | 4 ++-- secure/lib/libcrypto/man/man7/ssl.7 | 4 ++-- secure/lib/libcrypto/man/man7/x509.7 | 4 ++-- secure/usr.bin/openssl/man/CA.pl.1 | 4 ++-- secure/usr.bin/openssl/man/asn1parse.1 | 4 ++-- secure/usr.bin/openssl/man/ca.1 | 4 ++-- secure/usr.bin/openssl/man/ciphers.1 | 4 ++-- secure/usr.bin/openssl/man/cms.1 | 4 ++-- secure/usr.bin/openssl/man/crl.1 | 4 ++-- secure/usr.bin/openssl/man/crl2pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/dgst.1 | 4 ++-- secure/usr.bin/openssl/man/dhparam.1 | 4 ++-- secure/usr.bin/openssl/man/dsa.1 | 4 ++-- secure/usr.bin/openssl/man/dsaparam.1 | 4 ++-- secure/usr.bin/openssl/man/ec.1 | 4 ++-- secure/usr.bin/openssl/man/ecparam.1 | 4 ++-- secure/usr.bin/openssl/man/enc.1 | 4 ++-- secure/usr.bin/openssl/man/engine.1 | 4 ++-- secure/usr.bin/openssl/man/errstr.1 | 4 ++-- secure/usr.bin/openssl/man/gendsa.1 | 4 ++-- secure/usr.bin/openssl/man/genpkey.1 | 4 ++-- secure/usr.bin/openssl/man/genrsa.1 | 4 ++-- secure/usr.bin/openssl/man/list.1 | 4 ++-- secure/usr.bin/openssl/man/nseq.1 | 4 ++-- secure/usr.bin/openssl/man/ocsp.1 | 4 ++-- secure/usr.bin/openssl/man/openssl.1 | 4 ++-- secure/usr.bin/openssl/man/passwd.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs12.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs7.1 | 4 ++-- secure/usr.bin/openssl/man/pkcs8.1 | 4 ++-- secure/usr.bin/openssl/man/pkey.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyparam.1 | 4 ++-- secure/usr.bin/openssl/man/pkeyutl.1 | 4 ++-- secure/usr.bin/openssl/man/prime.1 | 4 ++-- secure/usr.bin/openssl/man/rand.1 | 4 ++-- secure/usr.bin/openssl/man/req.1 | 4 ++-- secure/usr.bin/openssl/man/rsa.1 | 4 ++-- secure/usr.bin/openssl/man/rsautl.1 | 4 ++-- secure/usr.bin/openssl/man/s_client.1 | 4 ++-- secure/usr.bin/openssl/man/s_server.1 | 4 ++-- secure/usr.bin/openssl/man/s_time.1 | 4 ++-- secure/usr.bin/openssl/man/sess_id.1 | 4 ++-- secure/usr.bin/openssl/man/smime.1 | 4 ++-- secure/usr.bin/openssl/man/speed.1 | 4 ++-- secure/usr.bin/openssl/man/spkac.1 | 4 ++-- secure/usr.bin/openssl/man/srp.1 | 4 ++-- secure/usr.bin/openssl/man/storeutl.1 | 4 ++-- secure/usr.bin/openssl/man/ts.1 | 4 ++-- secure/usr.bin/openssl/man/tsget.1 | 4 ++-- secure/usr.bin/openssl/man/verify.1 | 4 ++-- secure/usr.bin/openssl/man/version.1 | 4 ++-- secure/usr.bin/openssl/man/x509.1 | 4 ++-- 535 files changed, 1072 insertions(+), 1072 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 76d23befcea2..68eacee7d00e 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -3,8 +3,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 1.1.1v -OPENSSL_DATE= 2023-08-01 +OPENSSL_VER= 1.1.1w +OPENSSL_DATE= 2023-09-11 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 index 385b65a1f57a..2d8787d31487 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ADMISSIONS 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 index 3e7cfc2223f7..4421d0012528 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 index 056eb016fe06..6b83902a0521 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 index 9ad6dae7622d..a16f6153140c 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 index 631ac1c07009..eabb00f8ff57 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 index 157b2389eb33..e4f0ef5d03b1 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 index 38d8efcd109b..94d342e11a24 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 index fa6d233333c6..9cb79d051446 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 index 32f0f90b4422..71038b0131c3 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 index 6354f8053f24..c086ed1abefe 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 index 9d091a577ae0..43a657966d8d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 index 707354c38646..995482e568ac 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 index 94286577dceb..6a1dc5ed8577 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BF_encrypt.3 b/secure/lib/libcrypto/man/man3/BF_encrypt.3 index 6979284edb61..0e07eeefb911 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 index 1680ec8ddedd..978d6fd7e505 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDR 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 index d9ef260a9541..798a7e99ab35 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_connect.3 b/secure/lib/libcrypto/man/man3/BIO_connect.3 index ec4eda157305..d65c4609cc77 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CONNECT 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 index 8e67876428d1..f13aabee4d88 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_CTRL 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 index 8e85ff854025..f7ed3c0af9b7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 index caecb053ed94..fb767e246edc 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 index 775a375f5bf9..b05cfd7ecf8e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_md.3 b/secure/lib/libcrypto/man/man3/BIO_f_md.3 index 7778f5a4cf49..526297c272bf 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-08-01" "1.1.1v" "OpenSSL" +.TH BIO_F_MD 3 "2023-09-11" "1.1.1w" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_null.3 b/secure/lib/libcrypto/man/man3/BIO_f_null.3 index 799e399146e9..c557319fc30e 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 *** 9742 LINES SKIPPED *** From nobody Mon Sep 11 18:50:25 2023 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 4Rkwl536RPz4tL1d; Mon, 11 Sep 2023 18:50: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 4Rkwl52g4rz3RCZ; Mon, 11 Sep 2023 18:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458225; 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=aF/jRpvR2zT+qX8eBzyP52CgiDFaPzjw4ha4iaVAz5g=; b=vTOVN5JUAU5EDKgMmldvzzUGnWEBfYjDICiQ47nQ8ScxKlfj3CAQCIwuBFPozt3EC6r3mm 4JNPuZHgZH7P4PH8QgET0xo8LM523JtV6kTlBWzwvXtNufvHqJJs1+X2Xrxs2CTTVnuYTh OMqUbv9g2HrA64KA074cTLLabASBPZwncr2A5rlwy30q/fKZgpqHdvf5WKuFNUYPu73mNA xTEGG5i8JSCJ55qxgPs1k0dFhODiR6t6lhTJOVWCDTfFp4/bVdFkpJdviqlwGGM7lN2pHf V5c2hXDP8howIfVm4oEwzj5/BT4iIgqlhokGLj8VDv0uk6pG2A+QGWtVtfcbpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458225; a=rsa-sha256; cv=none; b=YfESWZZHp1MxSbyRuX1y5kFxBD473iq6onbJgpahPvc/CdBtSTEPBmWbrYkU7TjIl4K9iI Rvyxdf1e/x2Sb02FCMupmZVqaMBnYsnMfTnGwwAU+nwyKz5cUsh8Gbz+veZYglV/9me5zD 6M7CxzjLtWIz32bgnIIKLOCuganfN9UcyA/fz2z1sFRtgtScffNL1AcN46kla6eNfNjgpZ fVfTpv1YZwIkRNXf+07X9EZhKRmEuRVYXE4pPvoFI9UKvmW+d4H2lYUlFsxfCfM/y8NjQy pr1sXGqy49goOCwEmwL5rACQVZDFLD2sk8gtffZpHzvQnuYaTlOSLmPDpFKJbQ== 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=1694458225; 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=aF/jRpvR2zT+qX8eBzyP52CgiDFaPzjw4ha4iaVAz5g=; b=Xwr6M9QjLJE2cpQF+H3BWJzPUErm1XYAnP6Cz6J0r9XihHYCUcmNnwWOv53qjblfpi6rNH 79In8vUti9iEfQ2BbeDl+mLpWdLImfniqZfy7eRJGeyqFTNaqTJ0AaAW9aMb/l0lk1JR31 +ok3q7e5h0RlJDAgVRhHexcAmG+pfQ6cIjpsOFralHz1NxQujXjE6tUFyMIyBt9PY/Zn/D todZjr02+OLH4TtnLXT9w0f+fPFq56TykJy65XTHqSymjyxRXiMwbP6cKvFm4zHVTe1xjU 5th01WQXOqRsR3GJ0UAf46ggDAT95kXVkyEkENrPMUIhGzvNwPDbgcPFRh42tA== 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 4Rkwl51l4gz11C5; Mon, 11 Sep 2023 18:50: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 38BIoPPG083120; Mon, 11 Sep 2023 18:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoPDX083117; Mon, 11 Sep 2023 18:50:25 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:25 GMT Message-Id: <202309111850.38BIoPDX083117@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: 8b95f9fe925e - stable/12 - msdosfs: correct handling of vnode pager size on file extension error 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/12 X-Git-Reftype: branch X-Git-Commit: 8b95f9fe925e844e5e763e50b592c4dddd113310 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8b95f9fe925e844e5e763e50b592c4dddd113310 commit 8b95f9fe925e844e5e763e50b592c4dddd113310 Author: Konstantin Belousov AuthorDate: 2023-02-10 04:58:43 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:04:29 +0000 msdosfs: correct handling of vnode pager size on file extension error (cherry picked from commit e59180ea09a1d1d1463f2a269e94efa0f0b677c5) (cherry picked from commit 64152225022bea784ca1948a67e7c040a8bb040a) --- sys/fs/msdosfs/msdosfs_denode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index db9e0712d2b1..beb615ec7a34 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -365,10 +365,8 @@ detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) return (EINVAL); } - if (dep->de_FileSize < length) { - vnode_pager_setsize(DETOV(dep), length); + if (dep->de_FileSize < length) return deextend(dep, length, cred); - } /* * If the desired length is 0 then remember the starting cluster of @@ -509,6 +507,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) return (error); } } + vnode_pager_setsize(DETOV(dep), length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; return (deupdat(dep, !DOINGASYNC(DETOV(dep)))); From nobody Mon Sep 11 18:50:26 2023 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 4Rkwl646Pdz4tL9J; Mon, 11 Sep 2023 18:50: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 4Rkwl63RmVz3RYk; Mon, 11 Sep 2023 18: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=1694458226; 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=VWSz6E1vnDov1cnldXg1LXUWshxVI9EByEYLy66zE18=; b=HblH8mBH9AHjeV+7yFq3/0YWZ+EfOBR+OmQ5qK4sPpiSWSo4bnArYPU6nYLtdkxKJZfOLG H0Snw55F+Iard+OXteMo6tV33iUaUEJpf3sb7d8lwX4ysWFO4z+D8ynWRkb4z264SwL3IH fOT+Kos/M1Q9JMz4OjbOU6iu135h32kyvV0nkTJtg9gSsoTGISC88JW2tKzvEdi++WSKAZ Um+Q5j+2oRBkk2pfUlGXbLfXap9pWqRMtGmUZfB57KN1UwYCPgSDbIPDg1sWAmvWxrziko XHqcogSenLgdjJRQ3IpaXPHMlXG0crqgaFn+gY5Zc80bzKgavEMBIp3vGIMh0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458226; a=rsa-sha256; cv=none; b=rXeWMeOJh24+hLIbf5Pbuq7aIiW34kWsQnQBV2ufLWfG4hQJEVxufCr4NexXzG+h3Inpo9 uR310iGeCwdEgN7eYD8FlsTRZLoVQDE6Unr/UokwYmJKpWsDUAsEFKhR8Y1EMjbvlRfIG1 5cD34AKYIESAGN9ik/RlWnm8cIo7zU93TSxVWQ4taPKJyPrDz1/ol8lcKTU70qJtnhLEFo XfWuFDwhwRkiPteNHBa5dbnABrsCTQ3JfurmVYosVlqc8ZEQqSliW/Ac6SBmRaUZi31fAF 2kd9/qrPtR2fZ2N4/TbK+bsCYJgFZO4C0taQ3NvOGnvhBHwJ2O35FIKnYWXaVw== 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=1694458226; 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=VWSz6E1vnDov1cnldXg1LXUWshxVI9EByEYLy66zE18=; b=tJzcRQjcnidk5Jh2Z+c9V5N8xECMwVZcEm/2sY4Z2CzWS/f0u9bdVOWdQ9GwNpVY4Yi18z wp7VQ/9sxbTIs49w9iXSZxsDqT6P8qfVaQstNGBVT7aDHksh2JDfIH1dXF1N6qXuenT/00 1X2so5BnBjYVDKdppwLr4Qtemp8R7Yan8cTaTwVb/Bf5pR04tAxoseD6vxume/2waOp7ui 7QCg9KfNBE+QVsnWuHI6UTZy9Qg6yBNeoNTl7iQ/jlMWY182pTXkzUpuQ+PfD7niS3xTfZ fUANnpBk94OJwX2uyud5dUOWuIvim0ysNozS/oCA9eXd5HdHQqpC7ZuZGPW2Dg== 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 4Rkwl62YzLz11C6; Mon, 11 Sep 2023 18: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 38BIoQhq083159; Mon, 11 Sep 2023 18: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 38BIoQ1A083156; Mon, 11 Sep 2023 18:50:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:26 GMT Message-Id: <202309111850.38BIoQ1A083156@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: 0754c27f4926 - stable/12 - msdosfs deextend(): memoize DETOV(dep) 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/12 X-Git-Reftype: branch X-Git-Commit: 0754c27f49262e395d5814947a334dbd5b077504 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0754c27f49262e395d5814947a334dbd5b077504 commit 0754c27f49262e395d5814947a334dbd5b077504 Author: Konstantin Belousov AuthorDate: 2023-02-11 18:05:14 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:04:52 +0000 msdosfs deextend(): memoize DETOV(dep) (cherry picked from commit 67dc1e7b0457ec014a1291c5874decdefe7bffdd) (cherry picked from commit 03562adbefb80ba94bebe602fc051bbc4292cb37) --- sys/fs/msdosfs/msdosfs_denode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index beb615ec7a34..b251c2797467 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -475,13 +475,14 @@ int deextend(struct denode *dep, u_long length, struct ucred *cred) { struct msdosfsmount *pmp = dep->de_pmp; + struct vnode *vp = DETOV(dep); u_long count; int error; /* * The root of a DOS filesystem cannot be extended. */ - if ((DETOV(dep)->v_vflag & VV_ROOT) && !FAT32(pmp)) + if ((vp->v_vflag & VV_ROOT) != 0 && !FAT32(pmp)) return (EINVAL); /* @@ -507,10 +508,10 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) return (error); } } - vnode_pager_setsize(DETOV(dep), length); + vnode_pager_setsize(vp, length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; - return (deupdat(dep, !DOINGASYNC(DETOV(dep)))); + return (deupdat(dep, !DOINGASYNC(vp))); } /* From nobody Mon Sep 11 18:50:27 2023 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 4Rkwl80SQYz4tLLF; Mon, 11 Sep 2023 18:50: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 4Rkwl74VZ8z3Rc5; Mon, 11 Sep 2023 18:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458227; 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=e3bZjszuZxEevcDGZ6oq+oxB+LUQk5JaZZAKxx8F1Hs=; b=vhXBN6tH1iBr1ywseSPIxgoNVKKHbd1BCtvcTHC24wqW4KgxDEBtjZDAGF1qeytbCSYa3L 5Y9eStJQt2kF5/KV8VbuNAWamQKMnx+CLL97t/vpzo0eK9eZ0EXoO5EbYmzWk5SQaBoTfG 1A03D52UjjM10RoSjPmjSBE3G4uz1oqAvondHZ5Hq9aqlLUoaHy5zdjcxcm0sL/WSW+KzM mEOLJOmy3wUu4WUGFCTgzzLzAIGPLAWyDoI6ia+xAdts8+ZbQnZuTS6dCMlM1uIZAuDNbm RLTKwpPmE8OfSjlAFwYdh0qbMGdTxTTr2l9/5sqKGS1qaUYGM+nRl47O76uMgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458227; a=rsa-sha256; cv=none; b=JMVJwnpFhHgAw04hGvd65zIl1zAwEDZT5MP78Au2ySD8i9QuzDhBcZv2KMzNtFMmYqDdZe 2/8FSWnqiQKAxWRu+e+5xQSlvSHOGE/+0/PN+/clsEjaF8aFp5zXWQlTe8kE2VJjg3iwbC eIyLq5Y6tcd47roAeFPR+p4fc2xV8q7Diaw4QpVjBI5NPi88FzaO0IToIOwpHEXOuPVPLb ye4rvAx8iwNQms0RDT6ROuZY7EuXJietjolHxf9jjJDQv5ChQVYg8Akzvbpm0LzJ9tx3n4 qOc+wzRv8fvCNEyFwx0vpdTAOB065HEfGoQiCdP9E8xc/pxfQ08QwPK1JSqgCA== 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=1694458227; 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=e3bZjszuZxEevcDGZ6oq+oxB+LUQk5JaZZAKxx8F1Hs=; b=bjZo+fJnGP9CrflffpuM+BveFO60urrZ2MG6vWhDzvyudgSh85XEl5QttOQp9SH88GI54q u3fv9kpAS6CafTjT9hQyzjJdWvNxYTiKrpgXIUhssk6RZmF3uevEYstJIknZX37gUWgn4+ mmQL+yCUBpGSlbMJYCtGEmBozTZ2f7uiPB/xK4HBPlmV5GqxqyVsNV4SBoGuYSlqJpf2VJ +glPhpYACQNEyw1bxCWl9PHqS9TLI8SBtPCEXcnJ5+QuiwF0tzxP8biuLFl0o4uMnnEBtx 1HisVW3GV7I03U2n2UCD2LWAKL2C4vH2xcFPmz3ya6PB8zTrudS5rQaaS3dL3w== 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 4Rkwl73bcDz10M7; Mon, 11 Sep 2023 18:50: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 38BIoRjN083211; Mon, 11 Sep 2023 18:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoR0O083208; Mon, 11 Sep 2023 18:50:27 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:27 GMT Message-Id: <202309111850.38BIoR0O083208@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: b2e3ab898cd2 - stable/12 - msdosfs deextend: validate pages of the partial buffer 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/12 X-Git-Reftype: branch X-Git-Commit: b2e3ab898cd2a8517858f32cc7397cf026013548 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b2e3ab898cd2a8517858f32cc7397cf026013548 commit b2e3ab898cd2a8517858f32cc7397cf026013548 Author: Konstantin Belousov AuthorDate: 2023-02-11 18:09:30 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:04:59 +0000 msdosfs deextend: validate pages of the partial buffer PR: 269341 (cherry picked from commit 0152d453a08fa2bad694dc04a8184fce2b7faa10) (cherry picked from commit c2ee668306bbe3edf4a05246ed3a88f52dfc94ae) --- sys/fs/msdosfs/msdosfs_denode.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index b251c2797467..57d1c96a561b 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -476,6 +476,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) { struct msdosfsmount *pmp = dep->de_pmp; struct vnode *vp = DETOV(dep); + struct buf *bp; u_long count; int error; @@ -502,16 +503,41 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) if (count > pmp->pm_freeclustercount) return (ENOSPC); error = extendfile(dep, count, NULL, NULL, DE_CLEAR); - if (error) { - /* truncate the added clusters away again */ - (void) detrunc(dep, dep->de_FileSize, 0, cred); - return (error); - } + if (error != 0) + goto rewind; } + + /* + * For the case of cluster size larger than the page size, we + * need to ensure that the possibly dirty partial buffer at + * the old end of file is not filled with invalid pages by + * extension. Otherwise it has a contradictory state of + * B_CACHE | B_DELWRI but with invalid pages, and cannot be + * neither written out nor validated. + * + * Fix it by proactively clearing extended pages. + */ + error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster, + NOCRED, &bp); + if (error != 0) + goto rewind; + vfs_bio_clrbuf(bp); + if (!DOINGASYNC(vp)) + (void)bwrite(bp); + else if (vm_page_count_severe() || buf_dirty_count_severe()) + bawrite(bp); + else + bdwrite(bp); + vnode_pager_setsize(vp, length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; return (deupdat(dep, !DOINGASYNC(vp))); + +rewind: + /* truncate the added clusters away again */ + (void)detrunc(dep, dep->de_FileSize, 0, cred); + return (error); } /* From nobody Mon Sep 11 18:50:28 2023 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 4Rkwl86qznz4tLLJ; Mon, 11 Sep 2023 18:50: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 4Rkwl85Ss1z3Rnl; Mon, 11 Sep 2023 18:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458228; 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=rEMdPyZKbYGK2hSh3krev31BQT8FYC4+KfDd1pq/HmU=; b=JRedIZLEMV0rPDizNNwhVofNUJI/tqmqsp8qR94rubpS2PGn2MdqWY9JABE7qZtyVBbOAE ncvRbrbd1SckTl95gcWGf6m8jz+B8T9znjv3ZwyGy+YdAbT9yo2GUoy1b3xKbi9OTgGK41 m6nRUFCesnU9ztWZ+LWscipNViqHs1l+EeMtRr86b43Z8abYGuQk5TQqhipmz4X+Eh0etS 6es1wJDhie+VRwYA7ExDox3E5CfmtgzKessdHmc+MYVau6LTKeLuC4JXRzM3RQ2VCSYlWc gg5IkcbeI7tcid8889JtcPvX9Ez14FR/i+MOZlrmsTxSPzRMMHc0aey03Uov8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458228; a=rsa-sha256; cv=none; b=AmNOXu//8MJo0Ypk/GhsPNTW8FBre0Y7HPnHwm8FX0HMP3QaHtlF8FP7DmDTPr6jXSWTZk tgqfgZ32g/RmNTdRfxAfAZeUxObqCeCUZlUUEOiyY43Cs/0XGNKb/BEzi3FkMZT2BSN+c8 y6CBBRthPNWuXyGc+12v3jozy39rBb9h651LJLr6QyB3SfoiEkzWaNbY824tnPCU5qPXu9 2g8+qtNLaooHLPAf+EX2mFTn/n9u4YJrfuKGTjfSkdX2IZh9j8OvNb5ratgLOevZikn8hn dfxOspQtG8iFNZjlfo+jvjiS9D3S46UF035HRKba/AoPggcP5AZH3JvMg57KEw== 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=1694458228; 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=rEMdPyZKbYGK2hSh3krev31BQT8FYC4+KfDd1pq/HmU=; b=tWrJfIkY0ohNTXblWVDLf/qgs5Bzn4slD0s6Xt7mdxs1AcrJ1jJ+QRlV1i1VVCLz2WfE6g 8lI6yJIM6rRPElKXEZMOTGxplDe7z6CF8KrnFCnp7qq8mrz0X8ZV/XWsoo4txdOR2fIVpW AymSGTt6xROPdIYlqOPwKl5i9dQtM3AfsCvW0YDefKh7ZlNQWIAvKjPLm5tGYwHc5Js66N MTpHjjJXPweTcu/jBsSnJh8Pnq6zFY1bvKxcgT/kxZUbLTNzvcLew/oocO/GajVt86wlYZ zcoYKOjtURGA6vS7jVOO6GKuJfCqJEMWln/j/c9Ve1aler+MmT4/HvIYuC0xGA== 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 4Rkwl84ZNbz10dH; Mon, 11 Sep 2023 18:50: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 38BIoSxl083263; Mon, 11 Sep 2023 18:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoSAR083260; Mon, 11 Sep 2023 18:50:28 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:28 GMT Message-Id: <202309111850.38BIoSAR083260@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: 79802c179a5d - stable/12 - msdosfs: zero partially valid extended cluster 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/12 X-Git-Reftype: branch X-Git-Commit: 79802c179a5de367a0c16b07e746b280d4813a2c Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79802c179a5de367a0c16b07e746b280d4813a2c commit 79802c179a5de367a0c16b07e746b280d4813a2c Author: Konstantin Belousov AuthorDate: 2023-07-06 01:51:07 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:05:09 +0000 msdosfs: zero partially valid extended cluster (cherry picked from commit 7e4c6b2163fbed6be92b1e19f0eec4da973cfaec) (cherry picked from commit 868f3eadc5e0b50863c13457074ac1a0b03958dd) --- sys/fs/msdosfs/msdosfs_denode.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 57d1c96a561b..3b4e809d6196 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -477,6 +477,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) struct msdosfsmount *pmp = dep->de_pmp; struct vnode *vp = DETOV(dep); struct buf *bp; + off_t eof_clusteroff; u_long count; int error; @@ -515,13 +516,19 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) * B_CACHE | B_DELWRI but with invalid pages, and cannot be * neither written out nor validated. * - * Fix it by proactively clearing extended pages. + * Fix it by proactively clearing extended pages. Need to do + * both vfs_bio_clrbuf() to mark pages valid, and to zero + * actual buffer content which might exist in the tail of the + * already valid cluster. */ error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) goto rewind; vfs_bio_clrbuf(bp); + eof_clusteroff = de_cn2off(pmp, de_cluster(pmp, dep->de_FileSize)); + vfs_bio_bzero_buf(bp, dep->de_FileSize - eof_clusteroff, + pmp->pm_bpcluster - dep->de_FileSize + eof_clusteroff); if (!DOINGASYNC(vp)) (void)bwrite(bp); else if (vm_page_count_severe() || buf_dirty_count_severe()) From nobody Mon Sep 11 19:20:11 2023 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 4RkxPR5j0jz4sfdP; Mon, 11 Sep 2023 19:20: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 4RkxPR5Httz3blM; Mon, 11 Sep 2023 19:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460011; 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=gqa9nQySvhcOzWgf5dMbWbB8DBSWGErAmtCecA8eU98=; b=btCGpEgXzhUL6kXEWFoEwNrq6dAW888UbXgcCOqrJF13GCBAniIp65tLy3N3vaOPRxDvUe onzrnXa4wLJR/DFf63HfJDqBZwj19QQWFGy6YI6//BcglKzAJF1qZXih6lvntBMVg0wj3c VDoprR7YyIXBvm7lCxpF21aSI6XlgR2Jiyxx4xXUMkz83aGqW2ww+Q4jXmQLXlqiVyYFK7 qvt7pGlWyN69Bt4UeupcKyyJx1IjV0mk7DWIXfk47B1eHMCDzQZtce1010LILYN0FfpkQW 84Uh8Z5HDdkQeexVCfgjk3KFVHZLGQ6CoqjydNJnFgoicQ5qmEDX0mbYPptY2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694460011; a=rsa-sha256; cv=none; b=SLFDitTK8wyXjrAYg/9MrRWCleH49eBleeviDmsyK52FexrEqp48Ooh6HdsnQOt3qUcIPt pUmkWPqaFQ7kEkKCZkJGCDIDPZQiGnUtd8usBOk4f1/7ie6rSQmuuLvjdOhBLiMPKWOC7O h1JXd3XPqNEXCgOv66aX5kY+lJymtNSBYCDOvt8UwaGOcC9Ur/mdRJakX82+IbgRSTFdeb qK6ZjliKzS4lEVQjYvwXiMjRa5+n9NEHkEqUo0nn39E7tMDR7Xu7C28Ykc+ptuBUVrHAZk Tm1CaAPnmO+7tH8TNVB5MkUFFCFJreAF1dg6+L2wqUt6bCuJKiUQkZf3hisCoQ== 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=1694460011; 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=gqa9nQySvhcOzWgf5dMbWbB8DBSWGErAmtCecA8eU98=; b=Lv4wEtQFKe19IEn+EQGQxPMKlrcY5HIx+45a/HTKTjQ07PFrBmmhO1wbIt5INnbr0Rwfhc sCLEMAws5z61fYPq2Lpce3kYKLfGRt6/J6i7RNWgG6YXh7A1plBXaVt/nVkTsOTtoT0JGq XgkXU+ou3XyGWqeQsFRJvTuKxAf/+chqJwGSRxgUgqbn5MVCE0grDN6SqyDQBqhFaNzyNR YZb33jaI6SF8WieghwZMHYSc5mbE4b+jnLfSnlo1dgM6zhNcC7oBqySQD5uV8JiSZTISFP pQ5aI/5c1sHfCc465jNhzIxsp7naaMDQXkO4GR8mqjGDOBzI+undA/7qprTljQ== 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 4RkxPR4HhGz120Q; Mon, 11 Sep 2023 19:20: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 38BJKBdF029648; Mon, 11 Sep 2023 19:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJKBgE029639; Mon, 11 Sep 2023 19:20:11 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:20:11 GMT Message-Id: <202309111920.38BJKBgE029639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 196bb0e152cf - stable/14 - libpmc: make pmc_pmu_pmcallocate() machine-independent 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 196bb0e152cf2d3a0ba61bda8a2d09c8107a809a Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=196bb0e152cf2d3a0ba61bda8a2d09c8107a809a commit 196bb0e152cf2d3a0ba61bda8a2d09c8107a809a Author: Mitchell Horne AuthorDate: 2023-06-19 22:32:22 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 19:19:58 +0000 libpmc: make pmc_pmu_pmcallocate() machine-independent Have it call the platform-dependent version. For better layering, move the reset logic inside the new function. This is mainly to facilitate an upcoming change. Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40752 (cherry picked from commit 45dcc17e2fb8f0f9838ba167b311f271a08fcea9) --- lib/libpmc/libpmc.c | 5 ----- lib/libpmc/libpmc_pmu_util.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index 71fba89237ff..a7ed1c3d9ac8 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -1091,11 +1091,6 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, assert(pmc_config.pm_ev < PMC_EVENT_FIRST); goto found; } - - /* Otherwise, reset any changes */ - pmc_config.pm_ev = 0; - pmc_config.pm_caps = 0; - pmc_config.pm_class = 0; } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index a61f81f7d2c7..772dec7a9d53 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -572,8 +572,8 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, return (0); } -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -604,8 +604,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__powerpc64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -631,8 +631,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__aarch64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -658,9 +658,27 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #else -int -pmc_pmu_pmcallocate(const char *e __unused, struct pmc_op_pmcallocate *p __unused) +static int +pmc_pmu_pmcallocate_md(const char *e __unused, struct pmc_op_pmcallocate *p __unused) { return (EOPNOTSUPP); } #endif + +int +pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +{ + int error; + + error = pmc_pmu_pmcallocate_md(event_name, pm); + if (error != 0) { + /* Reset any changes. */ + pm->pm_ev = 0; + pm->pm_caps = 0; + pm->pm_class = 0; + + return (error); + } + + return (0); +} From nobody Mon Sep 11 19:20:12 2023 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 4RkxPS6t6gz4sfr0; Mon, 11 Sep 2023 19:20: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 4RkxPS6LRCz3c2J; Mon, 11 Sep 2023 19:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694460012; 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=otJ54/QHiU4cKRycOdV+9mTN0cjV8aNKDo315TDImRk=; b=HdEIFh6mrc/H/QMrvlmK0mQa4qInpRThe4cGjx4mCBNOtC2WmbNRP+0u56yoJPbucFWccp 61Hs66KNC17otwDrvWICWfOOPqHUF1tQFFYz25mM3irS4tflHn2NVJfep1DMBCO0xSLYiM Qv4anRnnmp634S60Rj40VoCI6CKTG/9RCbq4vhDJD6HLQqM+OWw1Z6XPMZaoRk5oUNbSlD BLA9SaQP7prQNv9gY5SndLiuZNA1aiu87FCSWBfsQefyuErb1uH25H3WwbZJOwsOEkKoNH aLTcXzHDOyu9F1GhIubjO+qvMsrgWgkFeKBB7Ebi4tm0BCUkXmXbb5/ki/SWHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694460012; a=rsa-sha256; cv=none; b=ODxtUT9YDf61w6LjBA1nIhtuQRZjLQRTjLC4c51DJU2GPnmrzkhetQuZ84P4gZ/baw06Sw E6yr2kzZ/HLRhH0xuTIxJfpb2g2wLCbZ81e8VOdN5PWLogCePn2RAX14owA907JalutLtk QTKVjpvuyGMzsqpfpQn44FkvpXYL0MBHHtxKVFaOSPZAeuY3H8zfATS5N7ykxFTmJD2DVT k3ddvHVPI22/nFCC3r2wMiEcEJt2mFIW1w/hM11gexq2a0jnErF/GAPbfz43vYrZL0aWnN QKKYLB8EEmZfvjK8FhW7Kla9KWDLBnUbLiHmWCw3rXjOe/nP+3CX3ixOIBlA7w== 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=1694460012; 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=otJ54/QHiU4cKRycOdV+9mTN0cjV8aNKDo315TDImRk=; b=OOJsREiz+etIvTCjmSZpG3J97AGCZs2UX7jOnQQsAvIf3zCzhNhHadNdMQD4QXbjQE/EMz cMa8A0u6r+54NQwER3tg6FePaitR9BCEpAVfF3YCyScsbQkN5EZxXUYpewxO6cqrTtRVym uLqfql49l8PCseCic6/jnyvQ44KSd14cO1XCOYQJj3R2ooFPGZd0GTdOCBmkdw0iZXXZsn ZSKqVMBNkoTJPCA8Zccp7nolzv1UHPRz6iMYfg7txggNAzI2rUqOLWku0WWJ7yDruvEHLH +/imKoq0RklGXQGc2c76ybrVkz/hUgGPnoO4SC8zvyoURZzBc0DhDd3ttX0a4g== 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 4RkxPS58Wbz11Tt; Mon, 11 Sep 2023 19:20: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 38BJKC13030332; Mon, 11 Sep 2023 19:20:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJKCNh030314; Mon, 11 Sep 2023 19:20:12 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:20:12 GMT Message-Id: <202309111920.38BJKCNh030314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5adb91c72985 - stable/14 - pmc: better distinguish pmu-events allocation path 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5adb91c72985b840b2c7fbf3c3308619acd2b61a Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5adb91c72985b840b2c7fbf3c3308619acd2b61a commit 5adb91c72985b840b2c7fbf3c3308619acd2b61a Author: Mitchell Horne AuthorDate: 2023-06-06 17:26:46 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 19:19:58 +0000 pmc: better distinguish pmu-events allocation path Background: The pm_ev field of struct pmc_op_pmcallocate and struct pmc traditionally contains the index of the chosen event, corresponding to the __PMC_EVENTS array in pmc_events.h. This is a static list of events, maintained by FreeBSD. In the usual case, libpmc translates the user supplied event name (string) into the pm_ev index, which is passed as an argument to the allocation syscall. On the kernel side, the allocation method for the relevant hwpmc class translates the given index into the event code that will be written to an event selection register. In 2018, a new source of performance event definitions was introduced: the pmu-events json files, which are maintained by the Linux kernel. The result was better coverage for newer Intel processors with a reduced maintenance burden for libpmc/hwpmc. Intel and AMD CPUs were unconditionally switched to allocate events from pmu-events instead of the traditional scheme (959826ca1bb0a, 81eb4dcf9e0d). Under the pmu-events scheme, the pm_ev field contains an index corresponding to the selected event from the pmu-events table, something which the kernel has no knowledge of. The configuration for the performance counting registers is instead passed via class-dependent fields (struct pmc_md_op_pmcallocate). In 2021 I changed the allocation logic so that it would attempt to pull from the pmu-events table first, and fall-back to the traditional method (dfb4fb41166bc3). Later, pmu-events support for arm64 and power8 CPUs was added (28dd6730a5d6 and b48a2770d48b). The problem that remains is that the pm_ev field is overloaded, without a definitive way to determine whether the event allocation came from the pmu-events table or FreeBSD's statically-defined PMC events. This resulted in a recent fix, 21f7397a61f7. Change: To disambiguate these two supported but separate use-cases, add a new flag, PMC_F_EV_PMU, to be set as part of the allocation, indicating that the event index came from pmu-events. This is useful in two ways: 1. On the kernel side, we can validate the syscall arguments better. Some classes support only the traditional event scheme (e.g. hwpmc_armv7), while others support only the pmu-events method (e.g. hwpmc_core for Intel). We can now check for this. The hwpmc_arm64 class supports both methods, so the new flag supersedes the existing MD flag, PM_MD_EVENT_RAW. 2. The flag will be tracked in struct pmc for the duration of its lifetime, meaning it is communicated back to userspace. This allows libpmc to perform the reverse index-to-event-name translation without speculating about the meaning of the index value. Adding the flag is a backwards-incompatible ABI change. We recently bumped the major version of the hwpmc module, so this breakage is acceptable. Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40753 (cherry picked from commit c190fb35f35cc163b61e582a49115680b0d49dcc) --- lib/libpmc/libpmc.c | 9 +-------- lib/libpmc/libpmc_pmu_util.c | 2 +- lib/libpmc/pmclog.c | 11 +++-------- sys/arm64/include/pmc_mdep.h | 2 -- sys/dev/hwpmc/hwpmc_amd.c | 3 +++ sys/dev/hwpmc/hwpmc_arm64.c | 6 +++--- sys/dev/hwpmc/hwpmc_core.c | 6 ++++++ sys/dev/hwpmc/hwpmc_mod.c | 3 ++- sys/dev/hwpmc/hwpmc_power8.c | 3 +++ sys/dev/hwpmc/hwpmc_uncore.c | 6 ++++++ sys/sys/pmc.h | 8 ++++++++ 11 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index a7ed1c3d9ac8..f10a64e28cac 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -1083,14 +1082,8 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, r = spec_copy = strdup(ctrspec); ctrname = strsep(&r, ","); if (pmc_pmu_enabled()) { - if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) { - /* - * XXX: pmclog_get_event exploits this to disambiguate - * PMU from PMC event codes in PMCALLOCATE events. - */ - assert(pmc_config.pm_ev < PMC_EVENT_FIRST); + if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) goto found; - } } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 772dec7a9d53..fa2e76e8d026 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -649,7 +649,6 @@ pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) assert(idx >= 0); pm->pm_ev = idx; pm->pm_md.pm_md_config = ped.ped_event; - pm->pm_md.pm_md_flags |= PM_MD_RAW_EVENT; pm->pm_class = PMC_CLASS_ARMV8; pm->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); @@ -680,5 +679,6 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) return (error); } + pm->pm_flags |= PMC_F_EV_PMU; return (0); } diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c index a21fe42c9947..3b1572baaa2c 100644 --- a/lib/libpmc/pmclog.c +++ b/lib/libpmc/pmclog.c @@ -357,15 +357,10 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ64(le,ev->pl_u.pl_a.pl_rate); /* - * Could be either a PMC event code or a PMU event index; - * assume that their encodings don't overlap (i.e. no PMU event - * table is more than 0x1000 entries) to distinguish them here. - * Otherwise pmc_pmu_event_get_by_idx will go out of bounds if - * given a PMC event code when it knows about that CPU. - * - * XXX: Ideally we'd have user flags to give us that context. + * pl_event could contain either a PMC event code or a PMU + * event index. */ - if (ev->pl_u.pl_a.pl_event < PMC_EVENT_FIRST) + if ((ev->pl_u.pl_a.pl_flags & PMC_F_EV_PMU) != 0) ev->pl_u.pl_a.pl_evname = pmc_pmu_event_get_by_idx(ps->ps_cpuid, ev->pl_u.pl_a.pl_event); diff --git a/sys/arm64/include/pmc_mdep.h b/sys/arm64/include/pmc_mdep.h index 5c43a7924b01..97d0f30c9c09 100644 --- a/sys/arm64/include/pmc_mdep.h +++ b/sys/arm64/include/pmc_mdep.h @@ -45,8 +45,6 @@ union pmc_md_op_pmcallocate { struct { uint32_t pm_md_config; - uint32_t pm_md_flags; -#define PM_MD_RAW_EVENT 0x1 }; struct pmc_md_cmn600_pmu_op_pmcallocate pm_cmn600; struct pmc_md_dmc620_pmu_op_pmcallocate pm_dmc620; diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index b15d223bc7a5..fbbaf92a1547 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -582,6 +582,9 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, if (pd->pd_class != a->pm_class) return EINVAL; + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + caps = pm->pm_caps; PMCDBG2(MDP,ALL,1,"amd-allocate ri=%d caps=0x%x", ri, caps); diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 995b7158ac20..9a5debb8016b 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -177,9 +177,9 @@ arm64_allocate_pmc(int cpu, int ri, struct pmc *pm, } pe = a->pm_ev; - /* Adjust the config value if needed. */ - config = a->pm_md.pm_md_config; - if ((a->pm_md.pm_md_flags & PM_MD_RAW_EVENT) == 0) { + if ((a->pm_flags & PMC_F_EV_PMU) != 0) { + config = a->pm_md.pm_md_config; + } else { config = (uint32_t)pe - PMC_EV_ARMV8_FIRST; if (config > (PMC_EV_ARMV8_LAST - PMC_EV_ARMV8_FIRST)) return (EINVAL); diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 15b875e3af94..3829a03eb729 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -239,6 +239,9 @@ iaf_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_IAF) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + iap = &a->pm_md.pm_iap; config = iap->pm_iap_config; ev = IAP_EVSEL_GET(config); @@ -721,6 +724,9 @@ iap_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_IAP) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + iap = &a->pm_md.pm_iap; ev = IAP_EVSEL_GET(iap->pm_iap_config); diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index de012b74d558..5dd8bc67d60a 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -3349,7 +3349,8 @@ pmc_do_op_pmcallocate(struct thread *td, struct pmc_op_pmcallocate *pa) * Look for valid values for 'pm_flags'. */ if ((flags & ~(PMC_F_DESCENDANTS | PMC_F_LOG_PROCCSW | - PMC_F_LOG_PROCEXIT | PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN)) != 0) + PMC_F_LOG_PROCEXIT | PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN | + PMC_F_EV_PMU)) != 0) return (EINVAL); /* PMC_F_USERCALLCHAIN is only valid with PMC_F_CALLCHAIN. */ diff --git a/sys/dev/hwpmc/hwpmc_power8.c b/sys/dev/hwpmc/hwpmc_power8.c index fc6b878eff7d..d7ccbc5c6c0a 100644 --- a/sys/dev/hwpmc/hwpmc_power8.c +++ b/sys/dev/hwpmc/hwpmc_power8.c @@ -168,6 +168,9 @@ power8_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_POWER8) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + /* * PMC5 and PMC6 are not programmable and always count instructions * completed and cycles, respectively. diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index c16800c14ce1..fd4266b605ef 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -199,6 +199,9 @@ ucf_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_UCF) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + flags = UCF_EN; pm->pm_md.pm_ucf.pm_ucf_ctrl = (flags << (ri * 4)); @@ -498,6 +501,9 @@ ucp_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_UCP) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + ucp = &a->pm_md.pm_ucp; ev = UCP_EVSEL(ucp->pm_ucp_config); switch (uncore_cputype) { diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index a4d03efb6aac..714d8a7c65b7 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -369,6 +369,14 @@ enum pmc_ops { #define PMC_F_CALLCHAIN 0x00000080 /*OP ALLOCATE capture callchains */ #define PMC_F_USERCALLCHAIN 0x00000100 /*OP ALLOCATE use userspace stack */ +/* V10 API */ +#define PMC_F_EV_PMU 0x00000200 /* + * OP ALLOCATE: pm_ev has special + * userspace meaning; counter + * configuration is communicated + * through class-dependent fields + */ + /* internal flags */ #define PMC_F_ATTACHED_TO_OWNER 0x00010000 /*attached to owner*/ #define PMC_F_NEEDS_LOGFILE 0x00020000 /*needs log file */ From nobody Mon Sep 11 19:45:01 2023 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 4Rkxy56N2nz4sywP; Mon, 11 Sep 2023 19:45: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 4Rkxy54WjWz4GmS; Mon, 11 Sep 2023 19:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694461501; 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=PgUEbMkpaamzYyzkFvk1G0sUgEJguQq4cJBveZQRjwQ=; b=yJFVFMp5CxSiyZo2zdGdsxIENy0726rYca17yD6dfIL/LZ5gAvdsJqYdEnMCBuN4Z4nfhU 3qRpiGmKrHAIvlMO121QyAF6/l9P5JwUegEHynNCvqcyMRFgm7VFQtOscc2X73U7Sw+LuF uBjRg5PSmnr4729TX8TRqwm2ZTqkEUq8WfopOwnmukrVAEfq+vw/+tW4dluqMfNBe3HQbF e7Uh0r8UkGiZwGiH0Y/wSnAktZjDT5XR5+twAFMRbiQ52DgV/v17GPmDof4Wf2J2Y1QsdP lnRbGxXM0wfQA7gxkzBifrlnWSnA5yC4ux6tO+TdtuTdVnsPiiP4VmrgnC0r3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694461501; a=rsa-sha256; cv=none; b=S+iDLAt+wo926QYPE27X1z8DDjghv010RFV1nz6Qn/q30IfGtZ5lpLmUA6vtSwROxVaMMi 0RscMwmEW9qQRirucJ4jvXbw+kSQyjCQ2I6UDrS322kuE6OEe8FWbDQDIs8eJianh0mwsU Wep/RiwV1HeHhso8sS7OKFfgsT81p7FNaHm6eY5xhOgBEu8HJJcnW5UMkDpVF/STXFUnKx q0xV4wUgnCsDVaxHV28hQMD2pjt0ARAbBFPEOo0/O+iv+cza9ohf11miS2sq3Bhi5VPwu1 vkWNE1WPJs1xmoZme5mEsl9A9YU9YjrFllsFS6y4uIlt58G2dmwtQIBH2S2lZw== 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=1694461501; 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=PgUEbMkpaamzYyzkFvk1G0sUgEJguQq4cJBveZQRjwQ=; b=vNdt2j4cu8ICRQkSFbhLcrhaitwC85qr2Zkb/N2XPX7cuU49wf5c0+GICbSCk9Juy6ciTg HmfweQwRU2lm/tluOJpE5dbm8+J1ix84jbLLAKMZIOf5vR9hUT1Wh21+KLLhUx3k3mGXU6 F+Il1psxofDXP6zBF7d8XqRRb71lVP+xQC+rzHonDIZH3rigfVn+BW05sVSDodq+mlOEZq 1+025gKVrYJO3ee1ZNHCdqeGPLaIRf3J7W5saxWbc0oy64iqhm+e1b9gawIu1CnEJAFX6O KWwkTfkCH0RRvnCW1GT03RlVVoFq165Qlv3nGEB+7Ls0qEVz3Bl2+osokWumuQ== 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 4Rkxy53Z80z12q1; Mon, 11 Sep 2023 19:45:01 +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 38BJj1Hs073107; Mon, 11 Sep 2023 19:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJj1i6073104; Mon, 11 Sep 2023 19:45:01 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:45:01 GMT Message-Id: <202309111945.38BJj1i6073104@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: f0ed478f0596 - releng/14.0 - libarchive: merge security fix from vendor branch 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f0ed478f0596deb99db65738baa73d18ea4368ee Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ed478f0596deb99db65738baa73d18ea4368ee commit f0ed478f0596deb99db65738baa73d18ea4368ee Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 19:44:49 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 Approved by: re (gjb) (cherry picked from commit f10f65999fe56e92f00b5bc5d27ac342cfea5364) (cherry picked from commit 0c9b0086715b3b354d471de9dee2ea113aa94481) --- .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c index 661b7013e0d2..8ce1d18c61e5 100644 --- a/contrib/libarchive/libarchive/archive_write_set_format_pax.c +++ b/contrib/libarchive/libarchive/archive_write_set_format_pax.c @@ -368,10 +368,12 @@ archive_write_pax_header_xattr(struct pax *pax, const char *encoded_name, struct archive_string s; char *encoded_value; + if (encoded_name == NULL) + return; + if (pax->flags & WRITE_LIBARCHIVE_XATTR) { encoded_value = base64_encode((const char *)value, value_len); - - if (encoded_name != NULL && encoded_value != NULL) { + if (encoded_value != NULL) { archive_string_init(&s); archive_strcpy(&s, "LIBARCHIVE.xattr."); archive_strcat(&s, encoded_name); @@ -404,17 +406,22 @@ archive_write_pax_header_xattrs(struct archive_write *a, archive_entry_xattr_next(entry, &name, &value, &size); url_encoded_name = url_encode(name); - if (url_encoded_name != NULL) { + if (url_encoded_name == NULL) + goto malloc_error; + else { /* Convert narrow-character to UTF-8. */ r = archive_strcpy_l(&(pax->l_url_encoded_name), url_encoded_name, pax->sconv_utf8); free(url_encoded_name); /* Done with this. */ if (r == 0) encoded_name = pax->l_url_encoded_name.s; - else if (errno == ENOMEM) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate memory for Linkname"); - return (ARCHIVE_FATAL); + else if (r == -1) + goto malloc_error; + else { + archive_set_error(&a->archive, + ARCHIVE_ERRNO_MISC, + "Error encoding pax extended attribute"); + return (ARCHIVE_FAILED); } } @@ -423,6 +430,9 @@ archive_write_pax_header_xattrs(struct archive_write *a, } return (ARCHIVE_OK); +malloc_error: + archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); + return (ARCHIVE_FATAL); } static int @@ -1904,14 +1914,19 @@ url_encode(const char *in) { const char *s; char *d; - int out_len = 0; + size_t out_len = 0; char *out; for (s = in; *s != '\0'; s++) { - if (*s < 33 || *s > 126 || *s == '%' || *s == '=') + if (*s < 33 || *s > 126 || *s == '%' || *s == '=') { + if (SIZE_MAX - out_len < 4) + return (NULL); out_len += 3; - else + } else { + if (SIZE_MAX - out_len < 2) + return (NULL); out_len++; + } } out = (char *)malloc(out_len + 1); From nobody Mon Sep 11 19:48:24 2023 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 4Rky203bjPz4t1Tt; Mon, 11 Sep 2023 19:48: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 4Rky2038fKz4Hhn; Mon, 11 Sep 2023 19:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694461704; 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=DOG2wHRuA2Ma7bvlpZV+Fn37EmBzANP7fo8U+5ySzkg=; b=tiTIbpyor6151Q7wMZKEPQevJ8EIBj5dTcDtroTupPzVR+YUjl/8fEQunuLEJK766eGPLF D3NttoNev/ZDndRAjGUsgXCKJ1awzwk/faAX1CBoMXXw2FiPe+M4saICQvQg7UGidkSR6T 7hifKjvg4IMAOy73OQfCfIieWD/aYqLb5Z1nWSfOFvLIbljjgsvf92SiuYCrMlq3NHcxk0 m8XFaTTvKSZAzvl8tr4LV/2BlPu0Y11mxEZt6ojVh7c04AhNXDRRTr2sjtD/DNYfPpHJha ofXpghClxXEiQH9uFBoacArLmfWnVcNa4bs/7EfF9Kca0yaxUMhafBNOzwhppw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694461704; a=rsa-sha256; cv=none; b=or4lHpZA17mZ3IEJXF85c9OlVclEW0HRUd+qq8EV1x/0PjGRZ5lmO6fcmhf5CQFxPqUwQg NWtd+sR0y3C+92ZI8SWmD4XdZsRtqOt5Cet9efWpAz8OFTnhlLPCF2HfMvrnt2TEQLQvV2 nulhhDrReHrLvf82nNfmJ1G4T3neygxya80qaSV7rqqb0mrFIIHoUvgqejAdVs7lOCRQ8T tx+mbBL7U9P6cw7hx7r5duDUhBwGB+tUg5HrON2mqpgfgdck7Fd/VzU+seYz4MO8C6hXzB r09sJUgSPo81nlBxmzTf+flw4jM0PLd18hoGSGdjSU1JO2A92zxKA6Bp6DVETQ== 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=1694461704; 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=DOG2wHRuA2Ma7bvlpZV+Fn37EmBzANP7fo8U+5ySzkg=; b=AYJ36gUq7P1iV2SPyp+7hJryAXSC7K8zZ+TUVyrCzBqmrLA78TiNj5Cfbt+Ie9/SF2mICH JgxaAFX3g0f5V1WoksLwnce2m12m6IEcG+A7voY75G+fyDczSUEBa5Nf8W10n2gG40BGPU oGuWewNNR2ijbm/c3DwucMtVD5VHsn/ScO71zzBTzkXbgYxkZpfgnWuihi56X7rlrQ7qtP lgmPv8QQZZk3SpdcR2mj+uUS/AT7HyA0/XG0Otoj0s/OuPFKulC0r8CaVlo33DHWHd9it1 wr8WKcCz2v+mciEHNm6+VxBmBG4JpH0ySVCO99fo3G1bFbtettil5ym6nccAYw== 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 4Rky2026Pdz12gQ; Mon, 11 Sep 2023 19:48: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 38BJmOfR073706; Mon, 11 Sep 2023 19:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BJmO4Q073703; Mon, 11 Sep 2023 19:48:24 GMT (envelope-from git) Date: Mon, 11 Sep 2023 19:48:24 GMT Message-Id: <202309111948.38BJmO4Q073703@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: 9dcf00aa404b - releng/14.0 - zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9dcf00aa404bb62052433c45aaa5475e2760f5ed Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=9dcf00aa404bb62052433c45aaa5475e2760f5ed commit 9dcf00aa404bb62052433c45aaa5475e2760f5ed Author: Martin Matuska AuthorDate: 2023-09-11 07:20:55 +0000 Commit: Martin Matuska CommitDate: 2023-09-11 19:47:08 +0000 zfs: merge openzfs/zfs@e96fbdba3 (zfs-2.2-release) into stable/14 Notable upstream pull request merges: #15251 Add more constraints for block cloning Obtained from: OpenZFS OpenZFS commit: e96fbdba344e9c25cad624a10d4a4b300fd35f6c Approved by: re (gjb) (cherry picked from commit 2b2fbeb3a97b44e88b1ca1a01a9671a8be9fd04f) --- sys/contrib/openzfs/META | 2 +- .../openzfs/module/os/linux/zfs/qat_compress.c | 2 ++ sys/contrib/openzfs/module/zfs/zfs_vnops.c | 21 +++++++++++++++++++-- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sys/contrib/openzfs/META b/sys/contrib/openzfs/META index e4e770026b57..0953cc51922f 100644 --- a/sys/contrib/openzfs/META +++ b/sys/contrib/openzfs/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.2.0 -Release: rc3 +Release: rc4 Release-Tags: relext License: CDDL Author: OpenZFS diff --git a/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c b/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c index 07d5d34dae33..6d0595dd5f76 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/qat_compress.c @@ -193,7 +193,9 @@ qat_dc_init(void) sd.huffType = CPA_DC_HT_FULL_DYNAMIC; sd.sessDirection = CPA_DC_DIR_COMBINED; sd.sessState = CPA_DC_STATELESS; +#if (CPA_DC_API_VERSION_NUM_MAJOR == 1 && CPA_DC_API_VERSION_NUM_MINOR < 6) sd.deflateWindowSize = 7; +#endif sd.checksum = CPA_DC_ADLER32; status = cpaDcGetSessionSize(dc_inst_handles[i], &sd, &sess_size, &ctx_size); diff --git a/sys/contrib/openzfs/module/zfs/zfs_vnops.c b/sys/contrib/openzfs/module/zfs/zfs_vnops.c index f8d13075d5c0..a64e1e2dc83d 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_vnops.c +++ b/sys/contrib/openzfs/module/zfs/zfs_vnops.c @@ -1172,9 +1172,20 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp, inblksz = inzp->z_blksz; /* - * We cannot clone into files with different block size. + * We cannot clone into files with different block size if we can't + * grow it (block size is already bigger or more than one block). */ - if (inblksz != outzp->z_blksz && outzp->z_size > inblksz) { + if (inblksz != outzp->z_blksz && (outzp->z_size > outzp->z_blksz || + outzp->z_size > inblksz)) { + error = SET_ERROR(EINVAL); + goto unlock; + } + + /* + * Block size must be power-of-2 if destination offset != 0. + * There can be no multiple blocks of non-power-of-2 size. + */ + if (outoff != 0 && !ISP2(inblksz)) { error = SET_ERROR(EINVAL); goto unlock; } @@ -1358,6 +1369,12 @@ unlock: *inoffp += done; *outoffp += done; *lenp = done; + } else { + /* + * If we made no progress, there must be a good reason. + * EOF is handled explicitly above, before the loop. + */ + ASSERT3S(error, !=, 0); } zfs_exit_two(inzfsvfs, outzfsvfs, FTAG); diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 29425d3368e0..122a7a3f032e 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1074,7 +1074,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g32949f256" +#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_ge96fbdba3" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1104,7 +1104,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g32949f256" +#define ZFS_META_RELEASE "FreeBSD_ge96fbdba3" /* Define the project version. */ #define ZFS_META_VERSION "2.2.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 71be2d813a0a..f29b7621500d 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.0-rc3-31-g32949f256" +#define ZFS_META_GITREV "zfs-2.2.0-rc4-1-ge96fbdba3" From nobody Mon Sep 11 21:43:18 2023 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 4Rl0ZZ3r5Mz4tDXr; Mon, 11 Sep 2023 21:43: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 4Rl0ZZ2t2cz3KtY; Mon, 11 Sep 2023 21:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468598; 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=h0JmOODnkYkDsvZDDhQkMWcA5qJkhdWo0QYD/YGX+yQ=; b=Ykxc00enIZI0573r7K1h0CkX06ShQSotrUSFE5ULtFbyvAVEZy3Wb573ZRWJgXLRZcp9Hr Rv53yATfooc92SmmvMWwi3dJUlSbqIXapKcnuThYdMjvR0JlKQ7IHIGRy87ZekKdPvjSXB 4BuZFC3HfrLB57WVtBcF/WDf49tojjDeUiuaSC8YIekYckIrA/jIwEwPjlCP+5oZQaL2GC WiheI4OhrJRIqFsspNgyCnBLKGGlJDslMy4UiulPQKDD+nzOlBdcKdNTmmkiuQWNLP6zfj igH4SXs80n0m5ijpOj69pdCAfmEhkNNINKM69BPsglVuPyxm8vMcRmc8GP/Csw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468598; a=rsa-sha256; cv=none; b=ZE6pm2stjBbuKoDVJdeWNz9aiEaAJeOlz76I4v/I/cMsZGmwE4HGCPKXuaLPplfIwEpBqc iJLZAK2K+Sw3+zh0kRngzvYZSGFtfz/JwRHJoQL3eh9b1zL5fEd+qEPh0dNclzgy7+sPG0 rWrpJw83fbdPEO7GxEgmVw8qA8GifI+YRPpLMHvZ0/LSzOZdZKfsIFFvvtSdzEoRfHdPcW vJMjnUP5IefV1KcU3xrfmr8imsw3BWfufzgofvVL200ubhy/Z3BWYL1OmoaKDMjfuRlFoY d+Ug2lM9NkPcHYK4Tj/bYhF8YFHPPXMve2LSN+01lU79LvJErin8p6BuW8Bhnw== 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=1694468598; 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=h0JmOODnkYkDsvZDDhQkMWcA5qJkhdWo0QYD/YGX+yQ=; b=BpEYpAHI/3JMDC2GIKG5T2J8n0y1Wpz2cDWwHB6HchK4m/etQGbjj0lcOhwMZYI0mmJmh3 3kTl5Ug4XFVUmpIja67qW1I++Oikkt57/NSB5pWgU8fMc9hRUmVp96w55HNv+AOK07Ccx0 4bywjmqjYt28HUB+f3T6I5lgzN/88Nl82fJLAxR3LZaeMTdED9/QXMkPmru2wWr4vKhbSL 2+j57T2saUcgZshcZl0bJdtl3VTah+cvB7Or59hSHhPMXXefemo5iY2dW+5XR2APjCOl2j iNB6bazK/3nfCywCwvxJ+KDbMZpf5rOItgIUc4OZYGhovqzisqt0CH1N7D8jWA== 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 4Rl0ZZ1wr1z158y; Mon, 11 Sep 2023 21: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 38BLhIVU071988; Mon, 11 Sep 2023 21: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 38BLhIYq071984; Mon, 11 Sep 2023 21:43:18 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:43:18 GMT Message-Id: <202309112143.38BLhIYq071984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d01bbdf4572b - stable/14 - uefi(8): Refer to a related manual page 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d01bbdf4572bd8e8e709f6c0020e7352f7727cff Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d01bbdf4572bd8e8e709f6c0020e7352f7727cff commit d01bbdf4572bd8e8e709f6c0020e7352f7727cff Author: Tom Hukins AuthorDate: 2023-08-31 09:21:40 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 21:42:03 +0000 uefi(8): Refer to a related manual page PR: 265834 Reviewed by: mhorne MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39577 (cherry picked from commit f49d6f583e9df2839b420f27c44edc5c1fa276c6) --- share/man/man8/uefi.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 9ee501047337..42642bb48260 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd August 31, 2023 .Dt UEFI 8 .Os .Sh NAME @@ -89,7 +89,7 @@ or .It .Pa loader.efi loads and boots the kernel, as described in -.Xr loader 8 . +.Xr loader.efi 8 . .El .Pp The @@ -116,6 +116,7 @@ Typical non-default kernel (optional) .Xr efidp 8 , .Xr efivar 8 , .Xr gpart 8 , +.Xr loader.efi 8 , .Xr uefisign 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in From nobody Mon Sep 11 21:45:06 2023 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 4Rl0cf5y1Dz4tFZ2; Mon, 11 Sep 2023 21:45: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 4Rl0cf5XJqz3Lqv; Mon, 11 Sep 2023 21:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468706; 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=YINupwjGsPmyuPXkXIjo8rEM2VDfXgOdQP+CtzLnSR0=; b=tY83prh/Ich2AimUO8Ug3LSNx/arTTJAghwAst9uuFN2/I63PHQ4yfCUhDAlL7FP7ZuTG/ +5pJr8dmML0WOAvvdfgDW+OpG7q6cLXGaQG1tDoAjTGRK2zu1tckAvr6UceoqJc+DyRBjn M/Zn526FpWfd3i78v6DKBM9fXl/2W3M/3iu7TkUHNdyxxhDaVCxFU1d5qB1qT+mouqmttm 9xtv1MZcZOlUjxh7i7jUsd9Owb5j3LQVjSjbm6iErqPG5Z3SbHyY3CcX7o2ld1qk8PL5xJ rPd0ywjJOZuzrNESRLqV6VHC2b4ivWVK5KVBhN1eb9WfSaj80NOZa+up09Ke6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468706; a=rsa-sha256; cv=none; b=gVWU/7iflqSVRZSUYHDkLY6uwTVHd1X2wBVT3WwhpQB7fqXt6hvPkg1ZaJzBCsrH2Dathr ZEhAIo0IJMhSUTe3cA8Wr5l/w9A/At8ZwT794IK+69hIaDbNWhBtcIomnzFRs7XDlvp2Mr ehosy1QISPZWu8W0oo4KhBazEaJdxtRoLzXNpk4kue8ZU1HUx4qBs9M5qHfzNNN7RLtp67 o+rSNYF3ZnFr41IWK57i5UfCZsCc+W6v0X2MJlehghv2kggchHLlAlHbKTU4XXUI+Zudpp fWE+uzUht3S8FlJ8HQQ6Z8R188V79b0jBE1NbWEaVYlBNJU6a0HPTV3TQ/+4XQ== 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=1694468706; 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=YINupwjGsPmyuPXkXIjo8rEM2VDfXgOdQP+CtzLnSR0=; b=DLJhMEoiyzjrykwaujw1JWKm7zg8A/NQZOXEOGytC8XPP/Tje/EN25DoeNOmGLxKFjuF/P k8LlFMyn5v1ek1LpaHYqvbk5YBHcvZamX1br/b6AfN5zYC9iF51uczdHSCGoyZOvX6d4hE /pHhZkuqLqE3UByGm1QgpRkFcyInulsL3KeSVC3qOPGu6iK5oxxEwaM+u4nhWFZoj/tdVf EZIJoGBJLNmhJUaIY5Adjn06uoldSyLP5yBaIeeYok4T5xJ+GrlGnN6cBOgW3m0/peFbFq nX/tjyGH5AW17wIbUuyKeqkaA/9klzE6IhA4wBpZkQlmtyn8kYCz30+XDF0Dag== 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 4Rl0cf4djNz15LX; Mon, 11 Sep 2023 21:45: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 38BLj6ct072368; Mon, 11 Sep 2023 21:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BLj67L072365; Mon, 11 Sep 2023 21:45:06 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:45:06 GMT Message-Id: <202309112145.38BLj67L072365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9c6710cd2453 - stable/13 - uefi(8): Refer to a related manual page 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c6710cd2453b84b115bbdc029de74876fcf6b2f Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9c6710cd2453b84b115bbdc029de74876fcf6b2f commit 9c6710cd2453b84b115bbdc029de74876fcf6b2f Author: Tom Hukins AuthorDate: 2023-08-31 09:21:40 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 21:44:24 +0000 uefi(8): Refer to a related manual page PR: 265834 Reviewed by: mhorne MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39577 (cherry picked from commit f49d6f583e9df2839b420f27c44edc5c1fa276c6) --- share/man/man8/uefi.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 898f2cd7234e..ee0263c89599 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd August 31, 2023 .Dt UEFI 8 .Os .Sh NAME @@ -89,7 +89,7 @@ or .It .Pa loader.efi loads and boots the kernel, as described in -.Xr loader 8 . +.Xr loader.efi 8 . .El .Pp The @@ -116,6 +116,7 @@ Typical non-default kernel (optional) .Xr efidp 8 , .Xr efivar 8 , .Xr gpart 8 , +.Xr loader.efi 8 , .Xr uefisign 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in From nobody Mon Sep 11 21:47:17 2023 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 4Rl0gB0Plfz4tGhM; Mon, 11 Sep 2023 21:47: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 4Rl0g972Grz3Mwx; Mon, 11 Sep 2023 21:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468838; 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=WoE62oHs+Z2Kvz4cOePNTi63EFED3Vn78P19ZBqf474=; b=DiW1LK0kMBnEsvSAMqEcqlDsLKhG9IjU7E4SDdZ9+G3jDnX+l6dwoaOeAQ/E6m6BA7Daa5 iqOp5VnhbhYRO+2gVnkgvMGx4vUkDhZb5Sgs2sVBwiB+RmbqqqsMQCu+dNhykRak+9CDic p5iMp2OFaRHEWC4/Kmzpr9NAoNDsZTtDzw1ZRG9ZoDdYH+DvMbtTrnp6hGrNa9VZ0ZchNw SGnxtqtfi7LNZrvEfHyVQ/iTj+tGJ6o1y2hW6z0uycgMbjhLkx8Hm2vXCm/tY7gSqfAq+n 7T2exAJ4/baFAO7lbtlbJW0NTDqrrwzPZYU8/GLY12Rh0AkJTs98Ls+FMdVnNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468838; a=rsa-sha256; cv=none; b=V45I948Mab4vA/5FxTHhlhr/o+BzPdO+6sw2/OAGW1NAr3D4+Ok5rsAO3tv2YX+AVjzFZd OVDExqGwElg29aR2u+y0UdX/HyTGsHn66HYr3NYMkdQYzkOif3RI7C7f7c/qqox5MG+TQQ 4i55Oz7c4ebgl0xBx8bYlP0SfdgVuYu32yvSPhlUOy3zS35TT/Ew47W7Ole19aaeDIg58p Q9uvOnWx+h65ny+oK4drFeu3EBFoR1t9iv/K6/nfMSFWF6nl/kAdA6k82Ei906uwOfNwG8 6WcImbCxCBkCk6hoUxuDGR/w/ZybkkJN0pD3JCIVzeajXo6Omiag+vG6bYYv4Q== 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=1694468838; 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=WoE62oHs+Z2Kvz4cOePNTi63EFED3Vn78P19ZBqf474=; b=GBQYWTGpNih9VTQaly7SqKO+rA28PpGASDuQEE/7kLNY/Vpw6C7tnq3luSIvTuFbrCU5z7 1y8jKuUWzfUWDlSrVwnql72zt82lgLf8gNryakJnQxrUPWLHENxLPyx93UIZOcU6tnzZFZ FjImG8oxMKv32vE/t9q9M0oZO6VWw79esM3ESqZHncY+Wdt05qatcX3l3kkXrA1ciSm+93 3msqTiEIBUpfXOEPiTuCFAtf02Z2hfBYzWOVnGwgJMhJ305ZyL5w+5m4l6BIv8KaScPN2x YIDQ5conbjcMlnIjHsYlRjXd7dFXNgk35vECr9EwWYeHFQ6hK9EFFA0bJ85SBQ== 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 4Rl0g95wtLz1593; Mon, 11 Sep 2023 21:47: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 38BLlHY3072804; Mon, 11 Sep 2023 21:47:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BLlHsF072801; Mon, 11 Sep 2023 21:47:17 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:47:17 GMT Message-Id: <202309112147.38BLlHsF072801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 2f269a3532b2 - stable/14 - Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f269a3532b279a215d527ef67949ff020476e8c Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2f269a3532b279a215d527ef67949ff020476e8c commit 2f269a3532b279a215d527ef67949ff020476e8c Author: Jessica Clarke AuthorDate: 2023-09-04 08:33:27 +0000 Commit: Jessica Clarke CommitDate: 2023-09-11 21:46:57 +0000 Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): [builtins][AArch64] Implement _sync out-of-line atomics Whilst Clang does not use these, recent GCC does, and so on systems such as FreeBSD that wish to use compiler-rt as the system runtime library but also wish to support building programs with GCC these interfaces are needed. This is a light adaptation of the code committed to GCC by Sebastian Pop , relicensed with permission for use in compiler-rt. Fixes https://github.com/llvm/llvm-project/issues/63483 Reviewed By: sebpop, MaskRay Differential Revision: https://reviews.llvm.org/D158536 Reviewed by: dim MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41716 (cherry picked from commit 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f) --- .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++++++++++++++++++++-- lib/libcompiler_rt/Makefile | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S index 5dc0d5320b5a..1fe18f4a4681 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S @@ -7,7 +7,7 @@ // Out-of-line LSE atomics helpers. Ported from libgcc library. // N = {1, 2, 4, 8} // M = {1, 2, 4, 8, 16} -// ORDER = {'relax', 'acq', 'rel', 'acq_rel'} +// ORDER = {'relax', 'acq', 'rel', 'acq_rel', 'sync'} // Routines implemented: // // iM __aarch64_casM_ORDER(iM expected, iM desired, iM *ptr) @@ -35,8 +35,8 @@ HIDDEN(___aarch64_have_lse_atomics) #endif // Generate mnemonics for -// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 -// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 +// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4,5 +// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4,5 #if SIZE == 1 #define S b @@ -64,24 +64,44 @@ HIDDEN(___aarch64_have_lse_atomics) #define L #define M 0x000000 #define N 0x000000 +#define BARRIER #elif MODEL == 2 #define SUFF _acq #define A a #define L #define M 0x400000 #define N 0x800000 +#define BARRIER #elif MODEL == 3 #define SUFF _rel #define A #define L l #define M 0x008000 #define N 0x400000 +#define BARRIER #elif MODEL == 4 #define SUFF _acq_rel #define A a #define L l #define M 0x408000 #define N 0xc00000 +#define BARRIER +#elif MODEL == 5 +#define SUFF _sync +#ifdef L_swp +// swp has _acq semantics. +#define A a +#define L +#define M 0x400000 +#define N 0x800000 +#else +// All other _sync functions have _seq semantics. +#define A a +#define L l +#define M 0x408000 +#define N 0xc00000 +#endif +#define BARRIER dmb ish #else #error #endif // MODEL @@ -96,7 +116,12 @@ HIDDEN(___aarch64_have_lse_atomics) #endif #define NAME(BASE) GLUE4(__aarch64_, BASE, SIZE, SUFF) +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXR GLUE3(ld, xr, S) +#else #define LDXR GLUE4(ld, A, xr, S) +#endif #define STXR GLUE4(st, L, xr, S) // Define temporary registers. @@ -136,9 +161,15 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXR w(tmp1), s(1), [x2] cbnz w(tmp1), 0b 1: + BARRIER ret #else +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXP GLUE2(ld, xp) +#else #define LDXP GLUE3(ld, A, xp) +#endif #define STXP GLUE3(st, L, xp) #ifdef HAS_ASM_LSE #define CASP GLUE3(casp, A, L) x0, x1, x2, x3, [x4] @@ -159,6 +190,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXP w(tmp2), x2, x3, [x4] cbnz w(tmp2), 0b 1: + BARRIER ret #endif END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) @@ -180,6 +212,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) LDXR s(0), [x1] STXR w(tmp1), s(tmp0), [x1] cbnz w(tmp1), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #endif // L_swp @@ -224,6 +257,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) OP s(tmp1), s(0), s(tmp0) STXR w(tmp2), s(tmp1), [x1] cbnz w(tmp2), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM)) #endif // L_ldadd L_ldclr L_ldeor L_ldset diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 1ba94bc5eec8..f894d68e6478 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -22,7 +22,7 @@ MK_WERROR.gcc= no .if ${MACHINE_CPUARCH} == "aarch64" . for pat in cas swp ldadd ldclr ldeor ldset . for size in 1 2 4 8 16 -. for model in 1 2 3 4 +. for model in 1 2 3 4 5 . if ${pat} == "cas" || ${size} != "16" # Use .for to define lse_name, to get a special loop-local variable . for lse_name in outline_atomic_${pat}${size}_${model}.S From nobody Mon Sep 11 21:47:40 2023 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 4Rl0gf5Kpyz4tH1L; Mon, 11 Sep 2023 21:47:42 +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 4Rl0gd3zRyz3NW0; Mon, 11 Sep 2023 21:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694468861; 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=4tGqhYeu3vj14P4fnUg4pY8HIeRLCQriz4jU4gkwik8=; b=vKDB0skD/3D0AjeaoYy6Mk8CFWZdxvp/ErEGCJ/ebE8dJSQ5HXw0g6I9azNbInMMyjyeKP DnI+IeWsY0MS0/Rog6S0hmNqBNjDR6yos+gW/zb66VkgaMspg0NsTf5ghfFNOBEGFQUPUd KF1c/aqIdvUvlJVHzhGdgtBoxGYMhJgvxGdlqPgUoZo1UEctxe8tNA6q+9oysNKtDVHSyz pRW3ClgQoKf0wlefkSJUmcm3y3iLViq98Y2mG89lydNyIzxmg1wL4wCnCf6ICNQvVo9pKX HhV58Fc1p2VS/OJkWJ7eB44FDedcLjl9VPiao7IO3IthTy/RZrowTvGltY8Qug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694468861; a=rsa-sha256; cv=none; b=OPyV4vCKEE5M/HHcGbMBha0SuKcXgqL/bVEfiehQN/7DFjbwFV0dI5II+DGlTyS+s3Ib9A z6YlRh3OiA7lWlApAFXgtN3qeyoecQJgTbUqe3+yifsxOCF7XGHalDTPQFJ3dxe5NIsYvu BMMBA+ogWHNdUBTyQctwscpCASnqrGyfwe3AOnjHxlVD0Mk94orGY0gsOy8XvjvRfS59M9 D59YBhFyNL5ClBQQV9ujb58lY5x3kcRx/doAkfFzICcSDMhxFq06XQKzrfk8TsSzIuT8nG qe3yzoK1DQtyKeefyBdQ/hzLw16qXGxRwzgGrJANdjVaRlYWsvM2IF1YucI3+Q== 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=1694468861; 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=4tGqhYeu3vj14P4fnUg4pY8HIeRLCQriz4jU4gkwik8=; b=Lwt6Fk8/DNo3vukBhkXWQC/CF+l3F7mJ/+rOEPQD4Fq6VYPJgH8jbrRe8jaJvHgMPPo8oX +QrukzDd/iZ4RN995hpDJZ+1o5bt6HPTKCKFnesOSZv3J0Xm/KfB5qT5LP/Dr94W+hZZm4 LlHgxAt3qsGVP9F+xwt0AHqq4ENRNrCb8td5LTsbqp+N6OQUuKCKfiIprSbYp83ZDPyxoP jI/U+uipgxecIfgT0Xjdfd26HmKLESD8GNzU9qZxPGpYnsc5yZi/CzLkLgI+iHvepaEmUN EdDiYZ6lD+InlLgWRR8QR8aM02aeIIxOA3kd03XmFu0Vv1rCl/9S5Q7gbU/1wg== 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 4Rl0gd162sz15cq; Mon, 11 Sep 2023 21:47: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 38BLlesq073055; Mon, 11 Sep 2023 21:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BLle0I073052; Mon, 11 Sep 2023 21:47:40 GMT (envelope-from git) Date: Mon, 11 Sep 2023 21:47:40 GMT Message-Id: <202309112147.38BLle0I073052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 7652c49af66d - stable/13 - Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7652c49af66de526522793b6614acde515f9e5af Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=7652c49af66de526522793b6614acde515f9e5af commit 7652c49af66de526522793b6614acde515f9e5af Author: Jessica Clarke AuthorDate: 2023-09-04 08:33:27 +0000 Commit: Jessica Clarke CommitDate: 2023-09-11 21:47:28 +0000 Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): [builtins][AArch64] Implement _sync out-of-line atomics Whilst Clang does not use these, recent GCC does, and so on systems such as FreeBSD that wish to use compiler-rt as the system runtime library but also wish to support building programs with GCC these interfaces are needed. This is a light adaptation of the code committed to GCC by Sebastian Pop , relicensed with permission for use in compiler-rt. Fixes https://github.com/llvm/llvm-project/issues/63483 Reviewed By: sebpop, MaskRay Differential Revision: https://reviews.llvm.org/D158536 Reviewed by: dim MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41716 (cherry picked from commit 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f) --- .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++++++++++++++++++++-- lib/libcompiler_rt/Makefile | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S index 5dc0d5320b5a..1fe18f4a4681 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S @@ -7,7 +7,7 @@ // Out-of-line LSE atomics helpers. Ported from libgcc library. // N = {1, 2, 4, 8} // M = {1, 2, 4, 8, 16} -// ORDER = {'relax', 'acq', 'rel', 'acq_rel'} +// ORDER = {'relax', 'acq', 'rel', 'acq_rel', 'sync'} // Routines implemented: // // iM __aarch64_casM_ORDER(iM expected, iM desired, iM *ptr) @@ -35,8 +35,8 @@ HIDDEN(___aarch64_have_lse_atomics) #endif // Generate mnemonics for -// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 -// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 +// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4,5 +// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4,5 #if SIZE == 1 #define S b @@ -64,24 +64,44 @@ HIDDEN(___aarch64_have_lse_atomics) #define L #define M 0x000000 #define N 0x000000 +#define BARRIER #elif MODEL == 2 #define SUFF _acq #define A a #define L #define M 0x400000 #define N 0x800000 +#define BARRIER #elif MODEL == 3 #define SUFF _rel #define A #define L l #define M 0x008000 #define N 0x400000 +#define BARRIER #elif MODEL == 4 #define SUFF _acq_rel #define A a #define L l #define M 0x408000 #define N 0xc00000 +#define BARRIER +#elif MODEL == 5 +#define SUFF _sync +#ifdef L_swp +// swp has _acq semantics. +#define A a +#define L +#define M 0x400000 +#define N 0x800000 +#else +// All other _sync functions have _seq semantics. +#define A a +#define L l +#define M 0x408000 +#define N 0xc00000 +#endif +#define BARRIER dmb ish #else #error #endif // MODEL @@ -96,7 +116,12 @@ HIDDEN(___aarch64_have_lse_atomics) #endif #define NAME(BASE) GLUE4(__aarch64_, BASE, SIZE, SUFF) +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXR GLUE3(ld, xr, S) +#else #define LDXR GLUE4(ld, A, xr, S) +#endif #define STXR GLUE4(st, L, xr, S) // Define temporary registers. @@ -136,9 +161,15 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXR w(tmp1), s(1), [x2] cbnz w(tmp1), 0b 1: + BARRIER ret #else +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXP GLUE2(ld, xp) +#else #define LDXP GLUE3(ld, A, xp) +#endif #define STXP GLUE3(st, L, xp) #ifdef HAS_ASM_LSE #define CASP GLUE3(casp, A, L) x0, x1, x2, x3, [x4] @@ -159,6 +190,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXP w(tmp2), x2, x3, [x4] cbnz w(tmp2), 0b 1: + BARRIER ret #endif END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) @@ -180,6 +212,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) LDXR s(0), [x1] STXR w(tmp1), s(tmp0), [x1] cbnz w(tmp1), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #endif // L_swp @@ -224,6 +257,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) OP s(tmp1), s(0), s(tmp0) STXR w(tmp2), s(tmp1), [x1] cbnz w(tmp2), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM)) #endif // L_ldadd L_ldclr L_ldeor L_ldset diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 1ba94bc5eec8..f894d68e6478 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -22,7 +22,7 @@ MK_WERROR.gcc= no .if ${MACHINE_CPUARCH} == "aarch64" . for pat in cas swp ldadd ldclr ldeor ldset . for size in 1 2 4 8 16 -. for model in 1 2 3 4 +. for model in 1 2 3 4 5 . if ${pat} == "cas" || ${size} != "16" # Use .for to define lse_name, to get a special loop-local variable . for lse_name in outline_atomic_${pat}${size}_${model}.S From nobody Mon Sep 11 22:01:59 2023 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 4Rl1073NRpz4tQQb; Mon, 11 Sep 2023 22:01: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 4Rl1072rwCz3S9y; Mon, 11 Sep 2023 22:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469719; 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=Hrv5BABoNGo6M+csIy4UL/6qjf3Zt/yZthYyk+SoK44=; b=YTM/X/ZCmc0xHpXUtYRe+/0vieJelBck5TqQ2IN6qBSlMb0ttgXdyvZFEPMSdzw6U0XSgi EDopQPGqdmy1DcmWVZw/77oB1K0rJsaqqJtgQ8v8HHwCPRHA6b/GFUxUz+OtFyVhEi+iuN toqz4McM6wNeM6wFJ3ce/h0AGeQ/aIz5BwU5cQ5+WJr9cp8PJ3poYWW8J+ryDVkyagYF0h OSbcuW5xVTZ1JvG0elI6DpauSdpZL+8xIalj3r8wsX9C2pwrjDvKhGY16MH+oHDGH0d/E2 gRYUdRW6dZUCbxQDq7zaNA3Hx4mwVKcHSWO9IfdwDfMlcSTxSeT4KFpMeMkkMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469719; a=rsa-sha256; cv=none; b=DPE8s+qVj7DaVIQOUalZ2sVJyUTuZXZNSQ6Gi7Oi9AvjEm8B5BmLQacfkWQWa9q4Lq/DtD Yy/sBJYpqA9HmanbgYCBlzNqgHn3RgapLLPPdxp2yzVSuI7Nf453ZUvcJEiKI/tZHMtnAz p1ptK/DHNmLiMTf9aWujd7/crwyLNjtnQpB0WRdcvJVIRiHV4EGj4LFoBDddXMHWSfcA9v iLNGn8bM4IYVo9LU8WW369BkC5AfV7vgqwhONUD++kHCoQv3CglPzKqSyx/SWaQ5XRY3p3 EcQovZH3NYhTQZtuRC/j89SpMqqt8DNQ3kFaKyM5HJvJczXpeBQ1HGPoFrLj5g== 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=1694469719; 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=Hrv5BABoNGo6M+csIy4UL/6qjf3Zt/yZthYyk+SoK44=; b=WPSgIuD+fVg8EMzEZF9jk6BnrqaOQf4FCiFiKujBb6mWVmDm5ibUTI5doMVtHyneerfAmn qKelrcAxYyQQVJiHiYireuatjhTQeSTLBAReOZa/gY190t9yzLCxSCt7gu71MH+/kyBh59 CIcYtwFI/ysTqDnprsg5WPcaWdDOBd13yurcU2qMvrlh9PqGfo6IwCiVkCgzkV8a6joxqa JjCnTgiYs/D6XjpbP0JRCW5cqp8mFyxpwCkafu2z/N7bP6KSuEhy+VoIfOXnYP6WFp9fQf eMf/nfg1kiWS6VwE+51plR59x8iAGi7SxEdmpY3BFYYtcCdytQPZsruGh90Gvw== 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 4Rl1071ypkz15fS; Mon, 11 Sep 2023 22:01: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 38BM1xxe005024; Mon, 11 Sep 2023 22:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM1xWU005021; Mon, 11 Sep 2023 22:01:59 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:01:59 GMT Message-Id: <202309112201.38BM1xWU005021@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: 6b2f0a3c31db - stable/14 - stand: lua: module names should permit more 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: 6b2f0a3c31dbf9268b49d64c859da136ca8dc201 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2f0a3c31dbf9268b49d64c859da136ca8dc201 commit 6b2f0a3c31dbf9268b49d64c859da136ca8dc201 Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:01:52 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3f8fbc52cb40..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -61,7 +61,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)" From nobody Mon Sep 11 22:02:52 2023 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 4Rl11830K7z4tQbf; Mon, 11 Sep 2023 22:02:52 +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 4Rl1182Yq2z3T01; Mon, 11 Sep 2023 22:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469772; 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=QjwOQdepOeJgFWCsDdAgmFWlLz11GVEdMENWGGRYNGA=; b=pCNeYcj7TQPREA/nE7POwGoPI80RY+KXQlWntOjbHiEVU8LTakRO7gpwS1NacLzW9LQ+4a TdpiKkf7Uz2ECniUCaxA7B9gIeE/wqvutp6/HEyb5umjd1mSflLhPJ2u0dJuHOuhdHOtie e0OXukcTumut+Ul6KfwatwIZCtrdLmWeOuA8OGWcvtz0j0+qN5FqhdS/zSuTrOoSOA0Ij8 49xj+fzEFa5v+3vxhqjSMLSOolcBjxtg82nbnl6saK9igEb9jc7f2V9bUm9WzF+PQtsGCz G/08F7j/EB+5leCfa21jVuykUgf5MRdJtBZ85YkgNYm6NNZ9fDHlAO79khwcLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469772; a=rsa-sha256; cv=none; b=Acaq3J3GChyV+EKfpLuECV9//6M1/EEYNsyKCBLTuakb1WxYranZ95fUODCiUzuB01g6zs a6+G9fPGiTg4jAa9Cxp/FCqQKr5UOmIOtSKxG8iwzRoFE5x7xk+ac9xpUo7MO4nzl43BiF U0Aq5gJhRHT3jOP+DR/7bzr/Yftw561TTLg2AQpIsrxlTGvA3GWGiMSCgbxh+FVltAAJx9 PkueeolosCD56DqxQRgK6oUcRQPUL82OyN6r6i9MsdkQ4YlUpd51kiFkOtdnTB9GGcwv4b W1UptqySBF8rhJ9eHKruqht1L8s7Uzpnep6Qx08gOV1t55VDbSuEYUXehf6Jpw== 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=1694469772; 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=QjwOQdepOeJgFWCsDdAgmFWlLz11GVEdMENWGGRYNGA=; b=Dgc9U8TMunsWkzejwlCNJPlTkrCL2u6NYE79cQeBx2s4OOovoFKZ/WbIy1Pp7a1HuXy1RT 0wIR6O6mWhcvXjAkbAX4y5ujaGNpUcDsccMZVgFdrXwE1RohNuNBhjgqDg4ctfkLizESHI t/qBQboe6imK0GaibXhmXxrOX/wLugK28Ewpdz6NjLqwirsOh74aQhC9EFgBLCCc6kc7H6 1Z0IYbYNll+/M4GbtQZ5TK7JjIREtptI3oiMf98eHuFUzF320+qV243a0j5mIOD67Yo3ng U4SpGprd+nUgvS8aRR+78hqjrVjOfUBNGW6m2O6C3rSqULyF7OFkAVTp6HhUnQ== 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 4Rl1181dtrz15fj; Mon, 11 Sep 2023 22:02: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 38BM2qXi006163; Mon, 11 Sep 2023 22:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2q1x006160; Mon, 11 Sep 2023 22:02:52 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:52 GMT Message-Id: <202309112202.38BM2q1x006160@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: 3dbc67da504c - stable/13 - caroot: drop VERSION tags from certs 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: 3dbc67da504cf318a3f1928aac77d6d2be35001b Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3dbc67da504cf318a3f1928aac77d6d2be35001b commit 3dbc67da504cf318a3f1928aac77d6d2be35001b Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:37 +0000 caroot: drop VERSION tags from certs With this change, we'll drop the "with $FreeBSD$" lines from trusted/ certs in the next update. untrusted/ will need to be done manually, but I'll likely just do them all manually, commit, then run the script and commit any legitimate updates after confirming the output matches what I did manually. Reported by: imp Reviewed by: imp (cherry picked from commit bbc8585ef557be36b3fda75e3a41d725aedb1c1e) --- secure/caroot/MAca-bundle.pl | 3 --- 1 file changed, 3 deletions(-) diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/MAca-bundle.pl index 8521b620337f..4feced90d782 100755 --- a/secure/caroot/MAca-bundle.pl +++ b/secure/caroot/MAca-bundle.pl @@ -38,7 +38,6 @@ use Carp; use MIME::Base64; use Getopt::Long; -my $VERSION = '$FreeBSD$'; my $generated = '@' . 'generated'; my $inputfh = *STDIN; my $debug = 0; @@ -79,7 +78,6 @@ sub print_header($$) ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## @@ -96,7 +94,6 @@ EOFH ## It contains certificates trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## From nobody Mon Sep 11 22:02:53 2023 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 4Rl1193twNz4tQkv; Mon, 11 Sep 2023 22:02: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 4Rl1193dVtz3SjP; Mon, 11 Sep 2023 22:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469773; 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=XSMRFliMfRv+4JA0WoMjAxiR3YSbDUAmevyuD9YdPxI=; b=cWD2mWLl4LP+0gQ0+jzKoJK7hglBFC9lrrHnxkZwq/ytyh0YeJEOArOqBIS+DTInQNFUpI W6+UgPt5nPcItEFrxogrRWvRtBSXAcJNJI8Zt1Pf/Z73txI0qKSBdE1HgzgzLpBjM9hW0R c4woiSGkpg6T48DVfAoSHEpQAMbHDpG3WnCQ/KVW1Uidx1VQhRQbR381pIOzPDNExPx4BI M2H42QZOnQN7lQ05h1HGqDt1sBWhwzhZu4BDk/T2mldIbS+dYqlxjVhl9naAvycm0iV0/i LegUIdWQuZks7enNLS1zy3sdcmZGtBSv/N9KtECFhoiDG7FAu7VokjBLGMySiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469773; a=rsa-sha256; cv=none; b=maJKNma6/gB8tRsYedJbg+r6CtcP1pYyZ3rKIg8YjBQ9gHog4SIeurhaPLgb1q6k09jN/l 0C/Up2+rDRMegxUpyrIFeGBSxQnfbQUVg5VzzEZW65/2JhS4w4SzI2x/OtJG5x6uWH1eVO dl6fvkuH2sjOegofB+GH8eZZH0Ewl9T+fxZGmYQVXNNQ60MHFpZyKXMNOxwje+8qngAvYK WrIzXoAVABCedXp2JJqyayUXAo/4i3mCFdVeKPEm2FMq7xXmgijqy19SNKyPF8BuHqko2N ZAiNCJy82DGdndQEjGQ6cbBDELD8b+6MtEgpDyYO+MIc9db9jNaZpbJsWClVXg== 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=1694469773; 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=XSMRFliMfRv+4JA0WoMjAxiR3YSbDUAmevyuD9YdPxI=; b=uph7EOaDKFBfwAvd0HAgwYzTMm5WMJRKEv0f/+U7e3rJ6iwTFYkkPwjXJLyoWkItMqJuOV rT0aqHcYt/+SjSZy3uUps+jzu4Q2JLsbJx6nhHxKjg7ijFCjI/4tFQRQawFb4v/VUjXXHB cLR4ZtF5A7X1+/4qyhHIJWLDfFZzF+uPHOA6LwamvyXOw9PUtqAdUlShQezi9dQ/yWMxzK 7MZdelQ4+WXmwK3EYXLuL7/6/II4m7rMsAB3i/VvlTvxHgwbadvsbeWFaLwVVF/WZiIpSQ eNjdJgcmN4+OakSfV2lEO37ZsBh7b4EmFm8bHstIDJqBFkqOVpAZZZJDJ5ljQQ== 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 4Rl1192dVwz15fk; Mon, 11 Sep 2023 22:02:53 +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 38BM2rD6006218; Mon, 11 Sep 2023 22:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2rrm006215; Mon, 11 Sep 2023 22:02:53 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:53 GMT Message-Id: <202309112202.38BM2rrm006215@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: 3ff148ad9274 - stable/13 - caroot: drop the VERSION tag from already-processed certs 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: 3ff148ad9274a0433ac63582cbe50138517d8744 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff148ad9274a0433ac63582cbe50138517d8744 commit 3ff148ad9274a0433ac63582cbe50138517d8744 Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:37 +0000 caroot: drop the VERSION tag from already-processed certs An update is imminent; drop these now to make it easier to audit the results. (cherry picked from commit 3f84d4b0fe1445bca5f3b6a70fc5641b88c31217) --- secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem | 1 - secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem | 1 - secure/caroot/blacklisted/Certum_Root_CA.pem | 1 - secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem | 1 - secure/caroot/blacklisted/Cybertrust_Global_Root.pem | 1 - secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem | 1 - secure/caroot/blacklisted/DST_Root_CA_X3.pem | 1 - secure/caroot/blacklisted/EC-ACC.pem | 1 - .../caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem | 1 - secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem | 1 - secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem | 1 - secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem | 1 - secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem | 1 - secure/caroot/blacklisted/QuoVadis_Root_CA.pem | 1 - secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem | 1 - secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem | 1 - secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem | 1 - secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem | 1 - .../Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem | 1 - .../Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem | 1 - secure/caroot/blacklisted/TrustCor_ECA-1.pem | 1 - secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem | 1 - secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem | 1 - secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem | 1 - .../blacklisted/VeriSign_Universal_Root_Certification_Authority.pem | 1 - .../Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem | 1 - .../Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem | 1 - secure/caroot/trusted/ACCVRAIZ1.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 1 - secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem | 1 - secure/caroot/trusted/Actalis_Authentication_Root_CA.pem | 1 - secure/caroot/trusted/AffirmTrust_Commercial.pem | 1 - secure/caroot/trusted/AffirmTrust_Networking.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_1.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_2.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_3.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_4.pem | 1 - secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 1 - .../Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 1 - secure/caroot/trusted/Baltimore_CyberTrust_Root.pem | 1 - secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 1 - secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 1 - secure/caroot/trusted/CA_Disig_Root_R2.pem | 1 - secure/caroot/trusted/CFCA_EV_ROOT.pem | 1 - secure/caroot/trusted/COMODO_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/Certainly_Root_E1.pem | 1 - secure/caroot/trusted/Certainly_Root_R1.pem | 1 - secure/caroot/trusted/Certigna.pem | 1 - secure/caroot/trusted/Certigna_Root_CA.pem | 1 - secure/caroot/trusted/Certum_EC-384_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem | 1 - secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 1 - secure/caroot/trusted/Comodo_AAA_Services_root.pem | 1 - secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 1 - secure/caroot/trusted/E-Tugra_Certification_Authority.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem | 1 - secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem | 1 - secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 1 - secure/caroot/trusted/GLOBALTRUST_2020.pem | 1 - secure/caroot/trusted/GTS_Root_R1.pem | 1 - secure/caroot/trusted/GTS_Root_R2.pem | 1 - secure/caroot/trusted/GTS_Root_R3.pem | 1 - secure/caroot/trusted/GTS_Root_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 1 - secure/caroot/trusted/GlobalSign_Root_E46.pem | 1 - secure/caroot/trusted/GlobalSign_Root_R46.pem | 1 - secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 1 - secure/caroot/trusted/Go_Daddy_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 1 - secure/caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_ECC_RootCA_2015.pem | 1 - .../trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2015.pem | 1 - secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 1 - secure/caroot/trusted/ISRG_Root_X1.pem | 1 - secure/caroot/trusted/ISRG_Root_X2.pem | 1 - secure/caroot/trusted/IdenTrust_Commercial_Root_CA_1.pem | 1 - secure/caroot/trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 1 - secure/caroot/trusted/Izenpe_com.pem | 1 - secure/caroot/trusted/Microsec_e-Szigno_Root_CA_2009.pem | 1 - secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/NAVER_Global_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/NetLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_RSA_R2.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_RSA.pem | 1 - secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 1 - secure/caroot/trusted/SecureSign_RootCA11.pem | 1 - secure/caroot/trusted/SecureTrust_CA.pem | 1 - secure/caroot/trusted/Secure_Global_CA.pem | 1 - secure/caroot/trusted/Security_Communication_ECC_RootCA1.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA2.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA3.pem | 1 - secure/caroot/trusted/Security_Communication_Root_CA.pem | 1 - secure/caroot/trusted/Starfield_Class_2_CA.pem | 1 - secure/caroot/trusted/Starfield_Root_Certificate_Authority_-_G2.pem | 1 - .../trusted/Starfield_Services_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_3.pem | 1 - secure/caroot/trusted/TUBITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 1 - secure/caroot/trusted/TWCA_Global_Root_CA.pem | 1 - secure/caroot/trusted/TWCA_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 1 - secure/caroot/trusted/Telia_Root_CA_v2.pem | 1 - secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem | 1 - secure/caroot/trusted/TunTrust_Root_CA.pem | 1 - secure/caroot/trusted/UCA_Extended_Validation_Root.pem | 1 - secure/caroot/trusted/UCA_Global_G2_Root.pem | 1 - secure/caroot/trusted/USERTrust_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/USERTrust_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/XRamp_Global_CA_Root.pem | 1 - secure/caroot/trusted/certSIGN_ROOT_CA.pem | 1 - secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 1 - secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 1 - secure/caroot/trusted/ePKI_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 1 - secure/caroot/trusted/vTrus_Root_CA.pem | 1 - 166 files changed, 166 deletions(-) diff --git a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem index cf7de6cc122b..f708097b5023 100644 --- a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem index b1fa96bc405e..1ba719b3690a 100644 --- a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Certum_Root_CA.pem b/secure/caroot/blacklisted/Certum_Root_CA.pem index f815c49ddae0..c94db94aecaa 100644 --- a/secure/caroot/blacklisted/Certum_Root_CA.pem +++ b/secure/caroot/blacklisted/Certum_Root_CA.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem index 1e3864180a66..0133aff5f03f 100644 --- a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem +++ b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem index b780a314ccd1..0a1c5a632dce 100644 --- a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem +++ b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem index debf7b30c2ef..0de1a5b43dce 100644 --- a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem +++ b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/DST_Root_CA_X3.pem b/secure/caroot/blacklisted/DST_Root_CA_X3.pem index 8cb0d1c990db..e9574b162807 100644 --- a/secure/caroot/blacklisted/DST_Root_CA_X3.pem +++ b/secure/caroot/blacklisted/DST_Root_CA_X3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/EC-ACC.pem b/secure/caroot/blacklisted/EC-ACC.pem index a4b43b39414b..bb354b09137a 100644 --- a/secure/caroot/blacklisted/EC-ACC.pem +++ b/secure/caroot/blacklisted/EC-ACC.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem b/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem index b03758a63c98..ac41a1521a7a 100644 --- a/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem +++ b/secure/caroot/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem b/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem index c9b9c9282c19..b44e2fa5eca3 100644 --- a/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem +++ b/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem b/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem index cd9bebaf8c0f..d46ed10b3dec 100644 --- a/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem +++ b/secure/caroot/blacklisted/Global_Chambersign_Root_-_2008.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem b/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem index 827d7b869e60..52f8b75fdc3b 100644 --- a/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem +++ b/secure/caroot/blacklisted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem b/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem index 7ab99c211f49..9758150ed3ee 100644 --- a/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem +++ b/secure/caroot/blacklisted/Network_Solutions_Certificate_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem b/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem index 08ea553a9e80..a2b6cf37436b 100644 --- a/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem +++ b/secure/caroot/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/QuoVadis_Root_CA.pem b/secure/caroot/blacklisted/QuoVadis_Root_CA.pem index 25e6300f5231..6fab6f44448a 100644 --- a/secure/caroot/blacklisted/QuoVadis_Root_CA.pem +++ b/secure/caroot/blacklisted/QuoVadis_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem b/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem index b23c237e319f..67ae4c366eb6 100644 --- a/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem +++ b/secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem b/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem index 701ca2161990..adac12a0b9ac 100644 --- a/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem +++ b/secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem b/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem index 14a79c4c3e24..f1c93f823fcc 100644 --- a/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem +++ b/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem b/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem index f4678f629684..34ecf8b7a6af 100644 --- a/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem +++ b/secure/caroot/blacklisted/SwissSign_Platinum_CA_-_G2.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem index 019c97a13d34..80c89f49a928 100644 --- a/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem +++ b/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem index df9468c1249e..66262ee01796 100644 --- a/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem +++ b/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/TrustCor_ECA-1.pem b/secure/caroot/blacklisted/TrustCor_ECA-1.pem index 3a250cc86edd..66538e08dcc3 100644 --- a/secure/caroot/blacklisted/TrustCor_ECA-1.pem +++ b/secure/caroot/blacklisted/TrustCor_ECA-1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem b/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem index 883336da67ba..a45119f243a3 100644 --- a/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem +++ b/secure/caroot/blacklisted/TrustCor_RootCert_CA-1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem b/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem index 0335e3418491..7a99eb6df173 100644 --- a/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem +++ b/secure/caroot/blacklisted/TrustCor_RootCert_CA-2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem b/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem index 476ba64dfd63..693b9dceffdd 100644 --- a/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem +++ b/secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem b/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem index 353f709ad531..dfad2a5dcbd8 100644 --- a/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem +++ b/secure/caroot/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem index d060de75b329..b20bfacf4566 100644 --- a/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem +++ b/secure/caroot/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem index 89400caf7eb6..43f963a0ac6b 100644 --- a/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem +++ b/secure/caroot/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem @@ -6,7 +6,6 @@ ## root CA list (the file `certdata.txt' in security/nss). ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/ACCVRAIZ1.pem b/secure/caroot/trusted/ACCVRAIZ1.pem index 1c96e53b8f17..dbe720481fe4 100644 --- a/secure/caroot/trusted/ACCVRAIZ1.pem +++ b/secure/caroot/trusted/ACCVRAIZ1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem index 6a64be5ce138..22f5764a5d3f 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem index 71ee49574e84..bbd47304c5c9 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem index 6114a5ccdb2d..4369ffbf1b30 100644 --- a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem +++ b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem index 7c971e1229a2..8ea77deeda58 100644 --- a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem +++ b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem index 282d1a5dcf6f..b1031ad0f348 100644 --- a/secure/caroot/trusted/AffirmTrust_Commercial.pem +++ b/secure/caroot/trusted/AffirmTrust_Commercial.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem index 830cf3f0c3c2..1d6a82f767f7 100644 --- a/secure/caroot/trusted/AffirmTrust_Networking.pem +++ b/secure/caroot/trusted/AffirmTrust_Networking.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem index 725747aafdaf..ef4c3286bf1c 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem index 6fe75939863e..1a1b7b14e7be 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_1.pem b/secure/caroot/trusted/Amazon_Root_CA_1.pem index 2aca2eee3e9b..996e32e056e9 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_1.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_2.pem b/secure/caroot/trusted/Amazon_Root_CA_2.pem index 95ca81db30bb..fbcb6a47f445 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_2.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_3.pem b/secure/caroot/trusted/Amazon_Root_CA_3.pem index 294f7dc8f0b6..1e45a816b669 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_3.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_4.pem b/secure/caroot/trusted/Amazon_Root_CA_4.pem index 649917b9638a..889f1dc33d52 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_4.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem index 7058d3fb6edf..b65333ef383d 100644 --- a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem +++ b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem index db4f44195dbd..12342b79afc9 100644 --- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem +++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem index 889f140decc8..5023b4465d21 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem index da44a530a038..e2b2579a9cdf 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem index 0f356d59962f..d253c062d876 100644 --- a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem +++ b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem index 0168f641fd42..c94745194a1f 100644 --- a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem index 7ae24799e638..b86299675116 100644 --- a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CA_Disig_Root_R2.pem b/secure/caroot/trusted/CA_Disig_Root_R2.pem index 0dda6d97e2aa..aa2b13653811 100644 --- a/secure/caroot/trusted/CA_Disig_Root_R2.pem +++ b/secure/caroot/trusted/CA_Disig_Root_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CFCA_EV_ROOT.pem b/secure/caroot/trusted/CFCA_EV_ROOT.pem index 722499b9ed42..01bb0463a686 100644 --- a/secure/caroot/trusted/CFCA_EV_ROOT.pem +++ b/secure/caroot/trusted/CFCA_EV_ROOT.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_Certification_Authority.pem b/secure/caroot/trusted/COMODO_Certification_Authority.pem index fc3e4b554cc3..57fb36edd969 100644 --- a/secure/caroot/trusted/COMODO_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem index 5f839a858d00..792e7744bda1 100644 --- a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem index 7faefe98b8bf..c467be08adde 100644 --- a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_E1.pem b/secure/caroot/trusted/Certainly_Root_E1.pem index 0750f7128ae6..286022c90cfd 100644 --- a/secure/caroot/trusted/Certainly_Root_E1.pem +++ b/secure/caroot/trusted/Certainly_Root_E1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_R1.pem b/secure/caroot/trusted/Certainly_Root_R1.pem index a4e6f28e33a6..c94f1f4f5e04 100644 --- a/secure/caroot/trusted/Certainly_Root_R1.pem +++ b/secure/caroot/trusted/Certainly_Root_R1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna.pem b/secure/caroot/trusted/Certigna.pem index e9104ef6c3da..87ed4d66d4eb 100644 --- a/secure/caroot/trusted/Certigna.pem +++ b/secure/caroot/trusted/Certigna.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna_Root_CA.pem b/secure/caroot/trusted/Certigna_Root_CA.pem index a0a7248b51ea..e7f9fd8ea2b5 100644 --- a/secure/caroot/trusted/Certigna_Root_CA.pem +++ b/secure/caroot/trusted/Certigna_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_EC-384_CA.pem b/secure/caroot/trusted/Certum_EC-384_CA.pem index 67b5d644f809..46ea4ccb4f32 100644 --- a/secure/caroot/trusted/Certum_EC-384_CA.pem +++ b/secure/caroot/trusted/Certum_EC-384_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem index 5f92008a47ab..e0141e43298e 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem index 8dcc08c17b07..57c438e0ff71 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem index d6034eb6e081..86f0fcc8cc03 100644 --- a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Comodo_AAA_Services_root.pem b/secure/caroot/trusted/Comodo_AAA_Services_root.pem index b74de8633a65..2de8ec9b993a 100644 --- a/secure/caroot/trusted/Comodo_AAA_Services_root.pem +++ b/secure/caroot/trusted/Comodo_AAA_Services_root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem index 758d61032898..56b6765b9b3e 100644 --- a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem index 76991855eaa1..9de2c038f456 100644 --- a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem index 5d2077a83e4c..0aa7731fe9f2 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem index d70caff62777..85d054b99954 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem index 517dab4f837a..b81c4744a9a6 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ *** 1191 LINES SKIPPED *** From nobody Mon Sep 11 22:02:54 2023 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 4Rl11C0WHBz4tQj1; Mon, 11 Sep 2023 22:02: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 4Rl11B5LHhz3T0p; Mon, 11 Sep 2023 22:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469774; 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=vA5uXW0jmSqycu9WU0aEsqY65MvjpwLXqhdoJnUbvtA=; b=M4XukfE5nxVZwVZdScs4FFJ0irnge1agZwCdNeJb8i9P/wSXoBxpQJ+gh5p2asUrl7kIsf DZQANrd3zwCbuwSSz48L9pON0skZPPVFYnrHa88d7Jr/Y3xAY3//yWT91xKVdCrp1JsnLt RM+F/gR5xSDWijH/tZxIE7MbYW4tS18PGMJGAwNWKBJ2SB/j6Yl0KDUb0vayugf4ZK8Ey3 LBJrcTji2dLQm6JueYVOjxS1E8a5oH4ZQ/QOWxNIi3j2poQvE5zcNnS43hac9Fl63lnMlv KOeCCX5DMRHYmPqBhNc8XWqd50Wb4/gnfX9/8YpMdMy+hzHGt5tn4NSvhVt4NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469774; a=rsa-sha256; cv=none; b=ckuHLCm69LLok3VlKgndN9Ef2yhzZ9FBEVKf0nXgFQSriFqCcoeEDzktZ0xV3XZAnizovL gOi/DjwDfIdqN8J6vZYtlMVMdpBokcbqDvH9PakrM6vkpqgQ2VaLSIXUAMoS89S7P8iSPZ 1FaFpObAJJKP60YUiRYqwxOU8uDXFAklkjE6NI2JkQ+PNhpb4rBFh3qn17kFFYtPo/rPSq R9vxavUpCxDA5INBYZSful+9jihVupeZRWpEx/ccIAHiKoHyIMvQnILsOXoJ4xDpBUxovt GkSXzB2OEbkRaN0GnhgmnZKdfzJ0UN/zPNdNFlDZJrS35sVFeEbfUPlO2MA99w== 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=1694469774; 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=vA5uXW0jmSqycu9WU0aEsqY65MvjpwLXqhdoJnUbvtA=; b=WACDdeCZYSR4wfXrz0VhWWLKE+gbP2TNhokJNkZqB4kPsDDQcLmcbKBWQEBNZSLUkqw8dL eTjIFOBT2O1FTzN1bmy1HWzki/BxihzMFSovOEEum47tpq0CW0lj8kAwtRMnzBUQf6MhIz LSdhk1TM83FGCtAbqKdoj28Lf+OQLpdfKOMTmtXLEFZnSW4c9IBksPlu/+40A1y+NUns1Z zD9Xw7DV2JIgzkhnAgUa6JSSmmzkucr14wWAZ2Xzx/7JBcPeuzvEzfKeVUrJCKCnWun6lG SkSJyAxb9mw98x+lil7zCYRcjaZmkVhRDdbDuJAW6wm8/OwzzarUyUKnyt8AfA== 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 4Rl11B4NQmz15cJ; Mon, 11 Sep 2023 22:02:54 +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 38BM2sOl006279; Mon, 11 Sep 2023 22:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2skI006276; Mon, 11 Sep 2023 22:02:54 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:54 GMT Message-Id: <202309112202.38BM2skI006276@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: 25f07248916f - stable/13 - caroot: update the root bundle and regenerate with OpenSSL 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 25f07248916f0108bd62b3deb58e21bff880b391 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=25f07248916f0108bd62b3deb58e21bff880b391 commit 25f07248916f0108bd62b3deb58e21bff880b391 Author: Kyle Evans AuthorDate: 2023-08-26 01:01:47 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:37 +0000 caroot: update the root bundle and regenerate with OpenSSL 3 Summary: - Six (6) new roots - Four (4) distrusted roots Note that this was intentionally generated with OpenSSL 1.1.1 to avoid mixing updates and non-functional changes -- there will be some churn with OpenSSL 3. The next commit will update the current batch of trusted certs with the format OpenSSL 3 produces, which I've tested against OpenSSL 1.1.1 to be sure that that doesn't hurt us in older branches. This MFC also regenerates all of the trusted certs with OpenSSL 3 to reduce the diff of future ENs -- this update has no existing certs modified, so it's the perfect time. (cherry picked from commit 65fd80909e196c8be2ce5e948775e9cbda2ef069) (cherry picked from commit 8ed0ecf8024d10e9cd21f5880723a6cec4fd4ae6) --- ObsoleteFiles.inc | 6 + .../caroot/blacklisted/AddTrust_External_Root.pem | 34 ++--- .../AddTrust_Low-Value_Services_Root.pem | 34 ++--- .../Camerfirma_Chambers_of_Commerce_Root.pem | 36 +++--- .../Camerfirma_Global_Chambersign_Root.pem | 36 +++--- secure/caroot/blacklisted/Certum_Root_CA.pem | 33 ++--- .../Chambers_of_Commerce_Root_-_2008.pem | 65 +++++----- .../caroot/blacklisted/Cybertrust_Global_Root.pem | 38 +++--- .../caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem | 36 +++--- secure/caroot/blacklisted/DST_Root_CA_X3.pem | 33 ++--- .../E-Tugra_Certification_Authority.pem | 64 +++++----- .../E-Tugra_Global_Root_CA_ECC_v3.pem | 16 +-- .../E-Tugra_Global_Root_CA_RSA_v3.pem | 64 +++++----- secure/caroot/blacklisted/EC-ACC.pem | 34 ++--- .../EE_Certification_Centre_Root_CA.pem | 33 ++--- secure/caroot/blacklisted/GeoTrust_Global_CA.pem | 36 +++--- .../GeoTrust_Primary_Certification_Authority.pem | 33 ++--- ...oTrust_Primary_Certification_Authority_-_G2.pem | 13 +- ...oTrust_Primary_Certification_Authority_-_G3.pem | 33 ++--- .../caroot/blacklisted/GeoTrust_Universal_CA.pem | 64 +++++----- .../caroot/blacklisted/GeoTrust_Universal_CA_2.pem | 64 +++++----- .../caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem | 38 +++--- .../blacklisted/Global_Chambersign_Root_-_2008.pem | 65 +++++----- ...demic_and_Research_Institutions_RootCA_2011.pem | 34 ++--- .../Hongkong_Post_Root_CA_1.pem | 33 ++--- .../caroot/blacklisted/LuxTrust_Global_Root_2.pem | 65 +++++----- .../Network_Solutions_Certificate_Authority.pem | 35 +++--- .../OISTE_WISeKey_Global_Root_GA_CA.pem | 33 ++--- secure/caroot/blacklisted/QuoVadis_Root_CA.pem | 36 +++--- .../caroot/blacklisted/Sonera_Class_2_Root_CA.pem | 33 ++--- .../Staat_der_Nederlanden_EV_Root_CA.pem | 61 ++++----- .../Staat_der_Nederlanden_Root_CA_-_G2.pem | 62 +++++----- .../Staat_der_Nederlanden_Root_CA_-_G3.pem | 61 ++++----- .../blacklisted/SwissSign_Platinum_CA_-_G2.pem | 65 +++++----- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++--- secure/caroot/blacklisted/Taiwan_GRCA.pem | 61 ++++----- secure/caroot/blacklisted/TrustCor_ECA-1.pem | 36 +++--- .../caroot/blacklisted/TrustCor_RootCert_CA-1.pem | 36 +++--- .../caroot/blacklisted/TrustCor_RootCert_CA-2.pem | 64 +++++----- secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem | 36 +++--- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G5.pem | 33 ++--- ...Sign_Universal_Root_Certification_Authority.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- .../caroot/blacklisted/thawte_Primary_Root_CA.pem | 33 ++--- .../blacklisted/thawte_Primary_Root_CA_-_G2.pem | 13 +- .../blacklisted/thawte_Primary_Root_CA_-_G3.pem | 33 ++--- secure/caroot/trusted/ACCVRAIZ1.pem | 68 +++++----- secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 62 +++++----- .../AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 13 +- .../caroot/trusted/ANF_Secure_Server_Root_CA.pem | 64 +++++----- .../trusted/Actalis_Authentication_Root_CA.pem | 64 +++++----- secure/caroot/trusted/AffirmTrust_Commercial.pem | 33 ++--- secure/caroot/trusted/AffirmTrust_Networking.pem | 33 ++--- secure/caroot/trusted/AffirmTrust_Premium.pem | 61 ++++----- secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 13 +- secure/caroot/trusted/Amazon_Root_CA_1.pem | 33 ++--- secure/caroot/trusted/Amazon_Root_CA_2.pem | 61 ++++----- secure/caroot/trusted/Amazon_Root_CA_3.pem | 9 +- secure/caroot/trusted/Amazon_Root_CA_4.pem | 13 +- secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 37 +++--- .../Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem | 67 ++++++++++ .../Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem | 134 ++++++++++++++++++++ ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 62 +++++----- secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 61 ++++----- secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 13 +- .../caroot/trusted/Baltimore_CyberTrust_Root.pem | 33 ++--- secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 61 ++++----- secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 61 ++++----- secure/caroot/trusted/CA_Disig_Root_R2.pem | 61 ++++----- secure/caroot/trusted/CFCA_EV_ROOT.pem | 64 +++++----- .../trusted/COMODO_Certification_Authority.pem | 35 +++--- .../trusted/COMODO_ECC_Certification_Authority.pem | 13 +- .../trusted/COMODO_RSA_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/Certainly_Root_E1.pem | 13 +- secure/caroot/trusted/Certainly_Root_R1.pem | 61 ++++----- secure/caroot/trusted/Certigna.pem | 34 ++--- secure/caroot/trusted/Certigna_Root_CA.pem | 68 +++++----- secure/caroot/trusted/Certum_EC-384_CA.pem | 13 +- .../caroot/trusted/Certum_Trusted_Network_CA.pem | 33 ++--- .../caroot/trusted/Certum_Trusted_Network_CA_2.pem | 61 ++++----- secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 61 ++++----- secure/caroot/trusted/Comodo_AAA_Services_root.pem | 36 +++--- .../caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 16 ++- .../caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 16 ++- .../trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 36 +++--- .../trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 36 +++--- .../caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 36 +++--- .../caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 33 ++--- .../caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 13 +- secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 36 +++--- secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 33 ++--- secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 13 +- .../trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 36 +++--- .../trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 13 +- .../trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 61 ++++----- secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 61 ++++----- .../Entrust_Root_Certification_Authority.pem | 36 +++--- .../Entrust_Root_Certification_Authority_-_EC1.pem | 13 +- .../Entrust_Root_Certification_Authority_-_G2.pem | 33 ++--- .../Entrust_Root_Certification_Authority_-_G4.pem | 61 ++++----- .../Entrust_net_Premium_2048_Secure_Server_CA.pem | 33 ++--- secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 61 ++++----- secure/caroot/trusted/GLOBALTRUST_2020.pem | 64 +++++----- secure/caroot/trusted/GTS_Root_R1.pem | 61 ++++----- secure/caroot/trusted/GTS_Root_R2.pem | 61 ++++----- secure/caroot/trusted/GTS_Root_R3.pem | 13 +- secure/caroot/trusted/GTS_Root_R4.pem | 13 +- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 9 +- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 13 +- secure/caroot/trusted/GlobalSign_Root_CA.pem | 33 ++--- secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 33 ++--- secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 64 +++++----- secure/caroot/trusted/GlobalSign_Root_E46.pem | 13 +- secure/caroot/trusted/GlobalSign_Root_R46.pem | 61 ++++----- secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 34 ++--- .../Go_Daddy_Root_Certificate_Authority_-_G2.pem | 33 ++--- .../caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 13 +- .../caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 61 ++++----- ...c_and_Research_Institutions_ECC_RootCA_2015.pem | 13 +- ...demic_and_Research_Institutions_RootCA_2015.pem | 61 ++++----- secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 61 ++++----- secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 64 +++++----- secure/caroot/trusted/ISRG_Root_X1.pem | 61 ++++----- secure/caroot/trusted/ISRG_Root_X2.pem | 13 +- .../trusted/IdenTrust_Commercial_Root_CA_1.pem | 61 ++++----- .../trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 61 ++++----- secure/caroot/trusted/Izenpe_com.pem | 61 ++++----- .../trusted/Microsec_e-Szigno_Root_CA_2009.pem | 36 +++--- ...crosoft_ECC_Root_Certificate_Authority_2017.pem | 13 +- ...crosoft_RSA_Root_Certificate_Authority_2017.pem | 61 ++++----- .../NAVER_Global_Root_Certification_Authority.pem | 61 ++++----- ...etLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 33 ++--- .../trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 33 ++--- .../trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 13 +- secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 61 ++++----- secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 62 +++++----- secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 61 ++++----- secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 63 +++++----- secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 61 ++++----- ...SSL_com_EV_Root_Certification_Authority_ECC.pem | 16 +-- ..._com_EV_Root_Certification_Authority_RSA_R2.pem | 64 +++++----- .../SSL_com_Root_Certification_Authority_ECC.pem | 16 +-- .../SSL_com_Root_Certification_Authority_RSA.pem | 64 +++++----- .../trusted/SSL_com_TLS_ECC_Root_CA_2022.pem | 69 +++++++++++ .../trusted/SSL_com_TLS_RSA_Root_CA_2022.pem | 137 +++++++++++++++++++++ secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 33 ++--- ...ctigo_Public_Server_Authentication_Root_E46.pem | 67 ++++++++++ ...ctigo_Public_Server_Authentication_Root_R46.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/SecureSign_RootCA11.pem | 33 ++--- secure/caroot/trusted/SecureTrust_CA.pem | 35 +++--- secure/caroot/trusted/Secure_Global_CA.pem | 35 +++--- .../trusted/Security_Communication_ECC_RootCA1.pem | 13 +- .../trusted/Security_Communication_RootCA2.pem | 33 ++--- .../trusted/Security_Communication_RootCA3.pem | 61 ++++----- .../trusted/Security_Communication_Root_CA.pem | 33 ++--- secure/caroot/trusted/Starfield_Class_2_CA.pem | 34 ++--- .../Starfield_Root_Certificate_Authority_-_G2.pem | 33 ++--- ...ld_Services_Root_Certificate_Authority_-_G2.pem | 33 ++--- secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 65 +++++----- secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 65 +++++----- .../trusted/T-TeleSec_GlobalRoot_Class_2.pem | 33 ++--- .../trusted/T-TeleSec_GlobalRoot_Class_3.pem | 33 ++--- ...BITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 33 ++--- secure/caroot/trusted/TWCA_Global_Root_CA.pem | 61 ++++----- .../trusted/TWCA_Root_Certification_Authority.pem | 33 ++--- secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 61 ++++----- secure/caroot/trusted/Telia_Root_CA_v2.pem | 64 +++++----- .../Trustwave_Global_Certification_Authority.pem | 61 ++++----- ...ave_Global_ECC_P256_Certification_Authority.pem | 9 +- ...ave_Global_ECC_P384_Certification_Authority.pem | 13 +- secure/caroot/trusted/TunTrust_Root_CA.pem | 64 +++++----- .../trusted/UCA_Extended_Validation_Root.pem | 61 ++++----- secure/caroot/trusted/UCA_Global_G2_Root.pem | 61 ++++----- .../USERTrust_ECC_Certification_Authority.pem | 13 +- .../USERTrust_RSA_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/XRamp_Global_CA_Root.pem | 35 +++--- secure/caroot/trusted/certSIGN_ROOT_CA.pem | 33 ++--- secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 61 ++++----- secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 12 +- .../trusted/ePKI_Root_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 13 +- secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 13 +- secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 33 ++--- secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 33 ++--- secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 13 +- secure/caroot/trusted/vTrus_Root_CA.pem | 61 ++++----- 192 files changed, 4371 insertions(+), 3679 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 14a806699b8b..3ff61da559ab 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20230911: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +OLD_FILES+=usr/share/certs/trusted/Hongkong_Post_Root_CA_1.pem + # 20230806: Removal of support for the VTOC8 partitioning scheme OLD_FILES+=usr/include/sys/disk/vtoc.h OLD_FILES+=usr/include/sys/vtoc.h diff --git a/secure/caroot/blacklisted/AddTrust_External_Root.pem b/secure/caroot/blacklisted/AddTrust_External_Root.pem index 701bc7bce072..97fe312d0e8f 100644 --- a/secure/caroot/blacklisted/AddTrust_External_Root.pem +++ b/secure/caroot/blacklisted/AddTrust_External_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed: 1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97: @@ -54,23 +54,23 @@ Certificate: keyid:AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A DirName:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root serial:01 - Signature Algorithm: sha1WithRSAEncryption - b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: - 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: - 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: - bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: - de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: - 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: - 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: - 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: - a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: - 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: - 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: - 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: - 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: - 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: - 8f:4e:86:04 + Signature Value: + b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: + 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: + 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: + bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: + de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: + 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: + 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: + 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: + a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: + 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: + 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: + 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: + 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: + 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: + 8f:4e:86:04 SHA1 Fingerprint=02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68 -----BEGIN CERTIFICATE----- MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU diff --git a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem b/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem index 0595db909a49..afb471de944f 100644 --- a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem +++ b/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:96:96:d4:21:49:60:e2:6b:e8:41:07:0c:de:c4: e0:dc:13:23:cd:c1:35:c7:fb:d6:4e:11:0a:67:5e: @@ -54,23 +54,23 @@ Certificate: keyid:95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B DirName:/C=SE/O=AddTrust AB/OU=AddTrust TTP Network/CN=AddTrust Class 1 CA Root serial:01 - Signature Algorithm: sha1WithRSAEncryption - 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: - ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: - cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: - e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: - 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: - 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: - d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: - c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: - 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: - 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: - 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: - 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: - cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: - 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: - 8e:d6:71:d9 + Signature Value: + 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: + ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: + cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: + e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: + 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: + 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: + d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: + c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: + 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: + 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: + 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: + 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: + cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: + 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: + 8e:d6:71:d9 SHA1 Fingerprint=CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D -----BEGIN CERTIFICATE----- MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU diff --git a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem index f708097b5023..12bb099e2312 100644 --- a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = EU, O = AC Camerfirma SA CIF A82743287, OU = http://www.chambersign.org, CN = Chambers of Commerce Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b7:36:55:e5:a5:5d:18:30:e0:da:89:54:91:fc: c8:c7:52:f8:2f:50:d9:ef:b1:75:73:65:47:7d:1b: @@ -46,10 +46,8 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE, pathlen:12 X509v3 CRL Distribution Points: - Full Name: URI:http://crl.chambersign.org/chambersroot.crl - X509v3 Subject Key Identifier: E3:94:F5:B1:4D:E9:DB:A1:29:5B:57:8B:4D:76:06:76:E1:D1:A2:8A X509v3 Key Usage: critical @@ -63,23 +61,23 @@ Certificate: X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.17326.10.3.1 CPS: http://cps.chambersign.org/cps/chambersroot.html - Signature Algorithm: sha1WithRSAEncryption - 0c:41:97:c2:1a:86:c0:22:7c:9f:fb:90:f3:1a:d1:03:b1:ef: - 13:f9:21:5f:04:9c:da:c9:a5:8d:27:6c:96:87:91:be:41:90: - 01:72:93:e7:1e:7d:5f:f6:89:c6:5d:a7:40:09:3d:ac:49:45: - 45:dc:2e:8d:30:68:b2:09:ba:fb:c3:2f:cc:ba:0b:df:3f:77: - 7b:46:7d:3a:12:24:8e:96:8f:3c:05:0a:6f:d2:94:28:1d:6d: - 0c:c0:2e:88:22:d5:d8:cf:1d:13:c7:f0:48:d7:d7:05:a7:cf: - c7:47:9e:3b:3c:34:c8:80:4f:d4:14:bb:fc:0d:50:f7:fa:b3: - ec:42:5f:a9:dd:6d:c8:f4:75:cf:7b:c1:72:26:b1:01:1c:5c: - 2c:fd:7a:4e:b4:01:c5:05:57:b9:e7:3c:aa:05:d9:88:e9:07: - 46:41:ce:ef:41:81:ae:58:df:83:a2:ae:ca:d7:77:1f:e7:00: - 3c:9d:6f:8e:e4:32:09:1d:4d:78:34:78:34:3c:94:9b:26:ed: - 4f:71:c6:19:7a:bd:20:22:48:5a:fe:4b:7d:03:b7:e7:58:be: - c6:32:4e:74:1e:68:dd:a8:68:5b:b3:3e:ee:62:7d:d9:80:e8: - 0a:75:7a:b7:ee:b4:65:9a:21:90:e0:aa:d0:98:bc:38:b5:73: - 3c:8b:f8:dc + Signature Value: + 0c:41:97:c2:1a:86:c0:22:7c:9f:fb:90:f3:1a:d1:03:b1:ef: + 13:f9:21:5f:04:9c:da:c9:a5:8d:27:6c:96:87:91:be:41:90: + 01:72:93:e7:1e:7d:5f:f6:89:c6:5d:a7:40:09:3d:ac:49:45: + 45:dc:2e:8d:30:68:b2:09:ba:fb:c3:2f:cc:ba:0b:df:3f:77: + 7b:46:7d:3a:12:24:8e:96:8f:3c:05:0a:6f:d2:94:28:1d:6d: + 0c:c0:2e:88:22:d5:d8:cf:1d:13:c7:f0:48:d7:d7:05:a7:cf: + c7:47:9e:3b:3c:34:c8:80:4f:d4:14:bb:fc:0d:50:f7:fa:b3: + ec:42:5f:a9:dd:6d:c8:f4:75:cf:7b:c1:72:26:b1:01:1c:5c: + 2c:fd:7a:4e:b4:01:c5:05:57:b9:e7:3c:aa:05:d9:88:e9:07: + 46:41:ce:ef:41:81:ae:58:df:83:a2:ae:ca:d7:77:1f:e7:00: + 3c:9d:6f:8e:e4:32:09:1d:4d:78:34:78:34:3c:94:9b:26:ed: + 4f:71:c6:19:7a:bd:20:22:48:5a:fe:4b:7d:03:b7:e7:58:be: + c6:32:4e:74:1e:68:dd:a8:68:5b:b3:3e:ee:62:7d:d9:80:e8: + 0a:75:7a:b7:ee:b4:65:9a:21:90:e0:aa:d0:98:bc:38:b5:73: + 3c:8b:f8:dc SHA1 Fingerprint=6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1 -----BEGIN CERTIFICATE----- MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn diff --git a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem index 1ba719b3690a..da95297880f6 100644 --- a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = EU, O = AC Camerfirma SA CIF A82743287, OU = http://www.chambersign.org, CN = Global Chambersign Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:a2:70:a2:d0:9f:42:ae:5b:17:c7:d8:7d:cf:14: 83:fc:4f:c9:a1:b7:13:af:8a:d7:9e:3e:04:0a:92: @@ -46,10 +46,8 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE, pathlen:12 X509v3 CRL Distribution Points: - Full Name: URI:http://crl.chambersign.org/chambersignroot.crl - X509v3 Subject Key Identifier: 43:9C:36:9F:B0:9E:30:4D:C6:CE:5F:AD:10:AB:E5:03:A5:FA:A9:14 X509v3 Key Usage: critical @@ -63,23 +61,23 @@ Certificate: X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.17326.10.1.1 CPS: http://cps.chambersign.org/cps/chambersignroot.html - Signature Algorithm: sha1WithRSAEncryption - 3c:3b:70:91:f9:04:54:27:91:e1:ed:ed:fe:68:7f:61:5d:e5: - 41:65:4f:32:f1:18:05:94:6a:1c:de:1f:70:db:3e:7b:32:02: - 34:b5:0c:6c:a1:8a:7c:a5:f4:8f:ff:d4:d8:ad:17:d5:2d:04: - d1:3f:58:80:e2:81:59:88:be:c0:e3:46:93:24:fe:90:bd:26: - a2:30:2d:e8:97:26:57:35:89:74:96:18:f6:15:e2:af:24:19: - 56:02:02:b2:ba:0f:14:ea:c6:8a:66:c1:86:45:55:8b:be:92: - be:9c:a4:04:c7:49:3c:9e:e8:29:7a:89:d7:fe:af:ff:68:f5: - a5:17:90:bd:ac:99:cc:a5:86:57:09:67:46:db:d6:16:c2:46: - f1:e4:a9:50:f5:8f:d1:92:15:d3:5f:3e:c6:00:49:3a:6e:58: - b2:d1:d1:27:0d:25:c8:32:f8:20:11:cd:7d:32:33:48:94:54: - 4c:dd:dc:79:c4:30:9f:eb:8e:b8:55:b5:d7:88:5c:c5:6a:24: - 3d:b2:d3:05:03:51:c6:07:ef:cc:14:72:74:3d:6e:72:ce:18: - 28:8c:4a:a0:77:e5:09:2b:45:44:47:ac:b7:67:7f:01:8a:05: - 5a:93:be:a1:c1:ff:f8:e7:0e:67:a4:47:49:76:5d:75:90:1a: - f5:26:8f:f0 + Signature Value: + 3c:3b:70:91:f9:04:54:27:91:e1:ed:ed:fe:68:7f:61:5d:e5: + 41:65:4f:32:f1:18:05:94:6a:1c:de:1f:70:db:3e:7b:32:02: + 34:b5:0c:6c:a1:8a:7c:a5:f4:8f:ff:d4:d8:ad:17:d5:2d:04: + d1:3f:58:80:e2:81:59:88:be:c0:e3:46:93:24:fe:90:bd:26: + a2:30:2d:e8:97:26:57:35:89:74:96:18:f6:15:e2:af:24:19: + 56:02:02:b2:ba:0f:14:ea:c6:8a:66:c1:86:45:55:8b:be:92: + be:9c:a4:04:c7:49:3c:9e:e8:29:7a:89:d7:fe:af:ff:68:f5: + a5:17:90:bd:ac:99:cc:a5:86:57:09:67:46:db:d6:16:c2:46: + f1:e4:a9:50:f5:8f:d1:92:15:d3:5f:3e:c6:00:49:3a:6e:58: + b2:d1:d1:27:0d:25:c8:32:f8:20:11:cd:7d:32:33:48:94:54: + 4c:dd:dc:79:c4:30:9f:eb:8e:b8:55:b5:d7:88:5c:c5:6a:24: + 3d:b2:d3:05:03:51:c6:07:ef:cc:14:72:74:3d:6e:72:ce:18: + 28:8c:4a:a0:77:e5:09:2b:45:44:47:ac:b7:67:7f:01:8a:05: + 5a:93:be:a1:c1:ff:f8:e7:0e:67:a4:47:49:76:5d:75:90:1a: + f5:26:8f:f0 SHA1 Fingerprint=33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9 -----BEGIN CERTIFICATE----- MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn diff --git a/secure/caroot/blacklisted/Certum_Root_CA.pem b/secure/caroot/blacklisted/Certum_Root_CA.pem index c94db94aecaa..1df73e0c7336 100644 --- a/secure/caroot/blacklisted/Certum_Root_CA.pem +++ b/secure/caroot/blacklisted/Certum_Root_CA.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = PL, O = Unizeto Sp. z o.o., CN = Certum CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:ce:b1:c1:2e:d3:4f:7c:cd:25:ce:18:3e:4f:c4: 8c:6f:80:6a:73:c8:5b:51:f8:9b:d2:dc:bb:00:5c: @@ -46,21 +46,22 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE Signature Algorithm: sha1WithRSAEncryption - b8:8d:ce:ef:e7:14:ba:cf:ee:b0:44:92:6c:b4:39:3e:a2:84: - 6e:ad:b8:21:77:d2:d4:77:82:87:e6:20:41:81:ee:e2:f8:11: - b7:63:d1:17:37:be:19:76:24:1c:04:1a:4c:eb:3d:aa:67:6f: - 2d:d4:cd:fe:65:31:70:c5:1b:a6:02:0a:ba:60:7b:6d:58:c2: - 9a:49:fe:63:32:0b:6b:e3:3a:c0:ac:ab:3b:b0:e8:d3:09:51: - 8c:10:83:c6:34:e0:c5:2b:e0:1a:b6:60:14:27:6c:32:77:8c: - bc:b2:72:98:cf:cd:cc:3f:b9:c8:24:42:14:d6:57:fc:e6:26: - 43:a9:1d:e5:80:90:ce:03:54:28:3e:f7:3f:d3:f8:4d:ed:6a: - 0a:3a:93:13:9b:3b:14:23:13:63:9c:3f:d1:87:27:79:e5:4c: - 51:e3:01:ad:85:5d:1a:3b:b1:d5:73:10:a4:d3:f2:bc:6e:64: - f5:5a:56:90:a8:c7:0e:4c:74:0f:2e:71:3b:f7:c8:47:f4:69: - 6f:15:f2:11:5e:83:1e:9c:7c:52:ae:fd:02:da:12:a8:59:67: - 18:db:bc:70:dd:9b:b1:69:ed:80:ce:89:40:48:6a:0e:35:ca: - 29:66:15:21:94:2c:e8:60:2a:9b:85:4a:40:f3:6b:8a:24:ec: - 06:16:2c:73 + Signature Value: + b8:8d:ce:ef:e7:14:ba:cf:ee:b0:44:92:6c:b4:39:3e:a2:84: + 6e:ad:b8:21:77:d2:d4:77:82:87:e6:20:41:81:ee:e2:f8:11: + b7:63:d1:17:37:be:19:76:24:1c:04:1a:4c:eb:3d:aa:67:6f: + 2d:d4:cd:fe:65:31:70:c5:1b:a6:02:0a:ba:60:7b:6d:58:c2: + 9a:49:fe:63:32:0b:6b:e3:3a:c0:ac:ab:3b:b0:e8:d3:09:51: + 8c:10:83:c6:34:e0:c5:2b:e0:1a:b6:60:14:27:6c:32:77:8c: + bc:b2:72:98:cf:cd:cc:3f:b9:c8:24:42:14:d6:57:fc:e6:26: + 43:a9:1d:e5:80:90:ce:03:54:28:3e:f7:3f:d3:f8:4d:ed:6a: + 0a:3a:93:13:9b:3b:14:23:13:63:9c:3f:d1:87:27:79:e5:4c: + 51:e3:01:ad:85:5d:1a:3b:b1:d5:73:10:a4:d3:f2:bc:6e:64: + f5:5a:56:90:a8:c7:0e:4c:74:0f:2e:71:3b:f7:c8:47:f4:69: + 6f:15:f2:11:5e:83:1e:9c:7c:52:ae:fd:02:da:12:a8:59:67: + 18:db:bc:70:dd:9b:b1:69:ed:80:ce:89:40:48:6a:0e:35:ca: + 29:66:15:21:94:2c:e8:60:2a:9b:85:4a:40:f3:6b:8a:24:ec: + 06:16:2c:73 SHA1 Fingerprint=62:52:DC:40:F7:11:43:A2:2F:DE:9E:F7:34:8E:06:42:51:B1:81:18 -----BEGIN CERTIFICATE----- MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM diff --git a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem index 0133aff5f03f..b40288095005 100644 --- a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem +++ b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = EU, L = Madrid (see current address at www.camerfirma.com/address), serialNumber = A82743287, O = AC Camerfirma S.A., CN = Chambers of Commerce Root - 2008 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:af:00:cb:70:37:2b:80:5a:4a:3a:6c:78:94:7d: a3:7f:1a:1f:f6:35:d5:bd:db:cb:0d:44:72:3e:26: @@ -67,45 +67,44 @@ Certificate: F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19 X509v3 Authority Key Identifier: keyid:F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19 - DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Chambers of Commerce Root - 2008 + DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com\/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Chambers of Commerce Root - 2008 serial:A3:DA:42:7E:A4:B1:AE:DA - X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://policy.camerfirma.com - Signature Algorithm: sha1WithRSAEncryption - 90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be: - 3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a: - e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5: - c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d: - 13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d: - c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d: - 92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82: - 56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a: - 90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a: - 7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22: - 08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e: - 45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a: - ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60: - 97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0: - 29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6: - f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c: - b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29: - a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22: - d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba: - cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34: - 20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8: - f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e: - c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e: - 18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da: - bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6: - be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3: - 82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a: - 0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c: - 7c:80:c5:f0:d9:77:48:d0 + Signature Value: + 90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be: + 3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a: + e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5: + c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d: + 13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d: + c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d: + 92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82: + 56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a: + 90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a: + 7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22: + 08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e: + 45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a: + ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60: + 97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0: + 29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6: + f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c: + b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29: + a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22: + d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba: + cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34: + 20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8: + f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e: + c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e: + 18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da: + bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6: + be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3: + 82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a: + 0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c: + 7c:80:c5:f0:d9:77:48:d0 SHA1 Fingerprint=78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C -----BEGIN CERTIFICATE----- MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD diff --git a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem index 0a1c5a632dce..657a1b7b683c 100644 --- a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem +++ b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem @@ -24,7 +24,7 @@ Certificate: Subject: O = "Cybertrust, Inc", CN = Cybertrust Global Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:f8:c8:bc:bd:14:50:66:13:ff:f0:d3:79:ec:23: f2:b7:1a:c7:8e:85:f1:12:73:a6:19:aa:10:db:9c: @@ -53,29 +53,27 @@ Certificate: X509v3 Subject Key Identifier: B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 X509v3 CRL Distribution Points: - Full Name: URI:http://www2.public-trust.com/crl/ct/ctroot.crl - X509v3 Authority Key Identifier: - keyid:B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 - + B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 Signature Algorithm: sha1WithRSAEncryption - 56:ef:0a:23:a0:54:4e:95:97:c9:f8:89:da:45:c1:d4:a3:00: - 25:f4:1f:13:ab:b7:a3:85:58:69:c2:30:ad:d8:15:8a:2d:e3: - c9:cd:81:5a:f8:73:23:5a:a7:7c:05:f3:fd:22:3b:0e:d1:06: - c4:db:36:4c:73:04:8e:e5:b0:22:e4:c5:f3:2e:a5:d9:23:e3: - b8:4e:4a:20:a7:6e:02:24:9f:22:60:67:7b:8b:1d:72:09:c5: - 31:5c:e9:79:9f:80:47:3d:ad:a1:0b:07:14:3d:47:ff:03:69: - 1a:0c:0b:44:e7:63:25:a7:7f:b2:c9:b8:76:84:ed:23:f6:7d: - 07:ab:45:7e:d3:df:b3:bf:e9:8a:b6:cd:a8:a2:67:2b:52:d5: - b7:65:f0:39:4c:63:a0:91:79:93:52:0f:54:dd:83:bb:9f:d1: - 8f:a7:53:73:c3:cb:ff:30:ec:7c:04:b8:d8:44:1f:93:5f:71: - 09:22:b7:6e:3e:ea:1c:03:4e:9d:1a:20:61:fb:81:37:ec:5e: - fc:0a:45:ab:d7:e7:17:55:d0:a0:ea:60:9b:a6:f6:e3:8c:5b: - 29:c2:06:60:14:9d:2d:97:4c:a9:93:15:9d:61:c4:01:5f:48: - d6:58:bd:56:31:12:4e:11:c8:21:e0:b3:11:91:65:db:b4:a6: - 88:38:ce:55 + Signature Value: + 56:ef:0a:23:a0:54:4e:95:97:c9:f8:89:da:45:c1:d4:a3:00: + 25:f4:1f:13:ab:b7:a3:85:58:69:c2:30:ad:d8:15:8a:2d:e3: + c9:cd:81:5a:f8:73:23:5a:a7:7c:05:f3:fd:22:3b:0e:d1:06: + c4:db:36:4c:73:04:8e:e5:b0:22:e4:c5:f3:2e:a5:d9:23:e3: + b8:4e:4a:20:a7:6e:02:24:9f:22:60:67:7b:8b:1d:72:09:c5: + 31:5c:e9:79:9f:80:47:3d:ad:a1:0b:07:14:3d:47:ff:03:69: + 1a:0c:0b:44:e7:63:25:a7:7f:b2:c9:b8:76:84:ed:23:f6:7d: + 07:ab:45:7e:d3:df:b3:bf:e9:8a:b6:cd:a8:a2:67:2b:52:d5: + b7:65:f0:39:4c:63:a0:91:79:93:52:0f:54:dd:83:bb:9f:d1: + 8f:a7:53:73:c3:cb:ff:30:ec:7c:04:b8:d8:44:1f:93:5f:71: + 09:22:b7:6e:3e:ea:1c:03:4e:9d:1a:20:61:fb:81:37:ec:5e: + fc:0a:45:ab:d7:e7:17:55:d0:a0:ea:60:9b:a6:f6:e3:8c:5b: + 29:c2:06:60:14:9d:2d:97:4c:a9:93:15:9d:61:c4:01:5f:48: + d6:58:bd:56:31:12:4e:11:c8:21:e0:b3:11:91:65:db:b4:a6: + 88:38:ce:55 SHA1 Fingerprint=5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6 -----BEGIN CERTIFICATE----- MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG diff --git a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem index 0de1a5b43dce..81d66de7a736 100644 --- a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem +++ b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem @@ -21,7 +21,7 @@ Certificate: Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST Root CA 3 2013 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:c4:7b:42:92:82:1f:ec:ed:54:98:8e:12:c0:ca: 09:df:93:6e:3a:93:5c:1b:e4:10:77:9e:4e:69:88: @@ -50,29 +50,27 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 CRL Distribution Points: - Full Name: URI:ldap://directory.d-trust.net/CN=D-TRUST%20Root%20CA%203%202013,O=D-Trust%20GmbH,C=DE?certificaterevocationlist - Full Name: URI:http://crl.d-trust.net/crl/d-trust_root_ca_3_2013.crl - Signature Algorithm: sha256WithRSAEncryption - 0e:59:0e:58:e4:74:48:23:44:cf:34:21:b5:9c:14:1a:ad:9a: - 4b:b7:b3:88:6d:5c:a9:17:70:f0:2a:9f:8d:7b:f9:7b:85:fa: - c7:39:e8:10:08:b0:35:2b:5f:cf:02:d2:d3:9c:c8:0b:1e:ee: - 05:54:ae:37:93:04:09:7d:6c:8f:c2:74:bc:f8:1c:94:be:31: - 01:40:2d:f3:24:20:b7:84:55:2c:5c:c8:f5:74:4a:10:19:8b: - a3:c7:ed:35:d6:09:48:d3:0e:c0:ba:39:a8:b0:46:02:b0:db: - c6:88:59:c2:be:fc:7b:b1:2b:cf:7e:62:87:55:96:cc:01:6f: - 9b:67:21:95:35:8b:f8:10:fc:71:1b:b7:4b:37:69:a6:3b:d6: - ec:8b:ee:c1:b0:f3:25:c9:8f:92:7d:a1:ea:c3:ca:44:bf:26: - a5:74:92:9c:e3:74:eb:9d:74:d9:cb:4d:87:d8:fc:b4:69:6c: - 8b:a0:43:07:60:78:97:e9:d9:93:7c:c2:46:bc:9b:37:52:a3: - ed:8a:3c:13:a9:7b:53:4b:49:9a:11:05:2c:0b:6e:56:ac:1f: - 2e:82:6c:e0:69:67:b5:0e:6d:2d:d9:e4:c0:15:f1:3f:fa:18: - 72:e1:15:6d:27:5b:2d:30:28:2b:9f:48:9a:64:2b:99:ef:f2: - 75:49:5f:5c + Signature Value: + 0e:59:0e:58:e4:74:48:23:44:cf:34:21:b5:9c:14:1a:ad:9a: + 4b:b7:b3:88:6d:5c:a9:17:70:f0:2a:9f:8d:7b:f9:7b:85:fa: + c7:39:e8:10:08:b0:35:2b:5f:cf:02:d2:d3:9c:c8:0b:1e:ee: + 05:54:ae:37:93:04:09:7d:6c:8f:c2:74:bc:f8:1c:94:be:31: + 01:40:2d:f3:24:20:b7:84:55:2c:5c:c8:f5:74:4a:10:19:8b: + a3:c7:ed:35:d6:09:48:d3:0e:c0:ba:39:a8:b0:46:02:b0:db: + c6:88:59:c2:be:fc:7b:b1:2b:cf:7e:62:87:55:96:cc:01:6f: + 9b:67:21:95:35:8b:f8:10:fc:71:1b:b7:4b:37:69:a6:3b:d6: + ec:8b:ee:c1:b0:f3:25:c9:8f:92:7d:a1:ea:c3:ca:44:bf:26: + a5:74:92:9c:e3:74:eb:9d:74:d9:cb:4d:87:d8:fc:b4:69:6c: + 8b:a0:43:07:60:78:97:e9:d9:93:7c:c2:46:bc:9b:37:52:a3: + ed:8a:3c:13:a9:7b:53:4b:49:9a:11:05:2c:0b:6e:56:ac:1f: + 2e:82:6c:e0:69:67:b5:0e:6d:2d:d9:e4:c0:15:f1:3f:fa:18: + 72:e1:15:6d:27:5b:2d:30:28:2b:9f:48:9a:64:2b:99:ef:f2: + 75:49:5f:5c SHA1 Fingerprint=6C:7C:CC:E7:D4:AE:51:5F:99:08:CD:3F:F6:E8:C3:78:DF:6F:EF:97 -----BEGIN CERTIFICATE----- MIIEDjCCAvagAwIBAgIDD92sMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkRF diff --git a/secure/caroot/blacklisted/DST_Root_CA_X3.pem b/secure/caroot/blacklisted/DST_Root_CA_X3.pem index e9574b162807..2b0739bfe36e 100644 --- a/secure/caroot/blacklisted/DST_Root_CA_X3.pem +++ b/secure/caroot/blacklisted/DST_Root_CA_X3.pem @@ -24,7 +24,7 @@ Certificate: Subject: O = Digital Signature Trust Co., CN = DST Root CA X3 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:df:af:e9:97:50:08:83:57:b4:cc:62:65:f6:90: 82:ec:c7:d3:2c:6b:30:ca:5b:ec:d9:c3:7d:c7:40: @@ -53,21 +53,22 @@ Certificate: X509v3 Subject Key Identifier: C4:A7:B1:A4:7B:2C:71:FA:DB:E1:4B:90:75:FF:C4:15:60:85:89:10 Signature Algorithm: sha1WithRSAEncryption - a3:1a:2c:9b:17:00:5c:a9:1e:ee:28:66:37:3a:bf:83:c7:3f: - 4b:c3:09:a0:95:20:5d:e3:d9:59:44:d2:3e:0d:3e:bd:8a:4b: - a0:74:1f:ce:10:82:9c:74:1a:1d:7e:98:1a:dd:cb:13:4b:b3: - 20:44:e4:91:e9:cc:fc:7d:a5:db:6a:e5:fe:e6:fd:e0:4e:dd: - b7:00:3a:b5:70:49:af:f2:e5:eb:02:f1:d1:02:8b:19:cb:94: - 3a:5e:48:c4:18:1e:58:19:5f:1e:02:5a:f0:0c:f1:b1:ad:a9: - dc:59:86:8b:6e:e9:91:f5:86:ca:fa:b9:66:33:aa:59:5b:ce: - e2:a7:16:73:47:cb:2b:cc:99:b0:37:48:cf:e3:56:4b:f5:cf: - 0f:0c:72:32:87:c6:f0:44:bb:53:72:6d:43:f5:26:48:9a:52: - 67:b7:58:ab:fe:67:76:71:78:db:0d:a2:56:14:13:39:24:31: - 85:a2:a8:02:5a:30:47:e1:dd:50:07:bc:02:09:90:00:eb:64: - 63:60:9b:16:bc:88:c9:12:e6:d2:7d:91:8b:f9:3d:32:8d:65: - b4:e9:7c:b1:57:76:ea:c5:b6:28:39:bf:15:65:1c:c8:f6:77: - 96:6a:0a:8d:77:0b:d8:91:0b:04:8e:07:db:29:b6:0a:ee:9d: - 82:35:35:10 + Signature Value: + a3:1a:2c:9b:17:00:5c:a9:1e:ee:28:66:37:3a:bf:83:c7:3f: + 4b:c3:09:a0:95:20:5d:e3:d9:59:44:d2:3e:0d:3e:bd:8a:4b: + a0:74:1f:ce:10:82:9c:74:1a:1d:7e:98:1a:dd:cb:13:4b:b3: + 20:44:e4:91:e9:cc:fc:7d:a5:db:6a:e5:fe:e6:fd:e0:4e:dd: + b7:00:3a:b5:70:49:af:f2:e5:eb:02:f1:d1:02:8b:19:cb:94: + 3a:5e:48:c4:18:1e:58:19:5f:1e:02:5a:f0:0c:f1:b1:ad:a9: + dc:59:86:8b:6e:e9:91:f5:86:ca:fa:b9:66:33:aa:59:5b:ce: + e2:a7:16:73:47:cb:2b:cc:99:b0:37:48:cf:e3:56:4b:f5:cf: + 0f:0c:72:32:87:c6:f0:44:bb:53:72:6d:43:f5:26:48:9a:52: + 67:b7:58:ab:fe:67:76:71:78:db:0d:a2:56:14:13:39:24:31: + 85:a2:a8:02:5a:30:47:e1:dd:50:07:bc:02:09:90:00:eb:64: + 63:60:9b:16:bc:88:c9:12:e6:d2:7d:91:8b:f9:3d:32:8d:65: + b4:e9:7c:b1:57:76:ea:c5:b6:28:39:bf:15:65:1c:c8:f6:77: + 96:6a:0a:8d:77:0b:d8:91:0b:04:8e:07:db:29:b6:0a:ee:9d: + 82:35:35:10 SHA1 Fingerprint=DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13 -----BEGIN CERTIFICATE----- MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem similarity index 75% rename from secure/caroot/trusted/E-Tugra_Certification_Authority.pem rename to secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem index 95a0ba7e8de6..c37e3aa0ce59 100644 --- a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem +++ b/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = TR, L = Ankara, O = E-Tu\C4\9Fra EBG Bili\C5\9Fim Teknolojileri ve Hizmetleri A.\C5\9E., OU = E-Tugra Sertifikasyon Merkezi, CN = E-Tugra Certification Authority Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:e2:f5:3f:93:05:51:1e:85:62:54:5e:7a:0b:f5: 18:07:83:ae:7e:af:7c:f7:d4:8a:6b:a5:63:43:39: @@ -67,40 +67,40 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 - + 2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 05:37:3a:f4:4d:b7:45:e2:45:75:24:8f:b6:77:52:e8:1c:d8: - 10:93:65:f3:f2:59:06:a4:3e:1e:29:ec:5d:d1:d0:ab:7c:e0: - 0a:90:48:78:ed:4e:98:03:99:fe:28:60:91:1d:30:1d:b8:63: - 7c:a8:e6:35:b5:fa:d3:61:76:e6:d6:07:4b:ca:69:9a:b2:84: - 7a:77:93:45:17:15:9f:24:d0:98:13:12:ff:bb:a0:2e:fd:4e: - 4c:87:f8:ce:5c:aa:98:1b:05:e0:00:46:4a:82:80:a5:33:8b: - 28:dc:ed:38:d3:df:e5:3e:e9:fe:fb:59:dd:61:84:4f:d2:54: - 96:13:61:13:3e:8f:80:69:be:93:47:b5:35:43:d2:5a:bb:3d: - 5c:ef:b3:42:47:cd:3b:55:13:06:b0:09:db:fd:63:f6:3a:88: - 0a:99:6f:7e:e1:ce:1b:53:6a:44:66:23:51:08:7b:bc:5b:52: - a2:fd:06:37:38:40:61:8f:4a:96:b8:90:37:f8:66:c7:78:90: - 00:15:2e:8b:ad:51:35:53:07:a8:6b:68:ae:f9:4e:3c:07:26: - cd:08:05:70:cc:39:3f:76:bd:a5:d3:67:26:01:86:a6:53:d2: - 60:3b:7c:43:7f:55:8a:bc:95:1a:c1:28:39:4c:1f:43:d2:91: - f4:72:59:8a:b9:56:fc:3f:b4:9d:da:70:9c:76:5a:8c:43:50: - ee:8e:30:72:4d:df:ff:49:f7:c6:a9:67:d9:6d:ac:02:11:e2: - 3a:16:25:a7:58:08:cb:6f:53:41:9c:48:38:47:68:33:d1:d7: - c7:8f:d4:74:21:d4:c3:05:90:7a:ff:ce:96:88:b1:15:29:5d: - 23:ab:d0:60:a1:12:4f:de:f4:17:cd:32:e5:c9:bf:c8:43:ad: - fd:2e:8e:f1:af:e2:f4:98:fa:12:1f:20:d8:c0:a7:0c:85:c5: - 90:f4:3b:2d:96:26:b1:2c:be:4c:ab:eb:b1:d2:8a:c9:db:78: - 13:0f:1e:09:9d:6d:8f:00:9f:02:da:c1:fa:1f:7a:7a:09:c4: - 4a:e6:88:2a:97:9f:89:8b:fd:37:5f:5f:3a:ce:38:59:86:4b: - af:71:0b:b4:d8:f2:70:4f:9f:32:13:e3:b0:a7:57:e5:da:da: - 43:cb:84:34:f2:28:c4:ea:6d:f4:2a:ef:c1:6b:76:da:fb:7e: - bb:85:3c:d2:53:c2:4d:be:71:e1:45:d1:fd:23:67:0d:13:75: - fb:cf:65:67:22:9d:ae:b0:09:d1:09:ff:1d:34:bf:fe:23:97: - 37:d2:39:fa:3d:0d:06:0b:b4:db:3b:a3:ab:6f:5c:1d:b6:7e: - e8:b3:82:34:ed:06:5c:24 + Signature Value: + 05:37:3a:f4:4d:b7:45:e2:45:75:24:8f:b6:77:52:e8:1c:d8: + 10:93:65:f3:f2:59:06:a4:3e:1e:29:ec:5d:d1:d0:ab:7c:e0: + 0a:90:48:78:ed:4e:98:03:99:fe:28:60:91:1d:30:1d:b8:63: + 7c:a8:e6:35:b5:fa:d3:61:76:e6:d6:07:4b:ca:69:9a:b2:84: + 7a:77:93:45:17:15:9f:24:d0:98:13:12:ff:bb:a0:2e:fd:4e: + 4c:87:f8:ce:5c:aa:98:1b:05:e0:00:46:4a:82:80:a5:33:8b: + 28:dc:ed:38:d3:df:e5:3e:e9:fe:fb:59:dd:61:84:4f:d2:54: + 96:13:61:13:3e:8f:80:69:be:93:47:b5:35:43:d2:5a:bb:3d: + 5c:ef:b3:42:47:cd:3b:55:13:06:b0:09:db:fd:63:f6:3a:88: + 0a:99:6f:7e:e1:ce:1b:53:6a:44:66:23:51:08:7b:bc:5b:52: + a2:fd:06:37:38:40:61:8f:4a:96:b8:90:37:f8:66:c7:78:90: + 00:15:2e:8b:ad:51:35:53:07:a8:6b:68:ae:f9:4e:3c:07:26: + cd:08:05:70:cc:39:3f:76:bd:a5:d3:67:26:01:86:a6:53:d2: + 60:3b:7c:43:7f:55:8a:bc:95:1a:c1:28:39:4c:1f:43:d2:91: + f4:72:59:8a:b9:56:fc:3f:b4:9d:da:70:9c:76:5a:8c:43:50: + ee:8e:30:72:4d:df:ff:49:f7:c6:a9:67:d9:6d:ac:02:11:e2: + 3a:16:25:a7:58:08:cb:6f:53:41:9c:48:38:47:68:33:d1:d7: + c7:8f:d4:74:21:d4:c3:05:90:7a:ff:ce:96:88:b1:15:29:5d: + 23:ab:d0:60:a1:12:4f:de:f4:17:cd:32:e5:c9:bf:c8:43:ad: + fd:2e:8e:f1:af:e2:f4:98:fa:12:1f:20:d8:c0:a7:0c:85:c5: + 90:f4:3b:2d:96:26:b1:2c:be:4c:ab:eb:b1:d2:8a:c9:db:78: + 13:0f:1e:09:9d:6d:8f:00:9f:02:da:c1:fa:1f:7a:7a:09:c4: + 4a:e6:88:2a:97:9f:89:8b:fd:37:5f:5f:3a:ce:38:59:86:4b: + af:71:0b:b4:d8:f2:70:4f:9f:32:13:e3:b0:a7:57:e5:da:da: + 43:cb:84:34:f2:28:c4:ea:6d:f4:2a:ef:c1:6b:76:da:fb:7e: + bb:85:3c:d2:53:c2:4d:be:71:e1:45:d1:fd:23:67:0d:13:75: + fb:cf:65:67:22:9d:ae:b0:09:d1:09:ff:1d:34:bf:fe:23:97: + 37:d2:39:fa:3d:0d:06:0b:b4:db:3b:a3:ab:6f:5c:1d:b6:7e: + e8:b3:82:34:ed:06:5c:24 SHA1 Fingerprint=51:C6:E7:08:49:06:6E:F3:92:D4:5C:A0:0D:6D:A3:62:8F:C3:52:39 -----BEGIN CERTIFICATE----- MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem similarity index 86% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem rename to secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem index 3e58355e78a5..80e67454926a 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +++ b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem @@ -39,19 +39,19 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 - + FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 X509v3 Subject Key Identifier: FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: ecdsa-with-SHA384 - 30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08: - bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa: - 07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02: - 31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8: - 8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00: - ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37 + Signature Value: + 30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08: + bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa: + 07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02: + 31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8: + 8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00: + ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37 SHA1 Fingerprint=8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84 -----BEGIN CERTIFICATE----- MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem similarity index 75% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem rename to secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem index d48fb141df67..fd076cdd2649 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +++ b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA RSA v3 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:a2:66:f0:89:b7:72:7b:ee:09:c9:63:d2:d3:43: dd:5e:c3:a6:84:38:4a:f1:8d:81:bb:14:bd:47:e8: @@ -66,42 +66,42 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF - + B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF X509v3 Subject Key Identifier: B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 89:a8:72:7f:8c:eb:ce:2e:18:c4:10:80:2d:10:0c:ff:fb:14: - cd:04:e0:14:3c:4e:9a:fb:9f:29:bf:22:9e:57:b9:82:73:12: - 63:26:b5:cc:90:e9:d2:2a:29:ee:9c:2d:cc:2c:99:be:45:27: - e4:b1:71:ed:e4:38:95:31:41:f2:7d:7a:63:78:df:ca:36:16: - 2f:82:88:9f:bc:11:47:4f:76:4d:c8:2d:8e:eb:df:2d:7c:4e: - 3b:da:ae:f6:e3:da:5d:14:a6:ae:e8:85:44:9d:06:6e:8e:fb: - ef:7a:4a:6a:2d:2b:28:18:fe:bf:90:2c:75:16:9f:0f:ea:96: - 7d:05:ee:9b:13:a5:44:6c:f8:03:d0:dd:23:e1:fd:03:12:12: - 08:f4:18:34:b3:e0:37:0b:77:11:01:48:bf:61:b4:b5:f8:19: - d9:cb:4d:ea:a3:8c:ef:fd:f0:06:b5:6d:92:f4:4a:61:50:84: - ed:ec:49:d3:e4:be:68:e6:2e:e3:31:0b:54:0b:1a:92:d6:82: - d8:b6:a2:65:3c:66:04:f9:55:da:6c:fb:db:b5:14:66:4d:94: - 83:3b:cd:1e:a6:2b:b2:fe:77:40:86:ab:e7:df:0a:c9:fd:f6: - dd:87:56:18:d8:b0:2c:55:60:96:fa:08:7e:52:90:f5:4b:a6: - 2e:87:7c:cb:20:db:06:3e:a0:5d:03:77:7d:a2:3c:13:1b:29: - a2:13:55:a0:3d:14:22:af:6f:b8:d0:9a:1b:72:dd:05:01:8d: - 86:60:bf:a4:67:ee:b5:a5:0d:d1:7f:e6:1a:2b:62:66:c3:07: - ba:e7:a0:48:1c:38:c3:e9:45:fb:a7:7f:fc:ed:02:68:1a:ca: - 77:12:77:a6:00:55:28:14:ec:d6:c7:12:a2:1b:65:42:e9:91: - e8:cb:3e:87:89:54:5d:d9:af:9d:97:9c:69:e7:0a:ff:0f:5a: - 78:8b:63:2a:4c:7d:47:94:3f:de:4b:e9:53:d0:30:f1:c5:f6: - 9e:49:df:3b:a0:91:a3:a3:fe:cd:58:cc:ea:df:af:6f:28:3b: - a0:69:9b:8f:ec:ac:ae:2b:54:9d:9b:04:b1:47:20:af:96:12: - 3e:63:94:1d:04:e7:2e:bb:86:c7:0c:9a:88:bf:76:47:ef:f7: - b0:0b:97:66:d2:44:cf:60:52:07:e1:d5:2c:4a:3a:27:61:77: - ca:d7:8f:e7:87:0e:30:ff:0c:bb:04:e2:61:c3:a2:c8:97:61: - 8e:b4:30:6a:3c:6d:c2:07:5f:4a:73:2f:3f:f9:16:8a:01:66: - ef:ba:91:ca:52:57:7b:ae:d4:e6:0f:dd:0b:7a:7f:8b:9e:26: - 20:cf:3b:ef:81:71:83:59 + Signature Value: + 89:a8:72:7f:8c:eb:ce:2e:18:c4:10:80:2d:10:0c:ff:fb:14: + cd:04:e0:14:3c:4e:9a:fb:9f:29:bf:22:9e:57:b9:82:73:12: + 63:26:b5:cc:90:e9:d2:2a:29:ee:9c:2d:cc:2c:99:be:45:27: + e4:b1:71:ed:e4:38:95:31:41:f2:7d:7a:63:78:df:ca:36:16: + 2f:82:88:9f:bc:11:47:4f:76:4d:c8:2d:8e:eb:df:2d:7c:4e: + 3b:da:ae:f6:e3:da:5d:14:a6:ae:e8:85:44:9d:06:6e:8e:fb: + ef:7a:4a:6a:2d:2b:28:18:fe:bf:90:2c:75:16:9f:0f:ea:96: + 7d:05:ee:9b:13:a5:44:6c:f8:03:d0:dd:23:e1:fd:03:12:12: + 08:f4:18:34:b3:e0:37:0b:77:11:01:48:bf:61:b4:b5:f8:19: + d9:cb:4d:ea:a3:8c:ef:fd:f0:06:b5:6d:92:f4:4a:61:50:84: + ed:ec:49:d3:e4:be:68:e6:2e:e3:31:0b:54:0b:1a:92:d6:82: + d8:b6:a2:65:3c:66:04:f9:55:da:6c:fb:db:b5:14:66:4d:94: + 83:3b:cd:1e:a6:2b:b2:fe:77:40:86:ab:e7:df:0a:c9:fd:f6: + dd:87:56:18:d8:b0:2c:55:60:96:fa:08:7e:52:90:f5:4b:a6: + 2e:87:7c:cb:20:db:06:3e:a0:5d:03:77:7d:a2:3c:13:1b:29: + a2:13:55:a0:3d:14:22:af:6f:b8:d0:9a:1b:72:dd:05:01:8d: + 86:60:bf:a4:67:ee:b5:a5:0d:d1:7f:e6:1a:2b:62:66:c3:07: + ba:e7:a0:48:1c:38:c3:e9:45:fb:a7:7f:fc:ed:02:68:1a:ca: + 77:12:77:a6:00:55:28:14:ec:d6:c7:12:a2:1b:65:42:e9:91: *** 10683 LINES SKIPPED *** From nobody Mon Sep 11 22:02:55 2023 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 4Rl11D09mQz4tQkx; Mon, 11 Sep 2023 22:02:56 +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 4Rl11C6WF2z3Sgq; Mon, 11 Sep 2023 22:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469775; 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=FXsVrW1O5NQnSxX8dKbTdX0k3An651rLLLF7RoUGaiA=; b=LtXz+CAwBXzQ8V69doZO8iE8FroVdNdBoiEHkBPRL/ZIAeTy8wYSWXLvlZ+7QS7pYvtDhE IjP7f14b2RZlPWAlxJxcj9myOsNo1S5KFBK+Wgwk7dV/VAa44wz+piaQnEgkZYQOtlwka2 xigftDft3pJr6Pfjuy0muWAZBkSx1/hlzwzeDQtC2Ul40jfVxLmxunTUnz9y1Wy30EA6CO J5hsLHS5YTSlZJ7C+OcdDcoj6rGCnwHdahXpJ2INadwU7G7+yyi7UhzT7jON3niZ0vMAav FiL7D7fYAkkpkyWJrVSoctNwVhYvhnVRoeEm5vQysWlhg2fvVAxtehlRA5z4xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469775; a=rsa-sha256; cv=none; b=ikeYF9Emwqc8mpOa5wpj5RxiDFMCkyq+sKwYKXBJwUdXJNqIYjjuWuoSoW59fvHVJ40u4+ jyrt35xdVLofnzXxEPaOrbQ1qnw72Z2i+n65X5Cz2JXocwAb9+NFwbmGLki6Qj3vwt3H30 3PpqwCusxjh0Nsw4ZFihbYpbYz6mbh9V+k9GImXVZyNETkYsLvujab/23j3O+SvJMuTghS 7vPqFqxtq7Y5PhxtUz6Rc7FDarn7bPqgcU0cQX1/p541lNukSQXDdFH/4rKTfeIdN1nVU6 +3lAntOm72QGwSVPBL5ZzVrPHRWZFHhfszEKlKJVFjfjzaB3rMyqyqDASV3vtg== 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=1694469775; 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=FXsVrW1O5NQnSxX8dKbTdX0k3An651rLLLF7RoUGaiA=; b=vFwRqy3gbLKQR5NWLhOiliA0JQFuQeSClOAcm3gaoUrZ78IrzRowuleanukgmELJcwvW5R Osr3pmTAo8yVwunGzjSiO1gKOWMBCtSmN1iJg6akrazs+NQAcdwIi6Jcl4PSFVSZNz89aF iax36CYWhMFmazy6nzUo+iOans8sSdgMu5EnHyW7Q+gi5dmNI6aPCtdu9h8IjyWki5ud2e WzD8fVa1b+0+ipWzrNupzrHWdQhO2vhDFKvd3Y7yoz/dd327Ktmmwpni6YAJ9d4Qo7MlVj 2fAdGkoPVDD7vlSa4ZYq4KfTsYLyHmZNWcELJ4akXSJ52PRx+klctNzxOS0yuQ== 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 4Rl11C5dQvz15cK; Mon, 11 Sep 2023 22:02: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 38BM2tKd006346; Mon, 11 Sep 2023 22:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2tsE006343; Mon, 11 Sep 2023 22:02:55 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:55 GMT Message-Id: <202309112202.38BM2tsE006343@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: babfcc0aa662 - stable/13 - stand: lua: module names should permit more 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: babfcc0aa66256ffa5142a621ee9eba67d564efb Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=babfcc0aa66256ffa5142a621ee9eba67d564efb commit babfcc0aa66256ffa5142a621ee9eba67d564efb Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:38 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 2f66d715016e..2f22056efde2 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -60,7 +60,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)" From nobody Mon Sep 11 22:35:36 2023 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 4Rl1kw3QFCz4sTZY; Mon, 11 Sep 2023 22:35:36 +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 4Rl1kw2Rlsz3ft6; Mon, 11 Sep 2023 22:35:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471736; 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=fgtJxoJSV+iIOT5HbsYCIHcQeUrG2seKCJEJvpqQ1tM=; b=rMCK6osaPJDO2a5wGw2NoW6zavkTj7amet8tGZK3Ab27BUM+ojET6aIPrTx0NNAOvJS+Iv fKCSiT7YdKAp+aLtZdyOLU86D1DOAxz3YsYtBc9mqz7KYheHku4kGsqkBMTDaCiQx8BeRp 82idWeHP9j36DsXcSWliUPN0bLXwnPQZSr6VdoyfJ3knbm3GvFblZUHjofciXA9Nz2V6hB Byu7fdSGXVe0fGDWZeSBS+mrWLB8NPv8AzZwn/MjiLfD5f5UBMRqs5MV3hs5yst8PuxWYC eTv1mbXDTbWqKpRnjoZ8Bh0WC2zadveWAAyqwmWWo39sXKPWe3+LH8C+9qk8Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471736; a=rsa-sha256; cv=none; b=nY2ZwHPezUU+GOWYzaNLPoXpYZn7FT6p3aYTiBLTEmkmjwDS2hh9B85fYfCCI46+UDyU5F gIVFBrA7Gb5epDLNLt0JtOdRtXQmiG48fnOmwhuzk5YNOGvFjXK32WlE318HRjCy26Kz0t 57tqtbo/PCcOQsGjnN++KTpO8+q4CW26y2zqXcY3QAkdjwKhOxu3vgJ7ZWjZmip9jUYBvG o28bmTz8/zBomKgiGquhFfYKuc+pnhFEjlE9RtgGydwhxugFUcV3qe3QgGhKORmzHMBDHf g7ED+FjjDEIyZQxcE0L6lqdQaP4ccV9eenW39dMRc7vvDi+Fs790ifAyNKxosQ== 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=1694471736; 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=fgtJxoJSV+iIOT5HbsYCIHcQeUrG2seKCJEJvpqQ1tM=; b=VTqmwqTOad5UIAhixDXrr77LwRUyUuXpdJu3WDyQVg6Zmd4Js8kMKtBtVlbXl6nBlJp2lG +ze57ZhGHkpq3L6rIZRLryE5D7AnPdM7n/u1doQffI8l+G3LyuDMPq0DHh9xYy4R4FAcgZ tAsUW5GB8ZqqUzKj/tObvcYTUHEb13cBFmsIqfPEALUW4k+UkMpR4Tz0+qXxPFMsskIEaq /AIJ/EV1nqZfYARscF58To75TXlfzVzlossGmMDHjxLEFQwO9i9l9NeuCbJjKgKyQEQgnk yUZ61GWTNGpn5vyyjaFleuJy47OzRCA0INNFs/hIsClQCz9ukwqkL0wbOA/5Dw== 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 4Rl1kw1VfMz168r; Mon, 11 Sep 2023 22:35:36 +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 38BMZaF7056830; Mon, 11 Sep 2023 22:35:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZax9056827; Mon, 11 Sep 2023 22:35:36 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:36 GMT Message-Id: <202309112235.38BMZax9056827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: ca3fc7aabe39 - stable/13 - bnxt: Don't restart on VLAN changes 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca3fc7aabe3998822c6e1357df922618afb18648 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ca3fc7aabe3998822c6e1357df922618afb18648 commit ca3fc7aabe3998822c6e1357df922618afb18648 Author: Kevin Bowling AuthorDate: 2023-08-24 20:16:24 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:20 +0000 bnxt: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This is unintentional for bnxt(4) and is causing another bug in its VLAN initialization code to affect the common case of adding and removing VLANs on an existing interface. PR: 269133 Tested by: kp Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit bce864d1c274faeb6678028aad1e07e91fe430ac) --- sys/dev/bnxt/if_bnxt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 2eb41cf7ade8..db8b4125e5bd 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -224,6 +224,7 @@ static uint8_t get_phy_type(struct bnxt_softc *softc); static uint64_t bnxt_get_baudrate(struct bnxt_link_info *link); static void bnxt_get_wol_settings(struct bnxt_softc *softc); static int bnxt_wol_config(if_ctx_t ctx); +static bool bnxt_if_needs_restart(if_ctx_t, enum iflib_restart_event); /* * Device Interface Declaration @@ -288,6 +289,8 @@ static device_method_t bnxt_iflib_methods[] = { DEVMETHOD(ifdi_shutdown, bnxt_shutdown), DEVMETHOD(ifdi_resume, bnxt_resume), + DEVMETHOD(ifdi_needs_restart, bnxt_if_needs_restart), + DEVMETHOD_END }; @@ -2497,6 +2500,16 @@ bnxt_wol_config(if_ctx_t ctx) return 0; } +static bool +bnxt_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + static int bnxt_shutdown(if_ctx_t ctx) { From nobody Mon Sep 11 22:35:37 2023 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 4Rl1kx4lBKz4sTq0; Mon, 11 Sep 2023 22:35:37 +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 4Rl1kx3qRlz3g25; Mon, 11 Sep 2023 22:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471737; 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=5zFeMeRfMVsuQLXSga11p0P+yHsb+UHSC2igjtA/hdY=; b=f24LYYlGgSWZstOgkxr00wfZDYGWe0uRcKSlMgRMhP06fx5utWHLGbmZrEG9hPm5sHchMV l5YNyIQtcLqxTgM5Z4U4dfwhM0Ycics0V7peAp362Ru4KSJ8NJmwTAjesLhx+5Sp5ZW8rJ xba32/eya5lgJUyXLEUiJMLkEObHzb8ZIeEJgx0H5jbQO4v6oOTvwDzOE8kLuQxsOuOxDF sQrsf8JeFM1390O4I71kihQII5lzQC8CnpQ2SyrOBWZBo6kWhSJ1p12DBeELFGIMdXXfUJ ZPdNIz2Blsx1szZ4TK7Xab1d4/6OpgZLJVeLXpolQ3LNDGDcG+GsWvw5LvAuTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471737; a=rsa-sha256; cv=none; b=SsDFiqX1sC9wE5Vg3bFiUGoo+zkykwIjiuDW9LdWW3DhHAub/VmkHFqxmu5lZrqRaxCoEs g9VbuJg8KebSXSsnKO6jpfvU6ArAi1SPQONbT727wKlAID8TWnV7OgAFMEO13/sKsC6AJH WhZ+G1qLWU4geR5FRCyC4Lp+hnjFZK5relS5ptH5vSyWC913kIZCUalDN/1EI6h8tjHAkS CFn9YrMntm755DD7AnWURMy6+t7GN9/Q485wKfuMx+Oah268s80pagOdhF9Jfa1as6Qo+g H2yeJ+rRQILHLJGdoHbxOaGFSqzCzBkIg6fl2t2rBC1ptYBEEfFGOxw2TrOvQA== 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=1694471737; 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=5zFeMeRfMVsuQLXSga11p0P+yHsb+UHSC2igjtA/hdY=; b=JgGcfHo5rsKwWCgCqMLOOZ98MGtGMXFyd9LGQWrZ+BrYW22m6vzRqySbD1Qt8s085iOgrN oUdfgCoXY8NRttVZIGkXEmwg+Y4b4fu6GrPGNCE1c5BQLWgwC4pj9hAvj1BK/SwsHb5dpu pMo8CkTuWTTW+rJuo1ySHehxdsT5yb2HY62nv5lDeLJaVQBNPcCC9bQPzoYbln9Zs29yLl xepJTN3oGtsbByllZFqTx7fJKj8LxV5I44nZngNEuh9YKHJ7QImB4TbFh9Jz6veDxe4CQU vgJ8Z+z+Ttct1dhZWMpSYo2PxEyf/RrDMBLMvRGXxM2iIWKEJjdjQ4lIszCB4A== 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 4Rl1kx2pPKz168s; Mon, 11 Sep 2023 22:35: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 38BMZbIh056878; Mon, 11 Sep 2023 22:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZb6G056875; Mon, 11 Sep 2023 22:35:37 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:37 GMT Message-Id: <202309112235.38BMZb6G056875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 08647a110843 - stable/13 - iavf: Add explicit ifdi_needs_reset for VLAN changes 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 08647a110843ab7f4b09917413ed9cb1c3d4a7ca Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=08647a110843ab7f4b09917413ed9cb1c3d4a7ca commit 08647a110843ab7f4b09917413ed9cb1c3d4a7ca Author: Kevin Bowling AuthorDate: 2023-08-24 20:36:00 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:20 +0000 iavf: Add explicit ifdi_needs_reset for VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. iavf(4) was the original need for this, because VLAN filter changes currently have negative interactions with Malicious Driver Detection. Add iavf_if_needs_restart and explicitly enable VLAN re-init. Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit 1d6c12c511ae2a394d3ca1998a10f3d3bd25d313) --- sys/dev/iavf/if_iavf_iflib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/dev/iavf/if_iavf_iflib.c b/sys/dev/iavf/if_iavf_iflib.c index 5ae1b9308c1e..ef3a36674a55 100644 --- a/sys/dev/iavf/if_iavf_iflib.c +++ b/sys/dev/iavf/if_iavf_iflib.c @@ -74,6 +74,7 @@ static void iavf_if_vlan_unregister(if_ctx_t ctx, u16 vtag); static uint64_t iavf_if_get_counter(if_ctx_t ctx, ift_counter cnt); static void iavf_if_init(if_ctx_t ctx); static void iavf_if_stop(if_ctx_t ctx); +static bool iavf_if_needs_restart(if_ctx_t, enum iflib_restart_event); static int iavf_allocate_pci_resources(struct iavf_sc *); static void iavf_free_pci_resources(struct iavf_sc *); @@ -170,6 +171,7 @@ static device_method_t iavf_if_methods[] = { DEVMETHOD(ifdi_vlan_register, iavf_if_vlan_register), DEVMETHOD(ifdi_vlan_unregister, iavf_if_vlan_unregister), DEVMETHOD(ifdi_get_counter, iavf_if_get_counter), + DEVMETHOD(ifdi_needs_restart, iavf_if_needs_restart), DEVMETHOD_END }; @@ -1497,6 +1499,25 @@ iavf_if_get_counter(if_ctx_t ctx, ift_counter cnt) } } +/* iavf_if_needs_restart - Tell iflib when the driver needs to be reinitialized + * @ctx: iflib context + * @event: event code to check + * + * Defaults to returning false for unknown events. + * + * @returns true if iflib needs to reinit the interface + */ +static bool +iavf_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + return (true); + default: + return (false); + } +} + /** * iavf_free_pci_resources - Free PCI resources * @sc: device softc From nobody Mon Sep 11 22:35:38 2023 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 4Rl1ky5TcLz4sTx9; Mon, 11 Sep 2023 22:35: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 4Rl1ky4hs2z3g33; Mon, 11 Sep 2023 22:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471738; 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=Z9WZ/VtzR16IEAZZcqE6YFyNo7xIQOHwJmZuBw0UCc4=; b=ZfLOq08jb1kS6xmVMLsJnfmdB5/gcGN7YCgNR5/UxZIQuTzwxVJo96jyubr3Y1CkBn5u7i 0MArfx2Nv5uzfmfUwh7W9mAf275qkTHDYF/GITAOgNxBC1k+qCcvB7f3Lwyh71VI1IibeZ ONi7at1OcNfaZ2lZZXh5Yh8bIgy1jRAwSjbMazNBN3KqqCrIqXLcNdvTEto1+Rn9KhbXHS MWjZJ5jhcojG6/KOO1GbTrAHA4ivKDvz8RVdMpdfxblnWl1SUYF8MccQJ8/67jcGpMXLe6 gOBH4IJW2sHgjT3D1cwGR829cn49drB+wISb+m6jhg0MNT7y0T30pEL0fODjIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471738; a=rsa-sha256; cv=none; b=TkdZd7B5kOWM5qKRA46j96g9K93m06yGhZCON/1A0YHeO3tYqyfe5AIFA5ju28Sft4Atf9 PcRYalYRYT7W05i30zKA/bkGsxSLewIA39zF3+SdKo+yj3/vL6O5X4g5N8a9v4sOcnxu0+ Bbdcvhdk/Zd6zFgjpVs8Uuq/7zu8AU9nQMowo4WqqSJb4qCHu9q8RFLm6L/u8jCBZ8TSU6 NEwmoKMJoZViv6X1FsxnSJYxB2B37Vn3tedUB/HidWDxTsv/fj0uq6RC1vt00SbkJ7n/s4 lzU88BGOavoE1sQwKLzkDfc8g28hE7iWFeYA6I/jIqlWmPlH/7+Vejtag8f8xQ== 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=1694471738; 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=Z9WZ/VtzR16IEAZZcqE6YFyNo7xIQOHwJmZuBw0UCc4=; b=t6jicR2q8fUVYlfeJpB3vtKjjHG4Dlp3Jd0aqu6CGAG0xvqiL/0jjtXtu02A0mXy3Ac/Fv hwyblB5y/4k7SyvlD7kAHzfJw/Ydl4vwDOliN0beFPT1C2BK3jHv69HnpoYS2aEfHGivKA UkKtHWpSggBQQNrZUxPHr036PJkuGAfws8vQHrbNUXApkVXTuspxe5522zZic3b7/5Nvd/ sIiHrWayoc8vtTe/HCwgQhJpAK8D1hA+PsHBWmY3yQ/OkknO4XlNwfoziNo2izU1Nawu/m 5Rs879xk+tae9lcpXBAoJ393X1lanM0d0bh1fqjVtzcXIv7COx2QHS6bRwm/6Q== 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 4Rl1ky3nbQz16gK; Mon, 11 Sep 2023 22:35:38 +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 38BMZcKX056923; Mon, 11 Sep 2023 22:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZcGv056920; Mon, 11 Sep 2023 22:35:38 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:38 GMT Message-Id: <202309112235.38BMZcGv056920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 699014f7981b - stable/13 - ice: Don't restart on VLAN changes 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 699014f7981bdda8826ecb6aab783911a0f5c43c Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=699014f7981bdda8826ecb6aab783911a0f5c43c commit 699014f7981bdda8826ecb6aab783911a0f5c43c Author: Kevin Bowling AuthorDate: 2023-08-24 20:40:35 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:20 +0000 ice: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unnecessary for ice(4). Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit 14a14e36aee2e6b848c239ac29090ad4cb66fbf7) --- sys/dev/ice/if_ice_iflib.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index 58e4b77585ee..be1aa86234c7 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -83,6 +83,7 @@ static int ice_if_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t data); static int ice_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req); static int ice_if_suspend(if_ctx_t ctx); static int ice_if_resume(if_ctx_t ctx); +static bool ice_if_needs_restart(if_ctx_t, enum iflib_restart_event); static int ice_msix_que(void *arg); static int ice_msix_admin(void *arg); @@ -170,6 +171,7 @@ static device_method_t ice_iflib_methods[] = { DEVMETHOD(ifdi_i2c_req, ice_if_i2c_req), DEVMETHOD(ifdi_suspend, ice_if_suspend), DEVMETHOD(ifdi_resume, ice_if_resume), + DEVMETHOD(ifdi_needs_restart, ice_if_needs_restart), DEVMETHOD_END }; @@ -3084,3 +3086,21 @@ ice_if_resume(if_ctx_t ctx) return (0); } +/* ice_if_needs_restart - Tell iflib when the driver needs to be reinitialized + * @ctx: iflib context + * @event: event code to check + * + * Defaults to returning false for unknown events. + * + * @returns true if iflib needs to reinit the interface + */ +static bool +ice_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + default: + return (false); + } +} + From nobody Mon Sep 11 22:35:39 2023 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 4Rl1l00TZgz4sTZh; Mon, 11 Sep 2023 22:35: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 4Rl1kz5yH7z3gDG; Mon, 11 Sep 2023 22:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471739; 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+nhcrN7v/QgdMGChKmmgGjdHHRcGsL/kYFZ94WylWQ=; b=hVQlO6ifv79AsmSh9++5RVyzyroq6PHJQfDlpoVasq+yX/t9FmcLBDNs/xHMdiAORIjaWB kyqWxvxa8IdN0DuJU0Q8lfPrIBTED0dia3LcaJPRFqPH536hDtQpw4c7DvIb5Ur672nxKn 6B3D0MJZIzAOOFFkHL6Zil1LYHfXJoeyxz7uKJg4NuvgrDYG+B62br0V7mfq38+DuTnJfE s9AVXlJao4WME1f+zhPuheYDydhY4fme4DBMLCncLJKvQoQj+14c1J1nGEnGYoM+JROEFe 03pqn8PSpwX+zs07CeDkdpGI9crUoFkYnu5hltwPuRm9dYs72IObcGLrU5/UVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471739; a=rsa-sha256; cv=none; b=Vt09dwFRERlMMd9nssBOZtO+WpeedXCbj8AwdJa6MoSdFsiY/0pONG6gFLT+pVRbM2zD5g rVGtuMDd2AgvcUT0NjHAm23eBtrRYdJH/hjJPhbxFdfex9YXyxWxQpGJ5UzG34rxAVW16R 5VPdIm971298Zj9g8RL2T7CrIQfK3NUjsJ9WhsHzOxpZAGKM8aSWAz1CejMzdoUnjl1E6L Blx8MvpEpCdNNAA79MMyhdSiR3FvTXLGv5LVgTbcJRF6YcIpow5XlpCxUYo6oKlkfMOA/E LOJ2iyw3vCZEo2yGJ+xky7ceT+XZTveW0x2JWsJO52NhPBthqxqBD9XHzAJhEg== 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=1694471739; 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+nhcrN7v/QgdMGChKmmgGjdHHRcGsL/kYFZ94WylWQ=; b=rlX9ucsj5NMuxlSiOdqieQAsmCtSU5LVR96p1o+xDGYf46QZdWDLF1uVnw+URE9I2wgYQ4 VBw6T+lAFgurdBIFvRyvNK1dyRodZYF5mCthqS5y8/+b2LGmUolMGGQlgweIZqfOJ/xqxt rvn0fUGRVNsNnq/Dg56pMikYJpDBXdWyhFc4khfEEjEuxWnZ7AskHmEG+W/7/pIaekP+L6 hv4EKZ84w+spalW20wr41h7JHOlcD4+RqEcTiR1G2LYvWf//cs92Q1AMqkoaormS1eOWjz kQbh3Ns5mO4P3BmqOGY7k3aXw7TUpHF6qgyzUv7tP9Swh4y/Ij46wXGZF0Y4zQ== 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 4Rl1kz5427z16M8; Mon, 11 Sep 2023 22:35: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 38BMZd9x056980; Mon, 11 Sep 2023 22:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZd3B056977; Mon, 11 Sep 2023 22:35:39 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:39 GMT Message-Id: <202309112235.38BMZd3B056977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 6cb4a544e00f - stable/13 - iflib: invert default restart on VLAN changes 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cb4a544e00f834d3fa956aca61b0f71c04a4ad5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb4a544e00f834d3fa956aca61b0f71c04a4ad5 commit 6cb4a544e00f834d3fa956aca61b0f71c04a4ad5 Author: Kevin Bowling AuthorDate: 2023-08-24 20:42:23 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:21 +0000 iflib: invert default restart on VLAN changes In rS360398, a new iflib device method was added to opt out of VLAN events needing an interface reset. I am switching the default to not requiring a restart for: * VLAN events * unknown events After fixing various bugs, I do not think this would be a common need of hardware and it is undesirable from the user's perspective causing link flaps and much slower VLAN configuration. Currently, there are no other restart events besides VLAN events, and setting the ifdi_needs_restart default to false will alleviate the need to churn every driver if an odd event is added in the future for specific hardware. markj points out this could cause churn in the other direction; I will solve that problem with an event registration system as he mentions in the review should we need it in the future. These drivers will opt into restart and need further inspection or work: * ixv (needs code audit, 61a8231 fixed principal issue; re-init probably not necessary) * axgbe (needs code audit; re-init probably not necessary) * iavf - (needs code audit; interaction with Malicious Driver Detection mentioned in rS360398) * mgb - no VLAN functions are currently implemented. Left a comment. Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit 725e4008efef32dfbe57b3e21635fa80dde8ee38) --- sys/dev/e1000/if_em.c | 5 ++--- sys/dev/igc/if_igc.c | 5 ++--- sys/dev/ixgbe/if_ix.c | 5 ++--- sys/dev/mgb/if_mgb.c | 1 + sys/net/ifdi_if.m | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 3aae0ef4377e..8cf130048128 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4385,7 +4385,7 @@ em_if_get_counter(if_ctx_t ctx, ift_counter cnt) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -4394,9 +4394,8 @@ em_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 4680dd434174..82fb0d72070b 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2403,7 +2403,7 @@ igc_if_get_counter(if_ctx_t ctx, ift_counter cnt) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -2412,9 +2412,8 @@ igc_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index db54b0edf7be..b1cba9f24929 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1257,7 +1257,7 @@ ixgbe_if_i2c_req(if_ctx_t ctx, struct ifi2creq *req) * @ctx: iflib context * @event: event code to check * - * Defaults to returning true for unknown events. + * Defaults to returning false for unknown events. * * @returns true if iflib needs to reinit the interface */ @@ -1266,9 +1266,8 @@ ixgbe_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: - return (false); default: - return (true); + return (false); } } diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index b2962d5ff3d8..e3806300ed9a 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -252,6 +252,7 @@ static device_method_t mgb_iflib_methods[] = { */ DEVMETHOD(ifdi_vlan_register, mgb_vlan_register), DEVMETHOD(ifdi_vlan_unregister, mgb_vlan_unregister), + DEVMETHOD(ifdi_needs_restart, mgb_if_needs_restart), /* * Needed for WOL support diff --git a/sys/net/ifdi_if.m b/sys/net/ifdi_if.m index 6e8661920394..fb36b898c1d0 100644 --- a/sys/net/ifdi_if.m +++ b/sys/net/ifdi_if.m @@ -172,7 +172,7 @@ CODE { static bool null_needs_restart(if_ctx_t _ctx __unused, enum iflib_restart_event _event __unused) { - return (true); + return (false); } }; From nobody Mon Sep 11 22:35:40 2023 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 4Rl1l10Xr1z4sV0v; Mon, 11 Sep 2023 22:35: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 4Rl1l06wg0z3gBM; Mon, 11 Sep 2023 22:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694471741; 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=+XMj0fJRKogAyUb6ftPi43hwh/azndSsqofsq3DTrHw=; b=Sllvt6xJVkvRsZzxImoyLt0IeheQWpfmBxamWTPNOnzgfGi31ZXaFT59Y9/oX0T9kWjBcD T0GiQVQuhGqdHSWxOZ9gr0KU/tR0MDmreIRM4vbzvYx0+75gUcarU0CnYtX12OPgbDvKLo gdkwN7l8R3dd5A+L+RxJXCV+5l0rLtj6p6nhLMEvdYM6Z9HdYbXB50co9QdvDWFp0J4Rfi BQVzFMT1W8MpESUAsPPjhSYwgrV5ZeKxJeJ31UOYvoMVuiihhwkF6xuJwNr5vf/KNaog/O h1D6OUuHB8b0BH3CwrVJLhYn9U2txz+IqMllpnmGn+FrLYGxHcQ2tlpimjH8VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471741; a=rsa-sha256; cv=none; b=soSXi1tbKGwAWjEJ89lq/TCoKejA9DYTVpiwup1KThfue6/Gq1jUbERKVHqeOWqXhNtJEE FHtJoWxozisUg1Z0HxBB2JCc8OgXPEaq6xAIGhRmHp1juP6/hz3XoajxmfMGPpTRZLObp4 L0kqphvXVLz8V9TEnOz2UUD1fxEebejbWWIX/mYY1rVm/95fZQ84jfMkPMfYVEJkBHAluP /eeAt7FPbk01uJa9FczV8ybuTAescf2czPCcCQnMBvqlXFwPgPc/UqO9iKzPhG0SUGzex8 JP89qcazgfOq2hsaq7SXz+v0szGQd4s7+DvlCbCB77ueFBCw30gkUODyTobb3Q== 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=1694471741; 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=+XMj0fJRKogAyUb6ftPi43hwh/azndSsqofsq3DTrHw=; b=F0J5rGrqfdCgTHwNY6HxlVCN4cnRRSDnioS/x3e0PIp1XBYYzq9YMSuhj68kNf80Y3EI5T 2ZHr0rcoIJETGil6hfHMOaP32p0qWMP30x6dIijM7j1EVEO3tJQ7qv5/Hi99ZlvZRxYf0H UX1iRTyHG3F0r5YQI68WuH9GbZUEzvF348yKG6n/m2wq7yo86MLJ88d0fNGqNKM0KvpoTd AGodfFYr3IkS/ginaenc9ihiP4DxfMNICnrPNB7dgtPVrqKQeG5FjJKP/n+Q05iwm20rmZ QW0u69azcZDsVRo7h9xiafe9yDrp5+bta3s/wuKL+asETXkc/1jrCH6PeiFxsw== 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 4Rl1l05s28z16Ng; Mon, 11 Sep 2023 22:35: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 38BMZenp057025; Mon, 11 Sep 2023 22:35:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZeDZ057022; Mon, 11 Sep 2023 22:35:40 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:40 GMT Message-Id: <202309112235.38BMZeDZ057022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 5c4f04ff008c - stable/13 - vmxnet3: do restart on VLAN changes 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c4f04ff008ca920219655e401fef48a5806f77d Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4f04ff008ca920219655e401fef48a5806f77d commit 5c4f04ff008ca920219655e401fef48a5806f77d Author: Kevin Bowling AuthorDate: 2023-08-24 20:25:21 +0000 Commit: Kevin Bowling CommitDate: 2023-09-11 22:34:21 +0000 vmxnet3: do restart on VLAN changes vmxnet3: Don't restart on VLAN changes In rS360398, a new iflib device method was added with default of opt out for VLAN events needing an interface reset. This re-init is unintentional for vmxnet3(4). Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41558 (cherry picked from commit b6b75424c57d6da49967fef39f69080ce6939207) vmxnet3: do restart on VLAN changes At least one user reports issues with vmx interfaces after 725e4008ef, where we default to not resetting the interface on VLAN changes. This was on an ESXi 7.0.3 setup. Reported by: Marcos Mendoza Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8c1274138a20ee2342c4f217adb605e3abc14042) --- sys/dev/vmware/vmxnet3/if_vmx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index adf69c320281..cd313b5b8084 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -180,6 +180,7 @@ static void vmxnet3_enable_intr(struct vmxnet3_softc *, int); static void vmxnet3_disable_intr(struct vmxnet3_softc *, int); static void vmxnet3_intr_enable_all(if_ctx_t); static void vmxnet3_intr_disable_all(if_ctx_t); +static bool vmxnet3_if_needs_restart(if_ctx_t, enum iflib_restart_event); typedef enum { VMXNET3_BARRIER_RD, @@ -248,6 +249,8 @@ static device_method_t vmxnet3_iflib_methods[] = { DEVMETHOD(ifdi_suspend, vmxnet3_suspend), DEVMETHOD(ifdi_resume, vmxnet3_resume), + DEVMETHOD(ifdi_needs_restart, vmxnet3_if_needs_restart), + DEVMETHOD_END }; @@ -2516,6 +2519,17 @@ vmxnet3_intr_disable_all(if_ctx_t ctx) vmxnet3_disable_intr(sc, i); } +static bool +vmxnet3_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +{ + switch (event) { + case IFLIB_RESTART_VLAN_CONFIG: + return (true); + default: + return (false); + } +} + /* * Since this is a purely paravirtualized device, we do not have * to worry about DMA coherency. But at times, we must make sure From nobody Mon Sep 11 22:35:57 2023 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 4Rl1lL1xZBz4sV3n; Mon, 11 Sep 2023 22: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 4Rl1lL0pKgz4CwB; Mon, 11 Sep 2023 22: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=1694471758; 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=fb0tv+QYGBk8bvp60jKcER3nLglR7DRCV5gaVwtjkc0=; b=C2b1zCTuoKeO0hJjDNnpXr52IkPgiH0i/n0+IQCA+hnCd/LzfOKAKAOv1YikiJbP0OnwNg /sPndt/hJeShZXJgkjtaZGfuADrsf/BNWZwnctY3ZJ66NX9nT9Kkzn3he16HPUU4TNPAiC SSf77NzVCl7+SJB0BtDrirEB7cow7FSLDh6XybgcB08zrRVf3T12AGWSzztQhhfhpwUrBm ila5AKHIL4jbz3YsDfawOyhuVkwqNQLNe9e7WzYkZ+kWbkOZD1H6jD77FaX9Ce0opmKU+a QUG+YHN5Fq2AHxgxMWInNnZ3gGkrr8cua9FNX0tlSH8f9D2g6BZ7o0sNf6+XoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694471758; a=rsa-sha256; cv=none; b=OD5dRG41Y1jgsKrpHbpMqXxkLsZ1XHcJU4h6azDIxMhbkVc18mOR9HhZHOXQpH88VEH3hQ yLbhe5ex+z/R/WTpCK+KWyWU3rQ6qDHDmxAbvxD0as+/nG7yJ9gQPIm/S3IWiPejhxEM3o pEfv+ZduyvTtLMaRBa/cjBMQ84MEZ94JAidA8w1q155GXayUomet/ujdTL+si9a0hc6HkG WHOK1/KYJA0QMBLtE3M8KnSl0Z/QZmgCxtjmNnI7fOfZ8dxyzWLkm0UBViMPpadcSPpPfd fUmTogRjj2O6WpaN8CKXSdzWmxYk3BoUhL0DnjJOGNkBzItiEAiM3U4CsRZ+Xg== 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=1694471758; 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=fb0tv+QYGBk8bvp60jKcER3nLglR7DRCV5gaVwtjkc0=; b=sISvccWJW27mY0YiS0tzBDuntqGn3Se9prVO0ii32aZyEw5P4NfDrgD8xTd3meETqiltkO uq8NkbsudEDHqb5tKUXWNH7af9PEw6cB7DAa72HsgIaNDE/CXm00zUzZWjim+mrAL4PUea /K/47THHVVVFEaeaIMLwumnRQvQxgek7tTNbrd6GlKXLSI1tleaQGTyht3j2s5VfCrAHJz zDSsZulD92TQaEcSy4ehhvLUo5o/vy8mJdkdl5io+f+4d8nIlwqWhwNIxDibKTVgZuVk1X SI7jcMKIcFC4R6Hhye6dfwCoCNdJhjNcbsEzXwYa3J2PuQUoIQTWFfBVGv6wng== 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 4Rl1lK6qdtz168t; Mon, 11 Sep 2023 22:35: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 38BMZvtV057218; Mon, 11 Sep 2023 22:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMZvOA057215; Mon, 11 Sep 2023 22:35:57 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:35:57 GMT Message-Id: <202309112235.38BMZvOA057215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 481d727f3ede - releng/14.0 - uefi(8): Refer to a related manual page 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 481d727f3ede5362991b89545f072c28c07745c5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=481d727f3ede5362991b89545f072c28c07745c5 commit 481d727f3ede5362991b89545f072c28c07745c5 Author: Tom Hukins AuthorDate: 2023-08-31 09:21:40 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:34:08 +0000 uefi(8): Refer to a related manual page PR: 265834 Reviewed by: mhorne Approved by: re (delphij) Differential Revision: https://reviews.freebsd.org/D39577 (cherry picked from commit f49d6f583e9df2839b420f27c44edc5c1fa276c6) (cherry picked from commit d01bbdf4572bd8e8e709f6c0020e7352f7727cff) --- share/man/man8/uefi.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 9ee501047337..42642bb48260 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd August 31, 2023 .Dt UEFI 8 .Os .Sh NAME @@ -89,7 +89,7 @@ or .It .Pa loader.efi loads and boots the kernel, as described in -.Xr loader 8 . +.Xr loader.efi 8 . .El .Pp The @@ -116,6 +116,7 @@ Typical non-default kernel (optional) .Xr efidp 8 , .Xr efivar 8 , .Xr gpart 8 , +.Xr loader.efi 8 , .Xr uefisign 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in From nobody Mon Sep 11 22:44:21 2023 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 4Rl1x218tXz4sZfD; Mon, 11 Sep 2023 22:44: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 4Rl1x20kMQz4HLs; Mon, 11 Sep 2023 22:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472262; 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=MmYxZ3cRMf1aPrZbGOj6MuIrqtX9lrEqgWklgqY17XE=; b=BmtysKlNWuNaxDQtGIQ5Celqgg6PDuZTgBiXDPEX+TZs46m3oNYA1a4rEHX17y8gOXeJWL A6P/jULKJp00GzYXaFBmwAD2XIywJb/wD/rWHE0N3ab22Xolun7fSofbHTe18iqBQWyETK fj55TcsVUO2PgqDVFZccFA8oGI/54wcbE9q3G49s5/tOUseGNCPozzw3d4hvq1Iv/wCXj7 O/S/HMSMkiksY4nUgpZATZQQzQ4mGM4DxMog4beK9byvLehXUfI1Zv6/Fcs4vT8wr9z+v3 kY1yEOaH+px/Wl2dvljQ7gdAco4ualqc5sQGSnffZKM9Kpt0lgxuFenR+NKL3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472262; a=rsa-sha256; cv=none; b=JOIq2KXWQGh7mBkHUK00K+Tlgbkyd7qFpIimp0ktB1ofGElfW7PGDP2Vb7HjAyJM4i5FPO a0x0dVNVNfjsdaijN8cO/S7m7G1LfrFHDbYFkbysO8LhHvjDxqF7bmwHtEIVkKIrR7I/3U 72KltNaLEBEBfuYasz6oX4McVKcvIt7ob8fvV02XWOlQXreFayfmNtUnc0iMpHZs3PL+Wd 2tV4zrKpLxj92zmW3W21QmFr9QJoPKXU8ZlEcy0JhKKU+oeD2FcBO9t+mpR7keqAqkBcCX zkZF0cZvNYmTMGpDj629zS0YIuo1olQWZOSZ8STHKWo52dqLO18mx9ziWfVXUQ== 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=1694472262; 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=MmYxZ3cRMf1aPrZbGOj6MuIrqtX9lrEqgWklgqY17XE=; b=efbnY6QCAvhhqrHkVmuU1V2Hz+IwT/DOS0BGVp0spu8uqBu1NKBgpyk32NKrrrAHmPtxwS 2fmODF4fkTkJxGhO3b/fbwSYoj3I1o5r1PFhMg+eAoZzZHyULLEau8HRYqStCr8Yd9oZR8 jk6R8NrDBh2fkjzZk6rhYKfSTaHCdMMkW8siPHsi9EcocWsySSDMoz5k33Dl6ErhBld4yY VH3pbfz5Y+OyGmEjVwfqjApzE1M0f+WBuI5+eb+dCZ1E34PF5/dj0/KYQCg1exLq7Cl+c6 3MaohKNJar00LODA45KVGrjG24VRUQKpY2wkgEVWUX0nVR+XeaBYbm+sFrxJqQ== 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 4Rl1x16x1Sz171N; Mon, 11 Sep 2023 22:44: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 38BMiLKJ073803; Mon, 11 Sep 2023 22:44:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiLR5073800; Mon, 11 Sep 2023 22:44:21 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:21 GMT Message-Id: <202309112244.38BMiLR5073800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a8e364b140dc - stable/13 - g_bio(9): add link to bio(9) 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a8e364b140dcf967f9df208a627e158629ab9bb6 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e364b140dcf967f9df208a627e158629ab9bb6 commit a8e364b140dcf967f9df208a627e158629ab9bb6 Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:11 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:40:33 +0000 g_bio(9): add link to bio(9) This page documents 'struct bio', so this can be helpful with finding or referencing it. Reviewed by: imp, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41252 (cherry picked from commit d441ec1c218991421d08ac4661878ed5c182cd64) --- share/man/man9/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 038ffc95703d..f1c7c2622e86 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1115,7 +1115,8 @@ MLINKS+=fpu_kern.9 fpu_kern_alloc_ctx.9 \ fpu_kern.9 fpu_kern_thread.9 \ fpu_kern.9 is_fpu_kern_thread.9 MLINKS+=g_attach.9 g_detach.9 -MLINKS+=g_bio.9 g_alloc_bio.9 \ +MLINKS+=g_bio.9 bio.9 \ + g_bio.9 g_alloc_bio.9 \ g_bio.9 g_clone_bio.9 \ g_bio.9 g_destroy_bio.9 \ g_bio.9 g_duplicate_bio.9 \ From nobody Mon Sep 11 22:44:22 2023 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 4Rl1x31q2vz4sZpR; Mon, 11 Sep 2023 22:44: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 4Rl1x31Q5pz4Hg6; Mon, 11 Sep 2023 22:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472263; 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=HwYLTUD3xGsOnRCxL76+4jhI7WWRIp1dsXEu+OxnW4o=; b=harB1TQqkZ1VvS9xqjjoubaGCGw0RSEkSMdpyftymbkLxoyZcDNxyb0OWRqL0cjeKIdW3S RNGv0ZDq/aVwZSPfYDwcXraAujHdfAJlZlvX252Bgbg01f9JvvZ5wmj2pSrK9BIZinqqK3 oiYpO/2dkV3efghXscbevSjnf018ic7i2+f5ljJcGiVrTzNm6h5WAwwnyVC4mZjLBZphGb RreZT46BoxHVZScSwHcj9faiV6/qSNbl49y9rIxotWcuH1nkOjKPbIsMpe7iNm1kM0aVXY cF5UhJiE0NH7Q199xzR7HIWMzBaGMr00wTpPs9nZAryjl5wE9PalH37GasDlUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472263; a=rsa-sha256; cv=none; b=VxB8AExmOu+AFHU1rekloIlqMP/EWnj1wbYas+bgIOdVrS5jhWfH/mY1JIo967mJauaZ72 qG8bE3psSWMmHSngGvFoEMZglrW/wb6Vw6Vw8zF6vVd2yBUYsyhmKRY921kJQijvy7qykN oBP1f4vLuUPNHHT/4pxeZPIJdh1PdKJ884Lo99QL3wczGL4SaOd1E3aiOh88v/xpc17uYl naa6P0VF1VFCw92gr+JMWVMJ8hO0Tn1OVRL/sJErdgL3eTMqmuGYplr1gVPcAJcCjkLxBx CoP7aBKfVJsmpfyHVb+6IPw6DWrS60zsh9HKGF/mtPCXWHCUbiMD4oUbjXSYqA== 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=1694472263; 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=HwYLTUD3xGsOnRCxL76+4jhI7WWRIp1dsXEu+OxnW4o=; b=PZhX/2yOyh6ibfh8nTcW+ItAamUTDyWmSjPYBC6cgh1hgtWX9+R1kfAqwAofsLXC+kCoW8 e81fMEqd240mRf4CFZU/5sTt84RWSzsnINrY912hevIb9YpLJ/cPgXfnuLrXv12+qMKGSP 5njKtthYV95Ik5y0rurNqVmUmDabpsAKJl5tbwv6tJlrrm1GlknBQ/DgTrFGuhvcUn2Ltp 51JgmbX/2HjPpu40lAzl/PgJY7Jg3RGSXMK8vlajQylUBebzkKa/6PpGzom/0n81h2I5PT ErVIt+E+10mQa+/u0tqKYxknl0TvDpm/WRmYVxSAmEoB4n8fLIZwa/me1ZLgCA== 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 4Rl1x30Vh1z16PL; Mon, 11 Sep 2023 22:44: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 38BMiMU7073848; Mon, 11 Sep 2023 22:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiMN4073845; Mon, 11 Sep 2023 22:44:22 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:22 GMT Message-Id: <202309112244.38BMiMN4073845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: aa26195de58d - stable/13 - sys/README.md: Add a section for documentation 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa26195de58d6dc8e3d989ec50f1c5934c3f0e22 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=aa26195de58d6dc8e3d989ec50f1c5934c3f0e22 commit aa26195de58d6dc8e3d989ec50f1c5934c3f0e22 Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:17 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:40:33 +0000 sys/README.md: Add a section for documentation Add web links to intro(9) and the Architecture Handbook. Reviewed by: lwhsu, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41253 (cherry picked from commit 32e47f62724e6cce2df0bc69d6ceba2d058d3585) --- sys/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/README.md b/sys/README.md index ad7ff9efa578..5836ade3deaa 100644 --- a/sys/README.md +++ b/sys/README.md @@ -9,6 +9,17 @@ architecture. `GENERIC` is the configuration used in release builds. `NOTES` contains documentation of all possible entries. `LINT` is a compile-only configuration used to maximize build coverage and detect regressions. +Documentation: +-------------- + +Source code documentation is maintained in a set of man pages, under section 9. +These pages are located in [`share/man/man9`](../share/man/man9), from the +top-level of the src tree. Consult [`intro(9)`](https://man.freebsd.org/intro/9) +for an overview of existing pages. + +Some additional high-level documentation of the kernel is maintained in the +[Architecture Handbook](https://docs.freebsd.org/en/books/arch-handbook/). + Source Roadmap: --------------- | Directory | Description | From nobody Mon Sep 11 22:44:24 2023 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 4Rl1x42s1Cz4sZlt; Mon, 11 Sep 2023 22:44: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 4Rl1x42Kjtz4HdL; Mon, 11 Sep 2023 22:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472264; 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=NY5Izn2bThZpH8gAEjukFSQMMaEGkPvVFDr/4qPLNMo=; b=ZkpPrDyDLLJirtBSVM6D9iwMQ7KN56R5w4/ql27Gbj2BM1TM0Ctc3yJpoFTRnumGB1wqmj vmGtwk7zvAE+BLlPa+6hHeMjndsmGmxr2ntpn8PoU1f7s6Ig98yKWUVvS/Rhlvn5lnckLH g4cDvAI1EBkKsf32qjMdbVjF09YJK+gyJyoRjYDgmaIN//g8uNgyNWiB98Oy920Fxrglzj UFJ7v9xhfFj1tT146zYYLf1VS5qTXmyffei4daIm5I3q72ElMvCoCCHaEF+T6lX2BOAokk TKx1Y18etcxJLOhM2kwUhKlhVxSB/g7XUfRgms2nb4dU34qMbq5+kuQ4sQ5fpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472264; a=rsa-sha256; cv=none; b=pkAgzueUNWaomao+CyolC31o1Bqs7qc99KvWbJE74lZnP2JOJDMOHZPvNL3/O8nGOUR8F9 DCmJRut9pJ7Hrqev+AGzHTbnhr0d0/iDnbr/uyFBLnosdS2WkTXHLxgsTVAiO5sDj+nHPo ed7Xo90OIdNsakOe7jlT8kM3FechdiBF6Ckw6s/MLaKYpGeBu9cWspiLb5HYzSB9Arj2eb 4Fu55PqH3cpMFyH3UoE3tpvHDjaelASkfirhcC7lIgQrdZ7TWOYCU4QX8RfcHm3v9/+FAU vz4sZYia63iAVC8h0Nl2c9Dn+IAC9uVeswOtlipgoQ3taYPu9YP5ZwRRN2Dl6g== 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=1694472264; 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=NY5Izn2bThZpH8gAEjukFSQMMaEGkPvVFDr/4qPLNMo=; b=xGEEJbi9Fukqkm64xp+pE1Gj/SO8OESrVh2V5nW4Ki3VMoSN2bAbPh+sQIKYEA/u0vNL49 MjGkisF6t+JX1oQr2vjkFaIRzR1AzoTNqUQL/vSzKDfUzdLJuCBSeNJkXEodAgGdLJ2fqd 7VB82hGWuWprVpdXm/krG7O65WxBfQrLIq03BinEryR/SRfvi0sK47zYCrbuOUOnP/0oGu /a5grw1I7iWRLT8GHzp6DjcshMfW6TtzGmJTywdJVgPlxOoF6z6IvLpcXDR4ZIIzdlhiZO +okCRKBpqkbkEMAaTEYTEkPg9FYR+JjYz8yOMFkPiy/aV4cpflH6XkCBAQMVQw== 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 4Rl1x41FDZz16yx; Mon, 11 Sep 2023 22:44: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 38BMiOPr073891; Mon, 11 Sep 2023 22:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiORv073888; Mon, 11 Sep 2023 22:44:24 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:24 GMT Message-Id: <202309112244.38BMiORv073888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5a0c410787b8 - stable/13 - intro(9): rewrite from scratch 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a0c410787b8b2f92a0c3f6126c95ffe34de344c Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5a0c410787b8b2f92a0c3f6126c95ffe34de344c commit 5a0c410787b8b2f92a0c3f6126c95ffe34de344c Author: Mitchell Horne AuthorDate: 2023-08-03 13:48:15 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:42:15 +0000 intro(9): rewrite from scratch This page has existed as a placeholder since its creation in 1995. It does not provide a useful introduction to the content in this section. Reimagine it as a top-level overview page containing brief descriptions and links to existing pages in section 9. It is roughly organized into sub-sections, grouped by topic or subsystem. In other words, the page is meant to function as a map to other content. There is a balance to be found here between providing as many links as possible and keeping the page concise and searchable. In general the aim is to reference pages which provide the best entry point to a particular topic. For example, a link is given to locking(9), but not to the specific lock pages such as mutex(9) or rwlock(9). NetBSD has done something similar with their intro(9), so some inspiration has been taken from there, although their content doesn't align that closely with what we have. I have done a thorough review of our existing pages and formed these subsections around them, but they are meant to evolve. PR: 270481 Reviewed by: imp, emaste MFC after: 3 weeks Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41104 (cherry picked from commit 84f9f2c5cf7841fffc03ccb1833814892ae15132) --- share/man/man9/intro.9 | 594 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 505 insertions(+), 89 deletions(-) diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9 index 4777ee2b8504..458ee0ab4697 100644 --- a/share/man/man9/intro.9 +++ b/share/man/man9/intro.9 @@ -1,103 +1,519 @@ -.\" Copyright (c) 1983, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. .\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" Copyright (c) 2023 The FreeBSD Foundation .\" -.Dd December 13, 1995 +.\" This manual page was written by Mitchell Horne under +.\" sponsorship from the FreeBSD Foundation. +.\" +.Dd August 2, 2023 .Dt INTRO 9 .Os .Sh NAME .Nm intro -.Nd "introduction to system kernel interfaces" +.Nd "introduction to kernel programming interfaces" .Sh DESCRIPTION -This section contains information about the interfaces and -subroutines in the kernel. -.Sh PROTOTYPES ANSI-C AND ALL THAT -Yes please. -.Pp -We would like all code to be fully prototyped. -.Pp -If your code compiles cleanly with -.Nm cc -.Ar -Wall -we would feel happy about it. -It is important to understand that this is not a question of just shutting up -.Nm cc , -it is a question about avoiding the things it complains about. -To put it bluntly, do not hide the problem by casting and other -obfuscating practices, solve the problem. -.Sh INDENTATION AND STYLE -Believe it or not, there actually exists a guide for indentation and style. -It is not generally applied though. -.Pp -We would appreciate if people would pay attention to it, and at least not -violate it blatantly. -.Pp -We do not mind it too badly if you have your own style, but please make -sure we can read it too. -.Pp -Please take time to read +Welcome to the +.Fx +kernel documentation. +Outside of the source code itself, this set of +.Xr man 1 +pages is the primary resource for information on usage of the numerous +programming interfaces available within the kernel. +In some cases, it is also a source of truth for the implementation details +and/or design decisions behind a particular subsystem or piece of code. +.Pp +The intended audience of this documentation is developers, and the primary +authors are also developers. +It is written assuming a certain familiarity with common programming or +OS-level concepts and practices. +However, this documentation should also attempt to provide enough background +information that readers approaching a particular subsystem or interface for +the first time will be able to understand. +.Pp +To further set expectations, we acknowledge that kernel documentation, like the +source code itself, is forever a work-in-progress. +There will be large sections of the codebase whose documentation is subtly or +severely outdated, or missing altogether. +This documentation is a supplement to the source code, and can not always be +taken at face value. +.Pp +At its best, section 9 documentation will provide a description of a particular +piece of code that, paired with its implementation, fully informs the reader of +the intended and realized effects. +.Pp +.Xr man 1 +pages in this section most frequently describe functions, but may also +describe types, global variables, macros, or high-level concepts. +.Sh CODING GUIDELINES +Code written for the +.Fx +kernel is expected to conform to the established style and coding conventions. +Please see .Xr style 9 -for more information. -.Sh NAMING THINGS -Some general rules exist: -.Bl -enum -.It -If a function is meant as a debugging aid in DDB, it should be enclosed -in -.Bd -literal -offset indent -#ifdef DDB - -#endif /* DDB */ +for a detailed set of rules and guidelines. +.Sh OVERVIEW +Below is presented various subsystems. +.Ss Data Structures +There are implementations for many well-known data structures available in the +kernel. +.Bl -tag -width "Xr bitstring 3" +.It Xr bitstring 3 +Simple bitmap implementation. +.It Xr counter 9 +An SMP-safe general-purpose counter implementation. +.It Xr hash 9 +Hash map implementation. +.It Xr nv 9 +Name/value pairs. +.It Xr queue 3 +Singly-linked and doubly-linked lists, and queues. +.It Xr refcount 9 +An SMP-safe implementation of reference counts. +.It Xr sbuf 9 +Dynamic string composition. +.It Xr sglist 9 +A scatter/gather list implementation. +.El +.Ss Utility Functions +Functions or facilities of general usefulness or convenience. +See also the +.Sx Testing and Debugging Tools +or +.Sx Miscellaneous +sub-sections below. +.Pp +Formatted output and logging functions are described by +.Xr printf 9 . +.Pp +Endian-swapping functions: +.Xr byteorder 9 . +.Pp +Data output in hexadecimal format: +.Xr hexdump 9 . +.Pp +A rich set of macros for declaring +.Xr sysctl 8 +variables and functions is described by +.Xr sysctl 9 . +.Pp +Non-recoverable errors in the kernel should trigger a +.Xr panic 9 . +Run-time assertions can be verified using the +.Xr KASSERT 9 +macros. +Compile-time assertions should use +.Fn _Static_assert . +.Pp +The SYSINIT framework provides macros for declaring functions that will be +executed during start-up and shutdown; see +.Xr SYSINIT 9 . +.Pp +Deprecation messages may be emitted with +.Xr gone_in 9 . +.Pp +A unit number facility is provided by +.Xr unr 9 . +.Ss Synchronization Primitives +The +.Xr locking 9 +man page gives an overview of the various types of locks available in the +kernel and advice on their usage. +.Pp +Atomic primitives are described by +.Xr atomic 9 . +.Pp +The +.Xr epoch 9 +and +.Xr smr 9 +facilities are used to create lock-free data structures. +There is also +.Xr seqc 9 . +.Ss Memory Management +Dynamic memory allocations inside the kernel are generally done using +.Xr malloc 9 . +Frequently allocated objects may prefer to use +.Xr uma 9 . +.Pp +.\" MHTODO: It would be useful to have a vm_page(9) or similar +.\" high-level page which points to the following contents instead. +Much of the virtual memory system operates on +.Vt vm_page_t +structures. +The following functions are documented: +.Bd -ragged -offset indent +.Xr vm_page_advise 9 , +.Xr vm_page_alloc 9 , +.Xr vm_page_bits 9 , +.Xr vm_page_aflag 9 , +.Xr vm_page_alloc 9 , +.Xr vm_page_bits 9 , +.Xr vm_page_busy 9 , +.Xr vm_page_deactivate 9 , +.Xr vm_page_free 9 , +.Xr vm_page_grab 9 , +.Xr vm_page_insert 9 , +.Xr vm_page_lookup 9 , +.Xr vm_page_rename 9 , +.Xr vm_page_sbusy 9 , +.Xr vm_page_wire 9 +.Ed +.Pp +Virtual address space maps are managed with the +.Xr vm_map 9 +API. +.Pp +The machine-dependent portion of the virtual memory stack is the +.Xr pmap 9 +module. +.Pp +Allocation policies for NUMA memory domains are managed with the +.Xr domainset 9 +API. +.Ss File Systems +The kernel interface for file systems is +.Xr VFS 9 . +File system implementations register themselves with +.Xr vfsconf 9 . +.Pp +The abstract and filesystem-independent representation of a file, directory, or +other file-like entity within the kernel is the +.Xr vnode 9 . +.Pp +The implementation of access control lists for filesystems is described by +.Xr acl 9 . +Also +.Xr vaccess 9 . +.Ss I/O and Storage +.\" TODO: This page needs to be rewritten before it can be included here. +.\" The buffer cache is described by: +.\" .Xr buf 9 +.\" .Pp +The GEOM framework represents I/O requests using the +.Xr bio 9 +structure. +.Pp +Disk drivers connect themselves to GEOM using the +.Xr disk 9 +API. +.Pp +The +.Xr devstat 9 +facility provides an interface for recording device statistics in disk drivers. +.Ss Networking +Much of the networking stack uses the +.Xr mbuf 9 , +a flexible memory management unit commonly used to store network packets. +.Pp +Network interfaces are implemented using the +.Xr ifnet 9 +API, which has functions for drivers and consumers. +.Pp +A framework for managing packet output queues is described by +.Xr altq 9 . +.Pp +To receive incoming packets, network protocols register themselves with +.Xr netisr 9 . +.Pp +Virtualization of the network stack is provided by +.Xr VNET 9 . +.Pp +The front-end for interfacing with network sockets from within the kernel is +described by +.Xr socket 9 . +The back-end interface for socket implementations is +.Xr domain 9 . +.Pp +The low-level packet filter interface is described by +.Xr pfil 9 . +.Pp +The +.Xr bpf 9 +interface provides a mechanism to redirect packets to userspace. +.Pp +The subsystem for IEEE 802.11 wireless networking is described by +.Xr ieee80211 9 . +.Pp +A framework for modular TCP implementations is described by +.Xr tcp_functions 9 . +.Pp +A framework for modular congestion control algorithms is described by +.Xr mod_cc 9 . +.Ss Device Drivers +.\" TODO: a bus(9) or newbus(9) page, as well as updates to existing pages +.\" would be helpful in laying out the high-level concepts of FreeBSD's device +.\" structure, and explaining the organization of existing documentation. +Consult the +.Xr device 9 +and +.Xr driver 9 +pages first. +.Pp +Most drivers act as devices, and provide a set of methods implementing the +device interface. +This includes methods such as +.Xr DEVICE_PROBE 9 , +.Xr DEVICE_ATTACH 9 , +and +.Xr DEVICE_DETACH 9 . +.Pp +In addition to devices, there are buses. +Buses may have children, in the form of devices or other buses. +Bus drivers will implement additional methods, such as +.Xr BUS_ADD_CHILD 9 , +.Xr BUS_READ_IVAR 9 , +or +.Xr BUS_RESCAN 9 . +.Pp +Buses often perform resource accounting on behalf of their children. +For this there is the +.Xr rman 9 +API. +.Pp +Drivers can request and manage their resources (e.g. memory-space or IRQ +number) from their parent using the following sets of functions: +.Bd -ragged -offset indent +.Xr bus_alloc_resource 9 , +.Xr bus_adjust_resource 9 , +.Xr bus_get_resource 9 , +.Xr bus_map_resource 9 , +.Xr bus_release_resource 9 , +.Xr bus_set_resource 9 .Ed .Pp -And the name of the procedure should start with the prefix -.Li DDB_ -to clearly identify the procedure as a debugger routine. +Direct Memory Access (DMA) is handled using the +.Xr busdma 9 +framework. +.Pp +Functions for accessing bus space (i.e. read/write) are provided by +.Xr bus_space 9 . +.Ss Clocks and Timekeeping +The kernel clock frequency and overall system time model is described by +.Xr hz 9 . +.Pp +A few global time variables, such as system up-time, are described by +.Xr time 9 . +.Pp +Raw CPU cycles are provided by +.Xr get_cyclecount 9 . +.Ss Userspace Memory Access +Direct read/write access of userspace memory from the kernel is not permitted, +and memory transactions that cross the kernel/user boundary must go through one +of several interfaces built for this task. +.Pp +Most device drivers use the +.Xr uiomove 9 +set of routines. +.Pp +Simpler primitives for reading or writing smaller chunks of memory are +described by +.Xr casuword 9 , +.Xr copy 9 , +.Xr fetch 9 , +and +.Xr store 9 . +.Ss Kernel Threads, Tasks, and Callbacks +Kernel threads and processes are created using the +.Xr kthread 9 +and +.Xr kproc 9 +interfaces, respectively. +.Pp +Where dedicated kernel threads are too heavyweight, there is also the +.Xr taskqueue 9 +interface. +.Pp +For low-latency callback handling, the +.Xr callout 9 +framework should be used. +.Pp +Dynamic handlers for pre-defined event hooks are registered and invoked using +the +.Xr EVENTHANDLER 9 +API. +.Ss Thread Switching and Scheduling +The machine-independent interface to a context switch is +.Xr mi_switch 9 . +.Pp +To prevent preemption, use a +.Xr critical 9 +section. +.Pp +To voluntarily yield the processor, use +.Xr kern_yield 9 . +.Pp +The various functions which will deliberately put a thread to sleep are +described by +.Xr sleep 9 . +Sleeping threads are removed from the scheduler and placed on a +.Xr sleepqueue 9 . +.\" TODO: This page is outdated and can't be included here yet. +.\".Pp +.\"The thread scheduler interface is described by +.\".Xr scheduler 9 . +.Ss Processes and Signals +To locate a process or process group by its identifier, use +.Xr pfind 9 +and +.Xr pgfind 9 . +Alternatively, the +.Xr pget 9 +function provides additional search specificity. +.Pp +The "hold count" of a process can be manipulated with +.Xr PHOLD 9 . +.Pp +The kernel interface for signals is described by +.Xr signal 9 . +.Pp +Signals can be sent to processes or process groups using the functions +described by +.Xr psignal 9 . +.Ss Security +See the generic security overview in +.Xr security 7 . +.Pp +The basic structure for user credentials is +.Vt struct ucred , +managed by the +.Xr ucred 9 +API. +Thread credentials are verified using +.Xr priv 9 +to allow or deny certain privileged actions. +.Pp +Policies influenced by +.Va kern.securelevel +must use the +.Xr securelevel_gt 9 +or +.Xr securelevel_ge 9 +functions. +.Pp +The Mandatory Access Control (MAC) framework provides a wide set of hooks, +supporting dynamically-registered security modules; +see +.Xr mac 9 . +.Pp +Cryptographic services are provided by the OpenCrypto framework. +This API provides and interface for both consumers and crypto drivers; +see +.Xr crypto 9 . +.Pp +For information on random number generation, see +.Xr random 9 +and +.Xr prng 9 . +.Ss Kernel Modules +The interfaces for declaring loadable kernel modules are described by +.Xr module 9 . +.Ss Interrupts +The machine-independent portion of the interrupt framework supporting the +registration and execution of interrupt handlers is described by +.Xr intr_event 9 . +.Pp +Software interrupts are provided by +.Xr swi 9 . +.Pp +Device drivers register their interrupt handlers using the +.Xr bus_setup_intr 9 +function. +.Ss Testing and Debugging Tools +A kernel test framework: +.Xr kern_testfrwk 9 +.Pp +A facility for defining configurable fail points is described by +.Xr fail 9 . +.Pp +Commands for the +.Xr ddb 4 +kernel debugger are defined with the +.Xr DB_COMMAND 9 +family of macros. +.Pp +The +.Xr ktr 4 +tracing facility adds static tracepoints to many areas of the kernel. +These tracepoints are defined using the macros described by +.Xr ktr 9 . +.Pp +Static probes for DTrace are defined using the +.Xr SDT 9 +macros. +.Pp +Stack traces can be captured and printed with the +.Xr stack 9 +API. +.Pp +Kernel sanitizers can perform additional compiler-assisted checks against +memory use/access. +These runtimes are capable of detecting difficult-to-identify classes of bugs, +at the cost of a large overhead. +Supported is the Kernel Address Sanitizer +.Xr KASAN 9 , +and the Kernel Memory Sanitizer +.Xr KMSAN 9 . +.Pp +The +.Cd LOCK_PROFILING +kernel config option enables extra code to assist with profiling and/or +debugging lock performance; +see +.Xr LOCK_PROFILING 9 . +.Ss Driver Tools +Defined functions/APIs for specific types of devices. +.Bl -tag -width "Xr usbdi 9" +.It Xr iflib 9 +Programming interface for +.Xr iflib 4 +based network drivers. +.It Xr pci 9 +Peripheral Component Interconnect (PCI) and PCI Express (PCIe) programming API. +.It Xr pwmbus 9 +Pulse-Width Modulation (PWM) bus interface methods. +.It Xr usbdi 9 +Universal Serial Bus programming interface. +.It Xr superio 9 +Functions for Super I/O controller devices. .El -.Sh SCOPE OF SYMBOLS -It is important to carefully consider the scope of symbols in the kernel. -The default is to make everything static, unless some reason requires -the opposite. -.Pp -There are several reasons for this policy, -the main one is that the kernel is one monolithic name-space, -and pollution is not a good idea here either. -.Pp -For device drivers and other modules that do not add new internal interfaces -to the kernel, the entire source should be in one file if possible. -That way all symbols can be made static. -.Pp -If for some reason a module is split over multiple source files, then try -to split the module along some major fault-line and consider using the -number of global symbols as your guide. -The fewer the better. +.Ss Miscellaneous +Dynamic per-CPU variables: +.Xr dpcpu 9 . +.Pp +CPU bitmap management: +.Xr cpuset 9 . +.Pp +Kernel environment management: +.Xr getenv 9 . +.Pp +Contexts for CPU floating-point registers are managed by the +.Xr fpu_kern 9 +facility. +.Pp +For details on the shutdown/reboot procedure and available shutdown hooks, see +.Xr reboot 9 . +.Pp +A facility for asynchronous logging to files from within the kernel is provided +by +.Xr alq 9 . +.Pp +The +.Xr osd 9 +framework provides a mechanism to dynamically extend core structures in a way +that preserves KBI. +See the +.Xr hhook 9 +and +.Xr khelp 9 +APIs for information on how this is used. +.Pp +The kernel object implementation is described by +.Xr kobj 9 . .Sh SEE ALSO +.Xr man 1 , .Xr style 9 -.Sh HISTORY -The -.Nm -section manual page appeared in -.Fx 2.2 . +.Rs +.%T "The FreeBSD Architecture Handbook" +.%U "https://docs.freebsd.org/en/books/arch-handbook/" +.Re From nobody Mon Sep 11 22:44:25 2023 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 4Rl1x542p2z4sZg6; Mon, 11 Sep 2023 22:44: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 4Rl1x537xgz4HYV; Mon, 11 Sep 2023 22:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472265; 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=vhVhPHXOd+oJN4rUSZHQIMSSJvRsvza5glvBTWXSwJc=; b=cYD+z70czbhcyRMQ+c545zz2dCpHWnvkzgWMlCviBTU5dcBMCFQ4eIqVae4AvMWW0SI1v3 JavH666qXM7dzGSJJrp+31MEYKozlEbxyjQC5PALlbyUrpqBIwZERpfcybCmkQE5B6VWW9 Bx4En6XiCGr1tSZjUz9OB3X7RB5Cu+v21+764slUgeWTrXXdtEFo8rULS8WlaoN/y5ghAe XgLMdXg3Z3/fH7/IUNITrjjwKQppmvVSdBFa1RM9NkO05b6z8dUYg+8XfW3aqul3gYXAPh l5zPQ1RzKN4nzrhJKCmlDetbaYTNw/ax6lGuIEQFpipEiucuCXmfkGIiXm518g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472265; a=rsa-sha256; cv=none; b=VLlZ9g9iqSVtUVTtyegz5HjoB1uYKh4YujOOzdN2RMUL+xvBNjOsNXnhUVCOc2v2QYJc1Z +LE0tp0rQH57txuO62mvPz8bBF/boWA0A84y2ZuJej0YU4jkK8PNQiDD8m9nxXp6N6lbb+ bPTXp6pW90uPOg0g+sJOdyNPWzRrKlK19vjtadeeIU12Cqw776qHbWvQ5Jw+8ijM12zxpF PQs2A6H8rgn+nW4pssnEME8hgpIgtcHPP/cgtJJtaNgXjLKmgMlkCqtw/DpCR8AbAAZdMW IXdaz6DGcQ9L/Dj/84erz5AtUzv0TN7Gpel+vkR/IDSVV6gyLvVHZ1sRU1yoIQ== 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=1694472265; 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=vhVhPHXOd+oJN4rUSZHQIMSSJvRsvza5glvBTWXSwJc=; b=j0kWQ62c8cV5Bpx/eDErTPEmBpH/mLkxrujUFa7sfmfECZn5zvfKi41KZKjyIRY3pNzMk5 Gbvde4yWcZKXFOdsUOrxZHhOUU80Dw+bstjbzKva0+CKwUvH2uGs3dNk5oY0vbN4mknEfd xz6rCTGQGt7oBh3HLWkr599w+kSfkoZJoiBPFv5lyr17agRWPwyFNXRSWtk27ywZB311le sIPUajLyj3BGXMLQv92AlbRd5vChyfKfhkcdnT9nYLHsstN0Pis0kW0XxQU5ycRUi+D17Q zawWfDIf6itphYisJA+f2ZX5wicB1f2l/HKKrWwispupsCgQK3cbVMXo2TJ8Ow== 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 4Rl1x52DBdz16PM; Mon, 11 Sep 2023 22:44: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 38BMiPBE073930; Mon, 11 Sep 2023 22:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiPLI073927; Mon, 11 Sep 2023 22:44:25 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:25 GMT Message-Id: <202309112244.38BMiPLI073927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: dd70f2b48c9c - stable/13 - hwpmc_arm64: plug memory leak 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd70f2b48c9c0235e52721c2a6930285c3b6939e Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dd70f2b48c9c0235e52721c2a6930285c3b6939e commit dd70f2b48c9c0235e52721c2a6930285c3b6939e Author: Mitchell Horne AuthorDate: 2023-08-03 14:09:48 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:43:59 +0000 hwpmc_arm64: plug memory leak Free allocated per-CPU structures in the pcpu_fini and finalize methods. While here, add debug trace entries to these methods. Reviewed by: jkoshy, andrew MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41268 (cherry picked from commit 8bdceaecabd91ce5ed23646d91cef878681e19d6) --- sys/dev/hwpmc/hwpmc_arm64.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index f0a487cf7d21..65f55108cecb 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -452,7 +452,7 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[arm64,%d] wrong cpu number %d", __LINE__, cpu)); - PMCDBG1(MDP, INI, 1, "arm64-init cpu=%d", cpu); + PMCDBG0(MDP, INI, 1, "arm64-pcpu-init"); arm64_pcpu[cpu] = pac = malloc(sizeof(struct arm64_cpu), M_PMC, M_WAITOK | M_ZERO); @@ -493,10 +493,16 @@ arm64_pcpu_fini(struct pmc_mdep *md, int cpu) { uint32_t pmcr; + PMCDBG0(MDP, INI, 1, "arm64-pcpu-fini"); + pmcr = arm64_pmcr_read(); pmcr &= ~PMCR_E; arm64_pmcr_write(pmcr); + free(arm64_pcpu[cpu]->pc_arm64pmcs, M_PMC); + free(arm64_pcpu[cpu], M_PMC); + arm64_pcpu[cpu] = NULL; + return (0); } @@ -588,5 +594,7 @@ pmc_arm64_initialize(void) void pmc_arm64_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "arm64-finalize"); + free(arm64_pcpu, M_PMC); } From nobody Mon Sep 11 22:44:26 2023 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 4Rl1x66LQpz4sZkL; Mon, 11 Sep 2023 22:44: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 4Rl1x640dPz4Hml; Mon, 11 Sep 2023 22:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694472266; 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=D8lPO/SpbDq2wdt+5GrCnGX4+vuGTfNTeqVg/VxVD7c=; b=gKTbsdUvma1NwU9hNBWOIZAaDoZ94Z1l1Q1tHLrRs2kncAxlA77VHt31t0jT2IomLyGfs5 6EdFxHPonPr2KfthuweWqRYpHms/wIiyHqslyYdo8ueIs/RFU6CPuqVrDABm7F0dAAsLET TRZyAIcs3qyGaEdEqj+4u05mBd06YPt3J4a5vd6v2H+ebLhranJCA6ir1UkW0qDJjSHiYR pMpBuVQqafdzWLuuiiDw7swq56IgsuWc3G3yArH/d2dKXcWRdbVHUqmAfnpAl7C4bhSTvD v1KdK5nA8DEZbex0bNZAD4yCrDRRadG3i7LiykGzkesDtX2f++IzZKPiK7CliQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694472266; a=rsa-sha256; cv=none; b=rx98RGNuxk3XoHunq+/YtZtpadja7428KrRtLGRyGpGLFxYNFY7b/4cLS1/200RyKN5mOh Fxvwp0jewLOkgdt6t2zhJ80IiqFTRYODPXQetbSygzjOh86RKiVWuYTkFZ5SHsBiRCkSdn CXDcm87K4JlZpBjECqjZ84J2cc2fUXZenWJbShy4ULAHAzVEG4TFAvH9PebL59S5WajAnw f48DgJNrqtZFrzwOPJsz0H4gMnnhFBIWd0B2DqLFrA4UogQcbijEqMf6TyLHC1A8DK9t+b E6uhX9RwTeO9NVwofG1cN1dSU/NwTx1CRkAuflL2m+EjugJynN1KwjI5csC+3w== 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=1694472266; 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=D8lPO/SpbDq2wdt+5GrCnGX4+vuGTfNTeqVg/VxVD7c=; b=Y6YRD3PKnsw3Ig4hsc84M2mzKCXpODGiPW1WqLaEMTyaAsA6Lb7hr4FirZFW1FvcNgdJ0I nN9rdp7y1+HODtpcarfx3UTpL51I6T+o9Z4XbFocwtOzSAuLCd4y6QAx6pALt90SY4xihe W0tgpBKzC9IJiNc7dT2JR6K7FkgaOglnPEwTvPH4vvHm6bmb/FX7N7uN1lVNsa6CrYZ2yz Jv44nbALNAh8OrSrRW0UZQ2+e3baKfpexorjxw25kEPg74pcqE622Xxk/iOcxeRUJpm/Mf 95zaC6L8v2Dp/cM+EElsClauR9IGCVUWkMNUzsxq85mTgt+KdqYw1YPN+fXNvQ== 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 4Rl1x630pXz16h2; Mon, 11 Sep 2023 22:44: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 38BMiQpo073969; Mon, 11 Sep 2023 22:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BMiQP8073966; Mon, 11 Sep 2023 22:44:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:44:26 GMT Message-Id: <202309112244.38BMiQP8073966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9f66a42db74e - stable/13 - hwpmc_armv7: plug memory leak 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f66a42db74ed703f4b590d3e8037ba982f2af20 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9f66a42db74ed703f4b590d3e8037ba982f2af20 commit 9f66a42db74ed703f4b590d3e8037ba982f2af20 Author: Mitchell Horne AuthorDate: 2023-08-03 14:10:26 +0000 Commit: Mitchell Horne CommitDate: 2023-09-11 22:43:59 +0000 hwpmc_armv7: plug memory leak Free allocated per-CPU structures in the pcpu_fini and finalize methods. While here, add debug trace entries to these methods. Reviewed by: jkoshy, andrew MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41269 (cherry picked from commit 9c0a2d522f3a18fc795a7dd6266d2be2aff4b084) --- sys/dev/hwpmc/hwpmc_armv7.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_armv7.c b/sys/dev/hwpmc/hwpmc_armv7.c index fb4292792bb9..43c662dfcd39 100644 --- a/sys/dev/hwpmc/hwpmc_armv7.c +++ b/sys/dev/hwpmc/hwpmc_armv7.c @@ -417,7 +417,7 @@ armv7_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[armv7,%d] wrong cpu number %d", __LINE__, cpu)); - PMCDBG1(MDP, INI, 1, "armv7-init cpu=%d", cpu); + PMCDBG0(MDP, INI, 1, "armv7-pcpu-init"); armv7_pcpu[cpu] = pac = malloc(sizeof(struct armv7_cpu), M_PMC, M_WAITOK|M_ZERO); @@ -453,6 +453,8 @@ armv7_pcpu_fini(struct pmc_mdep *md, int cpu) { uint32_t pmnc; + PMCDBG0(MDP, INI, 1, "armv7-pcpu-fini"); + pmnc = cp15_pmcr_get(); pmnc &= ~ARMV7_PMNC_ENABLE; cp15_pmcr_set(pmnc); @@ -462,6 +464,10 @@ armv7_pcpu_fini(struct pmc_mdep *md, int cpu) cp15_pminten_clr(pmnc); cp15_pmovsr_set(pmnc); + free(armv7_pcpu[cpu]->pc_armv7pmcs, M_PMC); + free(armv7_pcpu[cpu], M_PMC); + armv7_pcpu[cpu] = NULL; + return 0; } @@ -532,5 +538,7 @@ pmc_armv7_initialize(void) void pmc_armv7_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "armv7-finalize"); + free(armv7_pcpu, M_PMC); } From nobody Mon Sep 11 23:36:28 2023 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 4Rl3591zTwz4t8HB; Mon, 11 Sep 2023 23: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 4Rl3591X5Bz4ZLr; Mon, 11 Sep 2023 23: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=1694475389; 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=rOoBbOL2DqHHCur+ZHFl82IaQlpifIlZtVCT79icGjY=; b=FsTy2D8IPIyZkGmaZHKvyDdi39m7vjMnnhjvgYTr7LIM62T4lr3MLhLA5nWo+8VkXU0VSh NNwu/oz8XkgsFRvkYV/XLkchjI6QbAeom2uM+Fm7Cmu843w8B2e6ve+seshnq2IwU70FHd RnJ93lv61J3WkxzDtyzXmR+kuksTldA5XHEBeNPilGV1kg/8dm1ltSA6ScgkG3A0EQR92P OfHpQZWPx2e7BH3YcmcPJkmExBzZfx5R3vaJ0YAqzth2eYZiyNLmx585GwDlXbYueL1Mk2 1+2BQ3UmT+Z9NHWrqu60mwM3akdNVcakqIerzSW3+m32QJmYjlcIEVZswRLxKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694475389; a=rsa-sha256; cv=none; b=vnarofGas/ViCX2O/mD9Bc1EVgy0piSR6nzfGIpT5a89OC9QRE2yGu4Ip3zA4I58zIrZd9 r8ks6py0aItiV9gz8OQPeMIq8YA6AbxnEErgDGkzWC3enFwJR/TFP/rn8iWA7W3fi0THjI ATuoyuXYpaYa8Wc3h4Sfqvl/dCdLInd+6s1SYxOXalPFVNyGTWiimu7aTyLWqRBXyPn514 KVSFlYYYYb2E+VjHkWt+JCv5lz2BL2AwUcOtEWZeFv4m2X7wl78X9fWZF2NrWaATvHhctS ghiOeqhjuaXDSCJeX8bHhxm2SHJVMJx2HRePRbRH5hVD+/LvnZ33NhYWY6nRJw== 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=1694475389; 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=rOoBbOL2DqHHCur+ZHFl82IaQlpifIlZtVCT79icGjY=; b=ogOvBxuh35d61v1fZWvwfVT99NRWnZIL5jBCyypGiWlt9PvtgRR+zZ588ZPXywXqpWbwKM 8ktGloXWVQjrvhumlUlVdLY4HRPERInhJXbb3+C8pG4/VqghaP2g353MI0kIVkbmKgHw4x 2t6XGSBjLO0u/44SqXx3tT+bhqEUaLVW6ALYs1ZenPt1RFFtCIhF0vtI3tQ1eNo2uC8NDT ljdfWiH0k/zPm0wRd2l09EQCQ7bVFTGPwSGSCi2DPhqg2IjBhoK2kw4Krisek5TIJQwWXf NLYTegs25cVmwG3mKHRBg0iSTGFLgoEHrFRIjsX24eDZwprgZkSY8z2oy3ZMPw== 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 4Rl3590bNNz17Hg; Mon, 11 Sep 2023 23: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 38BNaSVV057021; Mon, 11 Sep 2023 23: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 38BNaSJX057018; Mon, 11 Sep 2023 23:36:28 GMT (envelope-from git) Date: Mon, 11 Sep 2023 23:36:28 GMT Message-Id: <202309112336.38BNaSJX057018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 34cffc25b720 - releng/14.0 - Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 34cffc25b7207331e104dc561bdd2097fef6e661 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=34cffc25b7207331e104dc561bdd2097fef6e661 commit 34cffc25b7207331e104dc561bdd2097fef6e661 Author: Jessica Clarke AuthorDate: 2023-09-04 08:33:27 +0000 Commit: Jessica Clarke CommitDate: 2023-09-11 23:35:58 +0000 Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): [builtins][AArch64] Implement _sync out-of-line atomics Whilst Clang does not use these, recent GCC does, and so on systems such as FreeBSD that wish to use compiler-rt as the system runtime library but also wish to support building programs with GCC these interfaces are needed. This is a light adaptation of the code committed to GCC by Sebastian Pop , relicensed with permission for use in compiler-rt. Fixes https://github.com/llvm/llvm-project/issues/63483 Reviewed By: sebpop, MaskRay Differential Revision: https://reviews.llvm.org/D158536 Reviewed by: dim Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41716 (cherry picked from commit 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f) (cherry picked from commit 2f269a3532b279a215d527ef67949ff020476e8c) --- .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++++++++++++++++++++-- lib/libcompiler_rt/Makefile | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S index 5dc0d5320b5a..1fe18f4a4681 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S @@ -7,7 +7,7 @@ // Out-of-line LSE atomics helpers. Ported from libgcc library. // N = {1, 2, 4, 8} // M = {1, 2, 4, 8, 16} -// ORDER = {'relax', 'acq', 'rel', 'acq_rel'} +// ORDER = {'relax', 'acq', 'rel', 'acq_rel', 'sync'} // Routines implemented: // // iM __aarch64_casM_ORDER(iM expected, iM desired, iM *ptr) @@ -35,8 +35,8 @@ HIDDEN(___aarch64_have_lse_atomics) #endif // Generate mnemonics for -// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 -// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 +// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4,5 +// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4,5 #if SIZE == 1 #define S b @@ -64,24 +64,44 @@ HIDDEN(___aarch64_have_lse_atomics) #define L #define M 0x000000 #define N 0x000000 +#define BARRIER #elif MODEL == 2 #define SUFF _acq #define A a #define L #define M 0x400000 #define N 0x800000 +#define BARRIER #elif MODEL == 3 #define SUFF _rel #define A #define L l #define M 0x008000 #define N 0x400000 +#define BARRIER #elif MODEL == 4 #define SUFF _acq_rel #define A a #define L l #define M 0x408000 #define N 0xc00000 +#define BARRIER +#elif MODEL == 5 +#define SUFF _sync +#ifdef L_swp +// swp has _acq semantics. +#define A a +#define L +#define M 0x400000 +#define N 0x800000 +#else +// All other _sync functions have _seq semantics. +#define A a +#define L l +#define M 0x408000 +#define N 0xc00000 +#endif +#define BARRIER dmb ish #else #error #endif // MODEL @@ -96,7 +116,12 @@ HIDDEN(___aarch64_have_lse_atomics) #endif #define NAME(BASE) GLUE4(__aarch64_, BASE, SIZE, SUFF) +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXR GLUE3(ld, xr, S) +#else #define LDXR GLUE4(ld, A, xr, S) +#endif #define STXR GLUE4(st, L, xr, S) // Define temporary registers. @@ -136,9 +161,15 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXR w(tmp1), s(1), [x2] cbnz w(tmp1), 0b 1: + BARRIER ret #else +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXP GLUE2(ld, xp) +#else #define LDXP GLUE3(ld, A, xp) +#endif #define STXP GLUE3(st, L, xp) #ifdef HAS_ASM_LSE #define CASP GLUE3(casp, A, L) x0, x1, x2, x3, [x4] @@ -159,6 +190,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXP w(tmp2), x2, x3, [x4] cbnz w(tmp2), 0b 1: + BARRIER ret #endif END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) @@ -180,6 +212,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) LDXR s(0), [x1] STXR w(tmp1), s(tmp0), [x1] cbnz w(tmp1), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #endif // L_swp @@ -224,6 +257,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) OP s(tmp1), s(0), s(tmp0) STXR w(tmp2), s(tmp1), [x1] cbnz w(tmp2), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM)) #endif // L_ldadd L_ldclr L_ldeor L_ldset diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 1ba94bc5eec8..f894d68e6478 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -22,7 +22,7 @@ MK_WERROR.gcc= no .if ${MACHINE_CPUARCH} == "aarch64" . for pat in cas swp ldadd ldclr ldeor ldset . for size in 1 2 4 8 16 -. for model in 1 2 3 4 +. for model in 1 2 3 4 5 . if ${pat} == "cas" || ${size} != "16" # Use .for to define lse_name, to get a special loop-local variable . for lse_name in outline_atomic_${pat}${size}_${model}.S From nobody Tue Sep 12 01:49:24 2023 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 4Rl62X47l9z4sWMd; Tue, 12 Sep 2023 01:49: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 4Rl62X3dTPz3S8S; Tue, 12 Sep 2023 01:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694483364; 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=CVagzX9bI3u+9+h/KiefxtQO+q6xdsbXIZHhSiE2VQY=; b=wxqNlgwxbFo8/ShT5Pt56Emqnt90Ab3tV/Ve1jc2KU7UN56KW0tpCOUiTkH0f/NO5ZDUl0 tuw78A1uIUyr+tVXsTtxrUYmm6qd1Q1HpUKTT7MMvKI5ENkm5AyQFWCSmMyid/Ag8bs54B i6nv+jDGHOpDYCJv6j00ue0vCIV2jZG0uyLoMruquibtf6Og8trsYJ6OePfQAofuC1TDfs WYBwxherTRfYapVUfREeAKkGLTPCkPB5MdxA6yK+qjGCGeC+V24FoGEPzpZ8E4/jpdt9GA q8MTfj9q0DGBzWXAxOy8cmN2OTRswnashrx08UeD5rO0dczB6150nxGWZKLG5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694483364; a=rsa-sha256; cv=none; b=s2gClYaZxew10JRtv24BN+xsAs9o2le9VxDiOlMXh4/SyKjpjIPfeQplJpDyK6cKYqDOBj KIH9BFkx/4LdaUyj22u2JbtV1qlTwKE+zXTVK/jX4MpTduH/a8+IyWg5XJL+EVAwCVXEe+ VS1wUC4rIuQ9YxBp1/enroQqotTxkR1SAwMMeROoWtw/Go7Bhw06HY/9/irUSycPpwszkb vlz3KucjmfOkqOglgBMD0TZ+o1lw/lZHHNkf1bO4VrAvLA2JM9HDXJQxdTMyqz28YM/5Lv ozDuDvbNG5wl4nOpIldtQl8aw07GTZG6NGR26uAUvLQtNv2y/yRU4xsisNaHJQ== 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=1694483364; 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=CVagzX9bI3u+9+h/KiefxtQO+q6xdsbXIZHhSiE2VQY=; b=qUaolr1Cx54q/z9LrTPXZTFNIfDLfeyjN6cO8eEJxDGvkmsK+0qWKQs0uQhCLKxE9ewGXF 8mc2ZikxXyfAuN0lBjHHsNVBWw/vMmPdf2q/v+ClU2+jFug3KLXtI98Trh0MxMNf28XzBI J2kc2ilP9hVb64S34UerNugKF2lAh20QLiH8KKzdCDpp4bpBCsHEQ5XkrDWNPHmPSe4amW juoToZbizLLUs1lv00gwT7fXUDk8wp3O1e2l1S/Qe3DV7dyYp9LfYBAYFiUAREpyE07oht IrRd+uxkSIAp6PWMRqgjZwCAS7Z+DdG5xxqOuXoVkRxLa3tVZy7I6kevEwYuAg== 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 4Rl62X2kB5z1Bsn; Tue, 12 Sep 2023 01:49: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 38C1nORx072563; Tue, 12 Sep 2023 01:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C1nO97072561; Tue, 12 Sep 2023 01:49:24 GMT (envelope-from git) Date: Tue, 12 Sep 2023 01:49:24 GMT Message-Id: <202309120149.38C1nO97072561@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: 380f42e2ed36 - releng/14.0 - stand: lua: module names should permit more 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 380f42e2ed3627d47696a1409a1a3ea07aebff17 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=380f42e2ed3627d47696a1409a1a3ea07aebff17 commit 380f42e2ed3627d47696a1409a1a3ea07aebff17 Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-12 01:48:51 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ Approved by: re (gjb) (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) (cherry picked from commit 6b2f0a3c31dbf9268b49d64c859da136ca8dc201) --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3f8fbc52cb40..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -61,7 +61,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)" From nobody Tue Sep 12 07:49:42 2023 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 4RlG2G6Nmvz4tglv; Tue, 12 Sep 2023 07:49:42 +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 4RlG2G5xcjz3M3f; Tue, 12 Sep 2023 07:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504982; 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=uLKjlLV/GEu/sxk4UdPDLrHC67vdt7Ar3Lwz7eZLcpE=; b=Kcb1+b+znq/MU6nTIvFt/M57eD9W+PnZSLSrLL6/cQ2cL3Bor1h8PafrLlLCUtRsTLiRFT 456sag7urnckOaQ0xxdjOhmdIm0UAMcuWgGKl8ayGeZT5C6xtMMp5aqKtWjKyAffGcDXWG rymTY9nFecWm88+AjwPkUVVZ6DeSOrfciBPIhi6/EdGl9UGLBJcrEn5B01tqLPD1OTPufU zbSFz4qOfsrmK9OdLfGzwA+MOG78yX1wcM6SHNIympwEOcdRMSgVeK7n8E+DJPy2yTzsUw 2LNllhhwpJvN3obe0qp0FPm4gK+LybzkPAsbdfdD6dZxq23CLNjtdfnHA73k4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504982; a=rsa-sha256; cv=none; b=ynAfyFiDceyaTCZWr+hx9MLgkb0z0QYVAobgUfTflAtpkhhQWCkKceEcZhI2ESB59zJd5u oXpj+DS5xdX8w4jm5Ui2Kjg5vTtN3wu54s3qjN6AF0TuKbnQjDcg8df9ozmTrRwJNFzqy7 S3YBVLaLofb4ScA4Y36V7sPlajPbXc8AWLVAdDUpfLp5zYgE51iireEv7sdIQL7TeD/XMp y144X5jZICzKSyTFt8wR4SpbQ/Cp7IlD3GDSPwt/+7MPM3RPm7vjLhnVnssoXUr/mYgKYs 73/mI68tRRX8YtZ6OB2uIwugcOpx8K2z3wz8XKxUVMuV56ptUP4pqkVmlsdjKQ== 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=1694504982; 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=uLKjlLV/GEu/sxk4UdPDLrHC67vdt7Ar3Lwz7eZLcpE=; b=vwGO1C6eiejtaCfwp9DSbaHPVxaEoU6OvJGLn5fx5xh28KbNkKcKIU8MXL0XRdSVPUhgCv YMWa0bEfMeM+6uK4tXOXqPkkBT3Wrus8nwkBT9znFFQXgbGb7GIgnxRuKJHekADc0jMCHS W/4yokG5FuA8L0et0CVnU6TVCIY118hpnlld59oHHAkGnFFo4Xyytdsn5uvMWJUvoZtBHy e05eGos1lSa6BngCFnmdOVOlj80shvDJzojsFnj8pSV/Y7IAMiHLOHe5VDvNJydjFeS+hu GvFqzq6BkVax/IkxyfHyj6MoOBOx3+HXyIkoVad+teU/+k3CdA+Kl0DECdwYnQ== 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 4RlG2G50swz8ST; Tue, 12 Sep 2023 07:49: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 38C7ngxd072203; Tue, 12 Sep 2023 07:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7ng0A072200; Tue, 12 Sep 2023 07:49:42 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:49:42 GMT Message-Id: <202309120749.38C7ng0A072200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 3c93ba3d7f7c - stable/14 - linux(4): Convert flags in timerfd_create 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 commit 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 07:47:54 +0000 linux(4): Convert flags in timerfd_create The timerfd is introduced in FreeBSD 14, and the Linux ABI timerfd is also moved to FreeBSD native timerfd, but it can't work well as Linux TFD_CLOEXEC and TFD_NONBLOCK haven't been converted to FreeBSD TFD_CLOEXEC and TFD_NONBLOCK. Reviewed by: dchagin, jfree PR: 273662 Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week (cherry picked from commit aadc14bceb4e94f5b75a05de96cd9619b877b030) --- sys/compat/linux/linux_event.c | 9 +++++++-- sys/compat/linux/linux_event.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 816c68a90f1d..e88791659f1f 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -611,13 +611,18 @@ int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { clockid_t clockid; - int error; + int error, flags; error = linux_to_native_clockid(&clockid, args->clockid); if (error != 0) return (error); + flags = 0; + if ((args->flags & LINUX_TFD_CLOEXEC) != 0) + flags |= O_CLOEXEC; + if ((args->flags & LINUX_TFD_NONBLOCK) != 0) + flags |= TFD_NONBLOCK; - return (kern_timerfd_create(td, clockid, args->flags)); + return (kern_timerfd_create(td, clockid, flags)); } int diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index fa63371b5170..8c6758fefcc9 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -54,4 +54,7 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) +#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC +#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK + #endif /* !_LINUX_EVENT_H_ */ From nobody Tue Sep 12 07:49:43 2023 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 4RlG2J0Tx7z4tgYX; Tue, 12 Sep 2023 07:49:44 +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 4RlG2H6z2dz3M6K; Tue, 12 Sep 2023 07:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504984; 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=Q8d+35yov/Fg9Yxjvso3ckFVHWQCXXNTGhdzynSFIQw=; b=cCYJs4B8sgp89bD2IbO3dQLEW64OI6zys21kttcFnrsV9LrscTN/tG8AvCVJMMhPmxGsha V0IIPG+P9v2B0yUNnD7GQlnr2Lhg67Uejb+og5W9V/cqdAUS2vkDT3xc93hdsMLYF2T9RS GNfQPuJmKnbfLVhKxATbnO/cydLvP0+6/KKf/kqK3qBgi53b9dzwyoYd/N2m+Lo7c133Oh u2k3pXTb0Xfu600XEbBNk7S8MEsSpNTS6XJMCor3S2V4pBFWkQUdUabs44ccxGziKBRM2c 8Uyv1C5O+K/DrgCJ/CUe7J0E1Q8QAx6Ip+0WDw+GXgALmIZv3SnBqnXopQH/hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504984; a=rsa-sha256; cv=none; b=dYyOJWXbcH8EOfEndVrgFZuVZSf4Gqg9JyGjCUF/GK6JzXkzao6q/GSin0oLnlyHRqI2iq zqM2KvUaN4u4Qhv5oT75m5vV64+Jo0EE4Hb+T5aUnCGfId6zIidKgWZox4f2ldpj+RfODv RzvnO/jpPLviFGk9YXtSau4mqlEXgaEirBGQrmQ8C/EoGxFruSYkqJxBlvW4yDg74Zojpa oUCt4CfLmIJEw8XEbBI5BI5NsC+VZ91nbM0y25pQkrQl4D2bmaWUcDjZP513L53WL5FlNb xvJpOM2r7wdLr/wwMYhlh9IzYgYcuLZHdl4sJmrUf17dBQeKt7PeI1bbvtG5pA== 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=1694504984; 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=Q8d+35yov/Fg9Yxjvso3ckFVHWQCXXNTGhdzynSFIQw=; b=XbnmyqqYpKe4AwjEEEgiM8UAM+kDELGgUTANozGrlzrqxdGgCzTEFU150i+a+8bca8DVUY GuvS4PwvKI21KC/D9rTbvfTlA6RbTgyicPMSgctLxvJO+6mWXp1Teq8KGLYV86iXabgnrB +9nBb1CWlMa4bMC4Px3kHWHjpVNUp0pOpMUJUqrT9mwt9aZv5H7ylEZRtzv2r8PgpuIOAE KKNDs54VaUv8gaaH6octQwYZ0wRi3XXyutLjY+aqA97RRevBQjUdPZbws51PpEMALYvdMl fbhoDzm+DzBWgwkMiGjlwrk0oAo8q3xkOGrMGXMZ6RJyGKXy9gW82qJUXSny9g== 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 4RlG2H604jz871; Tue, 12 Sep 2023 07:49:43 +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 38C7nhTP072243; Tue, 12 Sep 2023 07:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7nhuG072240; Tue, 12 Sep 2023 07:49:43 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:49:43 GMT Message-Id: <202309120749.38C7nhuG072240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4d1723961743 - stable/14 - linux(4): Deduplicate mprotect, madvise 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d17239617439b9a500f4c7a59f5f4d323d252b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4d17239617439b9a500f4c7a59f5f4d323d252b7 commit 4d17239617439b9a500f4c7a59f5f4d323d252b7 Author: Dmitry Chagin AuthorDate: 2023-09-05 18:15:52 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 07:48:39 +0000 linux(4): Deduplicate mprotect, madvise MFC after: 1 week (cherry picked from commit 553b1a4e4eb426d2c29a033b284c13bfbab30334) --- sys/amd64/linux/linux_machdep.c | 14 -------------- sys/amd64/linux32/linux32_machdep.c | 15 --------------- sys/arm64/linux/linux_machdep.c | 15 --------------- sys/compat/linux/linux_misc.c | 17 +++++++++++++++++ sys/i386/linux/linux_machdep.c | 14 -------------- 5 files changed, 17 insertions(+), 58 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 2d2c5bb55ac8..7da1dccd6b45 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -97,20 +97,6 @@ linux_mmap2(struct thread *td, struct linux_mmap2_args *args) args->flags, args->fd, args->pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, uap->addr, uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, uap->addr, uap->len, uap->behav)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index f6b14d8e4653..fb088ae37b26 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -345,20 +344,6 @@ linux_mmap(struct thread *td, struct linux_mmap_args *args) (uint32_t)linux_args.pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 9c9d56ca9949..b9548387315b 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -77,21 +77,6 @@ linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) uap->flags, uap->fd, uap->pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, - uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_set_cloned_tls(struct thread *td, void *desc) { diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 5e692fea1ea7..b9c67d513cd3 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -348,6 +349,22 @@ linux_msync(struct thread *td, struct linux_msync_args *args) args->fl & ~LINUX_MS_SYNC)); } +int +linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) +{ + + return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, + uap->prot)); +} + +int +linux_madvise(struct thread *td, struct linux_madvise_args *uap) +{ + + return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, + uap->behav)); +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_time(struct thread *td, struct linux_time_args *args) diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 8dbcbcd2609e..7f1738cda845 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -332,20 +332,6 @@ linux_mmap(struct thread *td, struct linux_mmap_args *args) (uint32_t)linux_args.pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_ioperm(struct thread *td, struct linux_ioperm_args *args) { From nobody Tue Sep 12 07:49:44 2023 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 4RlG2K12p3z4tggx; Tue, 12 Sep 2023 07:49:45 +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 4RlG2K0ZLDz3MFh; Tue, 12 Sep 2023 07:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504985; 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=fATr2Zr6TlOKlGnOaGcqxhL87tIE8wT2dZpC4M1cJ/o=; b=M1omLLfpxLa0t3ql4WDFm7p628HE5yoaJiqyOlZOoeyuTmWjgKO2+GmYkocDVKF7g/nruq 9VOLybuCFoUR4ocP8iG2lyVdYILQwxfCRvtl49KOmZJa5rEuYclMOG2rqpvv0vNDUeLyJd euIcmF3Gr+LAplFB6C66DHHhfzp4ZOlcSqwlxircVLTopr8NswbWasEdIhoPyDM5s/dU6G Uv6rBG61X00cr4oHS4SFcKrnKvHAWf/hJsi/I1z4H330wGDtFavY4chtTl6VQJRQ3pjp46 G0TO5/iGikaBy9CiDzyxD+jjmeAHuot2dkcZ31u5RP08SKm2OPhUavGvL1WxaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504985; a=rsa-sha256; cv=none; b=JwVuvkMpWGEpzUptJ6NjC5ZS7JvSFURFDjyNiIDVJt8ZiqDVCX+UTDWL5hzOmrmVcSWjcW 6FSVoOYjDnQU5UfXFtTuZuw/EdA6dmhXeQ2Bh/Jao9JO9yfQGQrid68C4unPzWwIak+Shf aU1KyR9FWh/RBBXxyX5XXuvC8ZZYVEmZZktZWjsh6voQB50GukVaJatqcHhNjkpI1E4g2v IDJvnUyuUKdgd/3laLa7wIoJ3006Kq75qiRS8aHwbiiC+QR9J1Ge6RUXjkN9Eh39lpw2vZ Jg2j2ZnqGCqzAt9m/rAO5ch79mW3UKGQjsINgOM1KkNtpOMnG2cuAV+BkWbSUg== 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=1694504985; 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=fATr2Zr6TlOKlGnOaGcqxhL87tIE8wT2dZpC4M1cJ/o=; b=iSldzn/9EKYDe1nTPat1WlndeJ6TYuuVvJjCuuY+zWUsJk8nEqVs0yXhP0h3YWUTgio+/q KxXFE57WT+yQmXl/7hE55B0vywAq00tRkjfqqy9iLPNaHrcluH3KryjgIegTPGfHHUxAR9 UrEolG97CAUeFtHXysUMqouybZZ2k3vhSyQlUcY7S79AQAcMelKnWCGiUpDdXIclnvdop0 9udHSselR8+djx+PuK1puQzbVaV0tV5YmcCq8K6+8aJ+sL75DhHaTTY9o6YnapwgF5Cwef M6jkTSZiW/C2ajexnaxwysd6fdUi34CuWP2pB0Hd7DuIlfuOEQyng5dFMB/dUQ== 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 4RlG2J6nRqz7tn; Tue, 12 Sep 2023 07:49:44 +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 38C7nidr072279; Tue, 12 Sep 2023 07:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7nial072276; Tue, 12 Sep 2023 07:49:44 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:49:44 GMT Message-Id: <202309120749.38C7nial072276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: a321b17b8e6d - stable/14 - linux(4): Deduplicate mmap2 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a321b17b8e6deb83249b685357631dfd8fafc9e8 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a321b17b8e6deb83249b685357631dfd8fafc9e8 commit a321b17b8e6deb83249b685357631dfd8fafc9e8 Author: Dmitry Chagin AuthorDate: 2023-09-05 18:16:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 07:48:56 +0000 linux(4): Deduplicate mmap2 To help porting the Linux emulation layer to a new platforms start using Linux names for conditional builds instead of architecture-specific ifdefs. MFC after: 1 week (cherry picked from commit 2a1cf1b6b55c8326bbe85d0fdf17b0f2fb9b34ce) --- sys/amd64/linux/linux_machdep.c | 9 --------- sys/amd64/linux32/linux.h | 4 ++++ sys/amd64/linux32/linux32_machdep.c | 9 --------- sys/arm64/linux/linux_machdep.c | 18 ------------------ sys/compat/linux/linux_misc.c | 17 +++++++++++++++++ sys/i386/linux/linux.h | 2 ++ sys/i386/linux/linux_machdep.c | 9 --------- 7 files changed, 23 insertions(+), 45 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 7da1dccd6b45..33ce902a45bd 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -69,7 +69,6 @@ #include #include #include -#include #include #define LINUX_ARCH_AMD64 0xc000003e @@ -89,14 +88,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, args->addr, args->len, args->prot, - args->flags, args->fd, args->pgoff)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 395548b3c93f..5542df1b3185 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -46,6 +46,10 @@ #define LINUX32_MAXSSIZ (64 * 1024 * 1024) /* 64MB */ #define LINUX32_MAXVMEM 0 /* Unlimited */ +#define LINUX_ARCHWANT_MMAP2PGOFF 1 /* 32-bit off_t want offset + * represented in multiples + * of page size. */ + /* * Provide a separate set of types for the Linux types. */ diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index fb088ae37b26..e10502f9bd80 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -320,15 +320,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, PTROUT(args->addr), args->len, args->prot, - args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff * - PAGE_SIZE)); -} - int linux_mmap(struct thread *td, struct linux_mmap_args *args) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index b9548387315b..3ba5683941b5 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -32,25 +32,17 @@ #include #include #include -#include #include #include #include -#include #include #include -#include #include #define LINUX_ARCH_AARCH64 0xc00000b7 -/* DTrace init */ -LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); - -/* DTrace probes */ -LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); int linux_set_upcall(struct thread *td, register_t stack) @@ -67,16 +59,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -/* LINUXTODO: deduplicate arm64 linux_mmap2 */ -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) -{ - - LIN_SDT_PROBE0(machdep, linux_mmap2, todo); - return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, - uap->flags, uap->fd, uap->pgoff)); -} - int linux_set_cloned_tls(struct thread *td, void *desc) { diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index b9c67d513cd3..cb781f3bad75 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -365,6 +365,23 @@ linux_madvise(struct thread *td, struct linux_madvise_args *uap) uap->behav)); } +int +linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) +{ +#if defined(LINUX_ARCHWANT_MMAP2PGOFF) + /* + * For architectures with sizeof (off_t) < sizeof (loff_t) mmap is + * implemented with mmap2 syscall and the offset is represented in + * multiples of page size. + */ + return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, + uap->flags, uap->fd, (uint64_t)(uint32_t)uap->pgoff * PAGE_SIZE)); +#else + return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, + uap->flags, uap->fd, uap->pgoff)); +#endif +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_time(struct thread *td, struct linux_time_args *args) diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 643c240f8e37..914dc9c9ae84 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -38,6 +38,8 @@ #define LINUX_DTRACE linuxulator +#define LINUX_ARCHWANT_MMAP2PGOFF 1 + /* * Provide a separate set of types for the Linux types. */ diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 7f1738cda845..b5d42dc22162 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -308,15 +308,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, args->addr, args->len, args->prot, - args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff * - PAGE_SIZE)); -} - int linux_mmap(struct thread *td, struct linux_mmap_args *args) { From nobody Tue Sep 12 11:55:02 2023 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 4RlMTM4yZLz4tYR3; Tue, 12 Sep 2023 11:55: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 4RlMTL6mv5z3QPs; Tue, 12 Sep 2023 11:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519702; 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=XRihcxutJXBV/JPn3kc6IXc9k1LDls8QW4VPYd2buUM=; b=B1+IBPP5NTRLfdvg/e8Pn5BL+ooDm4H/vZgN7PAVaEUU/vd/CeXG450Wh3LTCNLyJWfQ7w r5OqhE+cp6LG78yofUMFmuoqTibRcz52poFzOC4CeB1yrE9EX9UYVmkc2FTqmD/C/fyDU6 kk4XjrrD/HAotjui3tLDTvM9gcY6QOORNiQjRuwxs9bmDRpAr5tXVwpHZrOHu6VdAWvFl6 Pwhvge7X+9o2DY2OR47FtECNsDoL/9qiFR6vilzePbV2YtYf82ZLH28WZouSpuD2c4ebO2 vuAMrvaIYyBnK1MTzP5kOSPhUf2r6H3UifvDDc9ssICKfXy+J8Y1/6jEjEGBAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519702; a=rsa-sha256; cv=none; b=Fcp7Tv53rM/6AhKEjO7dXr72/cO+Mz8d5y1AWx7yVw1i1OZZz9NkAPRdxnSY6aZKFDKqel 0MT1ZG+Fsy83Z24bfrfDlIpYLsK0Zlmd/xfy4CfujPqhEFiNhpLtBph+DMlVJbp1pTwiAA KXM1wFhd+DGjqEadyRdKqkGOHCQ8AIV7gy8jEdmwRa9Ais/W+Y/mDAoSyGcAKBhlDA0T7m 6OI3BoUry+YmJZaJSNbNvC8TbCEl+Mdg5gO0ZrGtyc0jjSRFkztX7DPBCvHfB7qpy0tYKP k/5apli566xl65A9KStw43e5CwhgOZn7vew6xgKtodf5VlvckhU/y6y5Q57zVg== 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=1694519702; 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=XRihcxutJXBV/JPn3kc6IXc9k1LDls8QW4VPYd2buUM=; b=eI7WDn1x9QM4rFIhXDD8J/nAnGVXbm2DrWBLQKQ0a0Ry3+64h5F3FESCLdS8M7CEp0Uph/ 54weAF0yfTm5xNngEyJs+UzrUvJlPhZi3LLQqej7YE+/uuYizPX3NvqjLwSLZEht8hj5U3 Ks4zcCvMM+6SgL5IhmLrl7gkD3PS6vLo6H5zSzr7sUF40ihLh1tH7wMdpKvMgn4bYgnss0 v+dI1l5wQ8gXuUE8LlIPw9E5CLUtUhXxXdjerfxXW2SO0NrIjTAE71BraBSO3Au5WXtjJi 2Zu/AUCbpHNfQTliOfWAa69gT+XtOxCAKGUns4gXOLSHHWud2YiejiPw1+tw+Q== 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 4RlMTL5lrVzWj5; Tue, 12 Sep 2023 11:55: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 38CBt2j1085871; Tue, 12 Sep 2023 11:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBt2Ic085868; Tue, 12 Sep 2023 11:55:02 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:02 GMT Message-Id: <202309121155.38CBt2Ic085868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 01e15ca6c828 - stable/12 - getdirentries.2: Reference directory(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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 01e15ca6c82835cd541c228c91a2913540815d32 Auto-Submitted: auto-generated The branch stable/12 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=01e15ca6c82835cd541c228c91a2913540815d32 commit 01e15ca6c82835cd541c228c91a2913540815d32 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:37:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:54:10 +0000 getdirentries.2: Reference directory(3) MFC after: 3 days (cherry picked from commit 3a02df5e27d2eeabffd761ff5cb79496a6d796ea) --- lib/libc/sys/getdirentries.2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 658be9459af5..ebe5848772fe 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -28,7 +28,7 @@ .\" @(#)getdirentries.2 8.2 (Berkeley) 5/3/95 .\" $FreeBSD$ .\" -.Dd February 14, 2021 +.Dd September 5, 2023 .Dt GETDIRENTRIES 2 .Os .Sh NAME @@ -196,7 +196,8 @@ Corrupted data was detected while reading from the file system. .El .Sh SEE ALSO .Xr lseek 2 , -.Xr open 2 +.Xr open 2 , +.Xr directory 3 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:03 2023 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 4RlMTN2RHzz4tYG1; Tue, 12 Sep 2023 11:55: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 4RlMTN0HX3z3QJb; Tue, 12 Sep 2023 11:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519704; 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=ZM2mJt2xgrY2xzmOGDn5KHaPDqGKZ/s70inU2OiZhXY=; b=TP0xVPfDiqRmi7ELRUMR5eJiaJXJjdeHH8L/84KvkX9n8XDklebwvVUTeu5JONP8CZYJby sDZIaq+AYFYjNqtUmm2HNdPrMRgQLOSPh6lcStvG4jE7i6LEWGoaM/ECWcxvlLnUtScwD3 Yeoh0z6b5d6spvErGyVV3jjjKbQ3IiOHP9a76shzzlOoRBWdvd1lkmDdjJ4N8EwlVqrJtP ek1Pqt3H9l3TDq+aYrHhXBE+IayYJhXEDz9vONoCdI2FICKuGVaHausMY+pI1s/QAbEKAD 3nwBEar9rjH8oBlMC40Puvos7iTHGhYiK0FC59vCyRhWAD0DFDopTGlYJcuhNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519704; a=rsa-sha256; cv=none; b=xp/qsIb3rvt+/8QMC0P/zHqQjhlbjEIBZcd9Mk39E5yuodtco93PPEJfKBogO5USdts5C1 F+tZQoTB5SI+FbFaQeeamPJw8kg4mRduNxxVA2k7E0K3STETxrpu6cQvwEa+nrU/3AuBZy AY2pdH5aegzv9RL2k57ifmaP1AXjeFYHK0K2bY/fpFvagJPy8bkFPNSN+cUHWlZqBd7kTP uE3QrKI81oirj4N8wjFIgkNFt9i6z4ENVoupnLvhqrIkGw1/r0Vqr3TCYFMgFJ5GC6DWMK z7cyYtUa7zlrknPEUbZwLY2yPHyP5tAcm3AuB0YEkc3S2g1l7gVB3ihdze2Rsg== 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=1694519704; 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=ZM2mJt2xgrY2xzmOGDn5KHaPDqGKZ/s70inU2OiZhXY=; b=Z/LQ1+qieg4WHwzbS9DyvuQe/8KmCWgIyZyrQakHRmPY3gmgfkAQRmSwVn1GYAu+tYb+yV sMHvqNYV/EJCybpfMnweDf014ZLV8afM2vACjRMZHMxNl78Y6Gjld8oiTF8lGDbdHBd3E1 yznNmov5z2LUe+axWEX0ChtidlWISmHS0aD7zujMJrJy5xN63UIW9Ha7SnRvFjrhvAoiAB zdvVdQXgXz7LA4UaZswHyZuq5f3t17ZftQ+AxW4BIqIcF8GN9XDLjpmyWayRQXGLaDDTuN bEgrw9SYSJVk4nGKMz/KEIwIcjNwO9LFY+futt0eNzMB6eZEtWLRnThYr08oWQ== 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 4RlMTM6VcjzWKk; Tue, 12 Sep 2023 11:55: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 38CBt33d085916; Tue, 12 Sep 2023 11:55:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBt3JD085913; Tue, 12 Sep 2023 11:55:03 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:03 GMT Message-Id: <202309121155.38CBt3JD085913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 9cc3b0704e13 - stable/12 - getdirentries.2: Improve readability of dirent members 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9cc3b0704e13f7ccb24c50b84b2460506a52c77a Auto-Submitted: auto-generated The branch stable/12 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=9cc3b0704e13f7ccb24c50b84b2460506a52c77a commit 9cc3b0704e13f7ccb24c50b84b2460506a52c77a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:41:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:54:11 +0000 getdirentries.2: Improve readability of dirent members MFC after: 3 days (cherry picked from commit 52d374a067002fc42409b32059ec8b8506a70429) --- lib/libc/sys/getdirentries.2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index ebe5848772fe..99ebd79784a1 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -71,12 +71,12 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -ino_t d_fileno; -off_t d_off; -uint16_t d_reclen; -uint8_t d_type; -uint16_t d_namlen; -char d_name[MAXNAMLEN + 1]; /* see below */ +ino_t d_fileno; +off_t d_off; +uint16_t d_reclen; +uint8_t d_type; +uint16_t d_namlen; +char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp The From nobody Tue Sep 12 11:55:04 2023 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 4RlMTP28y9z4tYR7; Tue, 12 Sep 2023 11:55:05 +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 4RlMTP1DsKz3QZl; Tue, 12 Sep 2023 11:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519705; 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=I769juO9xJQrXQ+B10L2u2xlTztmiDASw+pOjIidqUg=; b=SeKLrW/qXPLT+UfBgQT/y9vMXh6b0/G4lzw4VlwV6gmG1xYcmBCsX8TP9aZkF9RqJpEC9t qoREp/J0ndOvgi98cyJ1BuT+yT8Y+4yTI64O1SCIHkycZOdido73N6T5TrYsrSGiZBHVyi q5+MJP+zOwOmovCAh/viU6eCIBIfZmZr7JY2TjqQGaKqJIyscuBBfbOMSGlMP3QHZWBXp+ oCeKldBQVCgUDXFz/e4lkTiLfUZx0BfeINS/CG5Po0O2xJF0Jw0019xbI0biL4G7MWgyP4 vTjDPrPPFGPEJynPYLX6j/RTnIPUhNndGVbdTduh2fQSlL9lwdeMbIlue8Lqxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519705; a=rsa-sha256; cv=none; b=s3ajixBSYMm8Xry3x37lFT3fvq+ecy9H/UoDU6m0Cxh1nVoC0v+PG1dfuVTvTok7eEgyiZ Bl021hRwBcF3Yf4t1yBYZDu7jAHFA5ZHm8QYT18+oj2PSaBegrkWzxyxnfxWT9jz3zLzEz zLioCB4Z5NqWDsE6RzWhn1Glp+mclXwXYyP1cmKUAs5xh8b5I9chEJb3zmWW9eOg6xT8/l DDePCyxmgqxxFEg3MBSj5FrnJJZBz+gph86vUOofzVdO+FxUix8QwPbloxipgQO9O4IAla KQVXvrYezEhWv4BjJV+62HPKCfj5fLbIcvzPQ2s2lzPLDACXogWgGEV/wXG7MA== 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=1694519705; 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=I769juO9xJQrXQ+B10L2u2xlTztmiDASw+pOjIidqUg=; b=iztCoyL7HxC1ul3NmXW4TFdu6eQ6yxcKCvu+kqnnz3T+eHDkT0O5Lc6EtgtdDBEwveRkx6 noZhLu3TZ+mPtPAFNLuScOxjbB+94cB5MTHwi5r9I5BmxeA2+WYMD/KzFiSInAtv3dD2v7 he1v7RKVMbUdAHvQ53nE+L1530HIbpPOtg+b1w0duBxfLuid7ksxs1UOqatiLuGIguUN2a YYuomHQ5Irko23MoS3GLacJJJZc3iYmi21BwHLUQafjrcKCd0bpptk/wjzFf5FIKZ/vnri TLiuTGfotMjxgnucl2I7a7OGkIdsPdU1J16btfGAx5vhoIXL5MrzepWy1IqgIQ== 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 4RlMTP07f0zWl5; Tue, 12 Sep 2023 11:55: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 38CBt4AB085954; Tue, 12 Sep 2023 11:55:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBt4mG085951; Tue, 12 Sep 2023 11:55:04 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:04 GMT Message-Id: <202309121155.38CBt4mG085951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 8e9979050a8e - stable/12 - getdirentries.2: Reference dir(5) 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8e9979050a8e21b66c8c0748e8782651b66860fe Auto-Submitted: auto-generated The branch stable/12 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e9979050a8e21b66c8c0748e8782651b66860fe commit 8e9979050a8e21b66c8c0748e8782651b66860fe Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:48:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:54:11 +0000 getdirentries.2: Reference dir(5) As a note, parts of manual pages getdirentries(2) and dir(5) should probably be consolidated. MFC after: 3 days (cherry picked from commit 5b7a776f481891f10820a0b4838d0e0feb60b8ad) --- lib/libc/sys/getdirentries.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 99ebd79784a1..9e09ff7f9f5a 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -197,7 +197,8 @@ Corrupted data was detected while reading from the file system. .Sh SEE ALSO .Xr lseek 2 , .Xr open 2 , -.Xr directory 3 +.Xr directory 3 , +.Xr dir 5 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:23 2023 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 4RlMTl6y4vz4tYfh; Tue, 12 Sep 2023 11:55: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 4RlMTl6Xbkz3RHP; Tue, 12 Sep 2023 11:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519723; 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=eerohcgmEvbKsr18aeol19STvFgeng+Ln93Bwbwrad0=; b=vR0KCYMq9g3Nbp0b8dqvUNlGk9Tq1tdg7nc+GR51bWNntzGVJLJVJw0DmDMIVLrUoCzf42 lDQUk9VsbpjmSOt76QpFfkiyiU+pe6ka9Ybfrmw7+vHk0YZDl3dQfjKm7fPQuqIof2Ruc4 EB7tMXTKbM9I4zwwZbLAUFaFjiMA/lvgrpgcrvsGhtH2A5EPqA3qE3jEY0l/2abkeKpobp BTA2nVDtov1LIVHUveMbela5/dvaTAh4J1q3kxZrRDttuLH3oRr+HVAbOjcbdrKPcM6pYp DKm8y/tC3LNcIFfKK1pgof3c/ZiTrrpWlDs9kQcH5bzEIxOgbwpxv1Zk56/Vyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519723; a=rsa-sha256; cv=none; b=nyj23bFXLC1gh5UUdkq3bUyybm6/Sb+1rjyWyddOSJIk/Rf+Ptpu0F+KmZKT1ahBq+anNa zkpJwjN0gn5INM5gbTl7PqnlNAVxIERpRgeeQu5kHkM3EArHeIkAgjb7OTn5V+SyMr+hB2 7GiwDY1W7JU1hq/Fw1O33li2xLuTcdlZ/FeJo1XxBLPh/Nxh+WwWmm95P3I6ySJhIqWE7r t5a5EARzGDElrxS4SxIGjFoS3R5EWNJcaehNNVRD7/EaGbWyoMA7kDoQFfFsUf0HT3g5Ez ugmiXx1180O/AhrxwHbyQbzQrf0xseW/lVq4d+4AhGJUmFSpqSX8HO+OsbJ5Dw== 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=1694519723; 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=eerohcgmEvbKsr18aeol19STvFgeng+Ln93Bwbwrad0=; b=tEqD0wiFu+OZcWx0uJBHavEkdeDxgtmZHet1R0CcrFYkMZAczKboWxo7fLYAvc9tDZ5FMC lLDCDNqXgS6E/9kDCEHrytAXaq6F56gMkezl3V5tjqsqYLf8kyN+ao0foBVMMaEumpTZ50 1/sIpEuO/uTJSp1z/lvBzHZM+8CGFWpjdxJinQ9LUlAhpncr5XXlIPaPTcsYvgaXwi8wsR QchaK0AaLl/rwwt+gIXDkA9Vm7tLp04HjhvwsZZ3vZLordGvWvdE34k3ay50Ohw/QDA2Dt xuJIGQCmLLGRjZbVCpQrEaL+5n9QAUWpPZRr19WmrUMqmzlxAXWpef9gxQ06Zg== 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 4RlMTl5fZCzWTD; Tue, 12 Sep 2023 11:55: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 38CBtNlL086145; Tue, 12 Sep 2023 11:55:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtN2Q086142; Tue, 12 Sep 2023 11:55:23 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:23 GMT Message-Id: <202309121155.38CBtN2Q086142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3c0bae278f2d - stable/13 - getdirentries.2: Reference directory(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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c0bae278f2dcb5e68ec3c37387d6bf28127634b Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c0bae278f2dcb5e68ec3c37387d6bf28127634b commit 3c0bae278f2dcb5e68ec3c37387d6bf28127634b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:37:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:36 +0000 getdirentries.2: Reference directory(3) MFC after: 3 days (cherry picked from commit 3a02df5e27d2eeabffd761ff5cb79496a6d796ea) --- lib/libc/sys/getdirentries.2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 38d5c1e525b0..1c623fa59124 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -27,7 +27,7 @@ .\" .\" @(#)getdirentries.2 8.2 (Berkeley) 5/3/95 .\" -.Dd April 11, 2022 +.Dd September 5, 2023 .Dt GETDIRENTRIES 2 .Os .Sh NAME @@ -197,7 +197,8 @@ Directory unlinked but still open. .El .Sh SEE ALSO .Xr lseek 2 , -.Xr open 2 +.Xr open 2 , +.Xr directory 3 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:24 2023 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 4RlMTn2dtsz4tYMM; Tue, 12 Sep 2023 11:55: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 4RlMTn1Gg7z3RPk; Tue, 12 Sep 2023 11:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519725; 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=M4ucfAA5o57usFiRJSzrI8k4dNK6ngsZ8sX9jUl/03I=; b=k3QvNHaYfuXnK1duHJNphCmRutgBDFQK+vwCwmXZWa6MMwjxWE18eDsWdQJR0yr2rii32N GNQV7eQldhMQS+Pp0ITCAms7ucIloZQx5/Sp1EoGxACv5ruWEcHIXbcm28/RcCvBl6mNCF SpZmWZNq8nnM8ukE0qpnhP95vhvvvLBApbO3NeisyZdSuPjPjaPTnkd/On0tSzJDahLu8T o4IaMcdjSxfTVNCW2dfR3ZVyFLfrDFKaRGWfjB+xdVO+hpkwTtW3eZD+xjk304A5i2pL3x EOTIhFGXcuz+3OejYFzKAQTYneZiw3OqxkfrhwIQsQtYfd+765HFTQbiHVCtzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519725; a=rsa-sha256; cv=none; b=NpGITWFo2YwTme7i6yw/B6pKp5990t7TmJRjm211cw6Mg6Q0wuw8UWpZP+KG/P5ryKz6OL b3DNBy/8kG6K6Mb6Gbd46MqamGH1OtIFSDPVdFfG3tA4MqqGC7s6VSyXp2Mt8FQAx/8AO9 dMHH0d2pf6P6/Xai3VBRlJ6kjnV6LVZkpx8Zn7gzL02Q4VWA6Zkku2+878aFBvaNW2eb/w urDehMrlm86isJeEomWMH47axeyOXWFwXa4N2eYGzWseTEJFwp3lHQ3Pc4kRRx2LD/h6sU uI70czUcuo2E6tQFXMfkunhzEbR6k56QfFpF90LXPtcPGjqTeICP2yufaOZSZw== 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=1694519725; 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=M4ucfAA5o57usFiRJSzrI8k4dNK6ngsZ8sX9jUl/03I=; b=rMnwCAqbQ/0rPTW26qAShspEa3dTtZNh4/U5tpAPXHYYW4FmMz9rqKSCVAA7aLwVC4lNzp J80V1ubV1YLEnTKIxbS65tZ0AdETWFxqXenhmmImysJTzOsQsa5H1PuEttPIopizGlWoc/ q2quyFUskarzIO2osOQORykmJowkf+YhvM3fKQZk80cDULxQs/nQV8eHnBl99bWimLpWed 46sLn+4k7jbDMzy816C2d+7+AclerY2bFSWyQm21sO8BvpAxXAWiGgcpLASxH3MRDw158E Ynrf8mPUgpQYwSGFqXIBmFAGIxwptN9z964BDqC2w5IugXXdNvaCovJFJpqdgg== 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 4RlMTm6xCFzWRL; Tue, 12 Sep 2023 11:55: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 38CBtO2U086191; Tue, 12 Sep 2023 11:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtOVh086188; Tue, 12 Sep 2023 11:55:24 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:24 GMT Message-Id: <202309121155.38CBtOVh086188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: db3e4532afdb - stable/13 - getdirentries.2: Improve readability of dirent members 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db3e4532afdbbed61c016e04b1feea2d046f9909 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=db3e4532afdbbed61c016e04b1feea2d046f9909 commit db3e4532afdbbed61c016e04b1feea2d046f9909 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:41:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:36 +0000 getdirentries.2: Improve readability of dirent members MFC after: 3 days (cherry picked from commit 52d374a067002fc42409b32059ec8b8506a70429) --- lib/libc/sys/getdirentries.2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 1c623fa59124..0a06cd6b947e 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -70,12 +70,12 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -ino_t d_fileno; -off_t d_off; -uint16_t d_reclen; -uint8_t d_type; -uint16_t d_namlen; -char d_name[MAXNAMLEN + 1]; /* see below */ +ino_t d_fileno; +off_t d_off; +uint16_t d_reclen; +uint8_t d_type; +uint16_t d_namlen; +char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp The From nobody Tue Sep 12 11:55:25 2023 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 4RlMTp3Pz3z4tYTt; Tue, 12 Sep 2023 11:55: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 4RlMTp1SRRz3RLC; Tue, 12 Sep 2023 11:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519726; 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=evhr1/Osh4PzSrmvxOKJkdHjJ7UdXWEJ5wjbLR0thgI=; b=YXpVCWbCAedLyTOsW00cI4qsniYokmai97Cl/uUEz4OaEJokJOMDKRJx8aXurXwA3HDvl1 +ka2ZxyVdEHKDOtmZ5IZSf9dcBIy/zd/3JWoBm+NNQ8aNJbrqeNp4hzE+ytISWz2hFtBGq TUOHGcG/g0Y/t3L5LQ1WdWRn8RW0XALep4ClSUbVpqACvBRQ8kaWJMb9LaIGeDWDSSJy2+ ZFGNJ2FrZOu7ACZ2o1wYgDVXhZmWKVEqRBaY5DxvXXA/XM0kwtZGp9IpqDzyJRpNgCxmeb b4JgNFKcNOWfmogDc4pwRrIGJ5VP4mhXWZWElNMsjWmm32rXbQ3VVC313WBU0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519726; a=rsa-sha256; cv=none; b=lnPL2iZLFflrrtWVH40CwNmE/IZ3KPrHiUbr1nLnEd+UHvI+Atwuf2kN3c/hamQFfX/KbB k/uUpqndbLWSdvpdEvRKWkjlEXDZI5c8XF09/lpG9bElnasLLps3fysrWlWF+RKupNFTfK 3KQPrcSYRd3EEFolH+vEjUWc5o8ALT3qMKdp+Oc4UXSTaaaumwG9nYfRGRSM/yiYKfBeRN t5Jj85AjviqxVyxw4Nc7o6lEYEVTLgOEh+/CWmKdJy3xOGLnT7Z2N4jRgTCi2oWRI/mOIl sKqV53or+r67DUYwtWoNJjvVAZuNuanUAEk6gEdnlOtGuf+pQXaajs76IsbtqA== 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=1694519726; 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=evhr1/Osh4PzSrmvxOKJkdHjJ7UdXWEJ5wjbLR0thgI=; b=H90f0hddOIuF74JM1WYNXfkvaIGpyo/R+hPe7dVVI1cnxx6T6qaTQ0WoRrjuviWcWIdNL/ K4H78xvDeuYqzmEWpY1nZ2MU1SciNllZq9hUgvPUAotdXMEo6d4BMCGmMjABYGWnOmUVla MM+rUc0OYbIRP1p9Xvy1tjn9nVp2+suGKKK0rbaDLq+en5WbWGTJj1XTqKUu0Gku5Et9BW 6Vrslm2aoFVfmyK/O5fWikff077LTKKsBhN7qcHSlvnNlX/9kBvHAbR1zMdZwkYxh8tPmu zcd48DPKfZvcfY5qZdpZL+H0B3uzGphNHX9L0iIulFgdEcHcvBf/eIxB9oU1FQ== 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 4RlMTp0Wh5zWRM; Tue, 12 Sep 2023 11:55: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 38CBtPAi086229; Tue, 12 Sep 2023 11:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtPYt086226; Tue, 12 Sep 2023 11:55:25 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:25 GMT Message-Id: <202309121155.38CBtPYt086226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 691f3e7fcfc9 - stable/13 - getdirentries.2: Reference dir(5) 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 691f3e7fcfc91e3e0dde095f536de881e6762b67 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=691f3e7fcfc91e3e0dde095f536de881e6762b67 commit 691f3e7fcfc91e3e0dde095f536de881e6762b67 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:48:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:36 +0000 getdirentries.2: Reference dir(5) As a note, parts of manual pages getdirentries(2) and dir(5) should probably be consolidated. MFC after: 3 days (cherry picked from commit 5b7a776f481891f10820a0b4838d0e0feb60b8ad) --- lib/libc/sys/getdirentries.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 0a06cd6b947e..74fd57f9d74f 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -198,7 +198,8 @@ Directory unlinked but still open. .Sh SEE ALSO .Xr lseek 2 , .Xr open 2 , -.Xr directory 3 +.Xr directory 3 , +.Xr dir 5 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:39 2023 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 4RlMV36xHtz4tYm7; Tue, 12 Sep 2023 11:55: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 4RlMV34PjFz3RwW; Tue, 12 Sep 2023 11:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519739; 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=wWpfGgZLxAfrYdsXQq5UfFEBScwD30jhJULmKq6D48o=; b=EKPrIneZ82KEq3g7+B+Bp4K4iu+dlD6jvfKYqw1Br5uh+wwmA+nHt/wjYQzvEOqwghiesa oY1mZw/tMDOpLsmn4tkgrT/7zlKEuAf4UmhA/ZqGCBnEL4utxlSe0Ka2jSXwLPcOyIakdM oU2Jimuo73xkmSfzExt4Dk87GCkKwsnCfG006+ICs9JmQ58aA6VOcHJb6BJ2LTuenB5Z4q +ke75B+LwYAWfEeYv7KS+4DdUUqQfy8Dq/qMx1lLXFU19TodOGWruHJIOtEucmS+yjvE3x 45YkmhOVkuy/C/60jXvJfuIMRN8Tm+AUsinPphBdrnZrxCcQrVymhV4ddlpF6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519739; a=rsa-sha256; cv=none; b=DKA6zLay8pUrdq2gEKxxmVyKFCqNAhJAmu3ug4RRvfuHRc65J2Rn5lR8sD6I8GQUDW6dGR M8q1OEU8mDPgI79QEKMvZVUGdhx3rTLRb0MP/Cjj4GeNp7t7A/M7UX18ve0dcMTUSp3w1B Wa/lcBbmGw5DPiT+kXflHajb7jR3Wqwr22YzxXhUTw6+L1HgO8Tl96V4CZ1aKenmVr9aAO cyo3TTC8pqMT6p54TeAwcqCQjajvqXRrl99iRAY6z/iB70I8hWBOrlp0Ltno4FyiwgJcuP g+7TLpevRsgE+1eBQ2lNM14oiW3hIdU9uEh4KACsyvQmIGF7gKwxHNrAne/IFg== 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=1694519739; 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=wWpfGgZLxAfrYdsXQq5UfFEBScwD30jhJULmKq6D48o=; b=YATBJ4jdOe/+Kbo6JJJqUt+3QKbLV8d75rPXYahnnzSlXfi9AgnMTBrV3Uc1AxUA4yw1TR A6rLez18GlBn6XT/qdh+onUnTxQBEY/gZbqdPR8ZjPU/8xzhftxfFj3VxiRvFW/yjALjGW GnaCRkV1oB8GCKSYLGcFbh74ls11473Enr2nKwS1FcQujeN3QGIdrVXS1tsLwZLNu9SLgk TF3VgIuPRCItNilwkvruS/uj/pGigQvFf5DHatsBOC/+DbYp73NqZ/bZlmFzoxt/kRbXYg cpRDPIfbBPTHwYnHmYYoIIPOyj3Qkg4M/qypk6ShgFuExryEQMjWKVAnaleo1A== 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 4RlMV32C69zWWQ; Tue, 12 Sep 2023 11:55: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 38CBtd1G086567; Tue, 12 Sep 2023 11:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtdUt086564; Tue, 12 Sep 2023 11:55:39 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:39 GMT Message-Id: <202309121155.38CBtdUt086564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 29a28b9940d5 - stable/14 - getdirentries.2: Reference directory(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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29a28b9940d568519aac4574ccc293f205a732ae Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=29a28b9940d568519aac4574ccc293f205a732ae commit 29a28b9940d568519aac4574ccc293f205a732ae Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:37:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:03 +0000 getdirentries.2: Reference directory(3) MFC after: 3 days (cherry picked from commit 3a02df5e27d2eeabffd761ff5cb79496a6d796ea) --- lib/libc/sys/getdirentries.2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 38d5c1e525b0..1c623fa59124 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -27,7 +27,7 @@ .\" .\" @(#)getdirentries.2 8.2 (Berkeley) 5/3/95 .\" -.Dd April 11, 2022 +.Dd September 5, 2023 .Dt GETDIRENTRIES 2 .Os .Sh NAME @@ -197,7 +197,8 @@ Directory unlinked but still open. .El .Sh SEE ALSO .Xr lseek 2 , -.Xr open 2 +.Xr open 2 , +.Xr directory 3 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 11:55:40 2023 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 4RlMV46KrGz4tYd0; Tue, 12 Sep 2023 11:55: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 4RlMV45W8gz3S4l; Tue, 12 Sep 2023 11:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519740; 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=1AePt8sB7y+XnUrUkQ6SvOrG6Bm2S/7wz6etv0YABpQ=; b=ar2ShORf3byXl0IOqdWopVt26qxJ099wJbH4uZiZnOMouRBKYdw0rZyfU5Nw+DUTeJ4CGT C39/KlSMsFKuLQV2z5WINGXGs8kcm+fRa6wBPznzSpABs3CRmvqmH+nX4dj7Fzxse92jwD bMU+RqdC7m1w8MDNrm700qwPVQd6HLizF4oqmcGTY7R4UNxT373ASMoGIuuh18m7ZYd44n GsfzZTBULo/AvX3GY8ahMYaqJZgOaSfaiQumB+TI4WW5veTNVNO20EUYdpvC0elt7kKfno BcUWVfoG4+6zAKV860LfzD8agOxlCTr2DbWkxlo7kydMichice6f73E3HfkOmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519740; a=rsa-sha256; cv=none; b=QHq3VXa+5IrFDxnno+cKH1jsVGYfEqjae9zfVUbJnhozOcZieiZcfVW9i+XhWtI8HmWE/R ZW+2vfE4yFrzEcUQqiLSAV10/1uOssm6xYknLGyrEknRlDdM5/MsPZ7uLq/Qws0ArL33PZ 8M7HZ+bX+LejbHbZh04sHMkEvMvvcAd1K4iZ0Cr3Kc85MYQbYNqzV7ReL0qy3lzRgCxzzy j7OagGes4jAUEs8gFae4A1VUDcsQMZ/TvCEJoCaQv1Ckew/MG4jzB4u9PV+4vuK8J1qfht JxTbQEEmae02ZZBFKZfdIRTQczas1PofEoF+gQcJXrkQP8A47/QVjzwSeJarog== 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=1694519740; 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=1AePt8sB7y+XnUrUkQ6SvOrG6Bm2S/7wz6etv0YABpQ=; b=K+NS8IOnGdF/AZRjkgzLe63dYiZoQrk1rJ5EipPtF+0Fw2EIEa/Qz0yldMweY+Ye/TZgln cTZ/DDtxC6/0qSSCwHDDeno1xnz+G93DNxfvovxPsk3TN8DfGW8/+4itNun0Oel7dKB7oW XTJvVx6t/D871JtC2Zyc4NehJKU2WrTbl1U6GjMwHKajOZ/8ErAEp1Yee/W6RR+QxFkaMV ua478EElyxoAerQIvjt65NvR04No7AO8bEpsuzHkfr97dfUbhB5ZOk4Ssp8Wp9pAJMhX9h w9uTn0E2TqD+adWhmIs6/D19gXu5d83BU0ggRmn9DeeelVcMvlDi+6+l5CC7Mw== 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 4RlMV431xkzWKl; Tue, 12 Sep 2023 11:55: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 38CBtePW086613; Tue, 12 Sep 2023 11:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBte7E086610; Tue, 12 Sep 2023 11:55:40 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:40 GMT Message-Id: <202309121155.38CBte7E086610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f4960baf8075 - stable/14 - getdirentries.2: Improve readability of dirent members 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4960baf80758aa34e17210adf1741dd6238ed69 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4960baf80758aa34e17210adf1741dd6238ed69 commit f4960baf80758aa34e17210adf1741dd6238ed69 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:41:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:11 +0000 getdirentries.2: Improve readability of dirent members MFC after: 3 days (cherry picked from commit 52d374a067002fc42409b32059ec8b8506a70429) --- lib/libc/sys/getdirentries.2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 1c623fa59124..0a06cd6b947e 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -70,12 +70,12 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -ino_t d_fileno; -off_t d_off; -uint16_t d_reclen; -uint8_t d_type; -uint16_t d_namlen; -char d_name[MAXNAMLEN + 1]; /* see below */ +ino_t d_fileno; +off_t d_off; +uint16_t d_reclen; +uint8_t d_type; +uint16_t d_namlen; +char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp The From nobody Tue Sep 12 11:55:41 2023 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 4RlMV64D26z4tYpS; Tue, 12 Sep 2023 11:55:42 +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 4RlMV55QVqz3S9D; Tue, 12 Sep 2023 11:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694519741; 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=QpFdX09Ss1DwCnwwkL7v99HEScRMTrFOTAI+lXNkzDk=; b=f85nMbeDBpyj53CSctX6wSUE+IFjRJI2B2RogMBHCvd4gezPhUwk/Dg49g08c+VKUtILk8 NWzYExatl3OIztgKyqmVM+GDhm9gtbcqYjKqeQ6uuvAi/M7654uen193T01C0Bl4DKrQ5p ct8qJqTQyO+xywYq0bYPQKagG8T5d//bgx+Wz2Jh/Lg+omHar3bYflzXcpwdDL3cAecple WquVC0ffv1LbQlYjpUK6zcDz4FVum8VTSexCTO/aBPtmujwHJccPXaQJ+ESv2vXYJfJYeV csg20xUIIUq1BqBzYDqtm/Lpbyf+jpfWTRtB7BG8lU0641pDDbtmPKftiAonHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694519741; a=rsa-sha256; cv=none; b=Q3HLlmmb9P3PDBP31yh6ekQd0vLRFPETc4I0WN7vod+QIf7fT+GD1WEOIzhXkQlpmBSZfI T3waszbxIT1GTkMOLZCutR3vkDBbl5qjWbAp17Kg8swkMNKqbkHH6X7Uj93MCjq8o4z1RL S8mdONGaj+d+rXXQ+md7oIBCOZEOu+7Jwl3g5LqMGe2IrUnvC9uLdA9fdW1utncj6sPkC+ nQ6bpWntO5DBo/XqkuYMQgByFk6QacovBvfB7wd1LjcpCAy2u8fqRfn+Tci3GL/1xC781d 71N7EqkNlZqxWYFrLwc4WXS2EOITgKG6FeyCMHSuZBjM4h3q68Pu5lS841rBJg== 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=1694519741; 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=QpFdX09Ss1DwCnwwkL7v99HEScRMTrFOTAI+lXNkzDk=; b=Q4geH29EtpmXW335WhObXybLyOl1Lq6JjyxMFY+fsJU/4FqIkJvLRfit1fu7bSg4KjNT4V +wG6gSdEMMpwR3A8vJhkR0uHDmbaabnXVryz0j0usqx0rseD/MA+89XEYtf6QsZYuphsro QsPcKYPmn13T7mpCdppb/BHih5hkERzZ2guCzWuZhLTL6M/LtX0XRJ1K8g8bKFC5v7LMas LIUBuP6W2ugvRdD5zLBHGKTvLLq9eQb5l1YaLyGzLgqIpYmeX4PfOIQZBn9yxUUlx1ZNPV SVNH8Odt7yPjgzZCjwrUbP+Qz67RSqoCaJsf585/6SU/OVnXcFYM3jNGxf0Xkg== 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 4RlMV53jx6zWMy; Tue, 12 Sep 2023 11:55: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 38CBtfAE086656; Tue, 12 Sep 2023 11:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CBtfmd086653; Tue, 12 Sep 2023 11:55:41 GMT (envelope-from git) Date: Tue, 12 Sep 2023 11:55:41 GMT Message-Id: <202309121155.38CBtfmd086653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d2557f02d126 - stable/14 - getdirentries.2: Reference dir(5) 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d2557f02d126c1300b491235b1264bcd39d8de50 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2557f02d126c1300b491235b1264bcd39d8de50 commit d2557f02d126c1300b491235b1264bcd39d8de50 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:48:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-12 11:48:18 +0000 getdirentries.2: Reference dir(5) As a note, parts of manual pages getdirentries(2) and dir(5) should probably be consolidated. MFC after: 3 days (cherry picked from commit 5b7a776f481891f10820a0b4838d0e0feb60b8ad) --- lib/libc/sys/getdirentries.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 0a06cd6b947e..74fd57f9d74f 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -198,7 +198,8 @@ Directory unlinked but still open. .Sh SEE ALSO .Xr lseek 2 , .Xr open 2 , -.Xr directory 3 +.Xr directory 3 , +.Xr dir 5 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 12 14:19:04 2023 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 4RlQgX47vqz4t21m; Tue, 12 Sep 2023 14:19: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 4RlQgX2ZQgz4PJ8; Tue, 12 Sep 2023 14:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694528344; 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=w6skAdTkJDvb9xMTM/NkOXdw2lHDo2V4vDW4oVa/4SE=; b=TaPmSsZSwIYg5575qt0auAx46rPo3AnxKeB0UkihvQiTU/TwKsLwzqJvNdeVy/+zXPo95W SEKCp0WFMqzPEaGD2k9jf68WtvY5zcqWqzvYeWG0GO57u6C/dnPvOkDaAYGCniMIb3XJmU L1H2nBDrsEbh/zMLHsEFYEdZW6E16ofQk48bw/D5JJiHG4ZOVkyQukOf8MRmpS4CefBB+Z ypQzGhpUUEHF1jBNUDlH7YDljGCr495o3S4jrB+4Xq/uuB66PRiykroBLkihJKH8ZKbVeL BXMK2Gei1SrKnXEbINJ1jjtNidIw5gw7x3YD4/jnD0FoUyHnwwcPI54V2gSC/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694528344; a=rsa-sha256; cv=none; b=a6dBsrIhYmiZbWfRV04C7hoxUWkY8psHzsNd0sFe2NmbjPIgEPxeGbBL0NvciFPw/oeCPd vhwvLUybtgrfQxN8GLQ2V4SkAxqDxquQCDkuEvPdYvI1YkFiMFGukgRnU2dbQMZDVuRVCg fBzkdmSMtQ4WvoBuEfp7HIL7Wl10STl00lqUlGW9s8I83jGW5hMpd3gpeENEPQNPMswcBC Qr6qR6j8VUD8UvgJVPuU2SEtHTovhVvZ3/TSBtRJA2mGz4sgZYiSbZDaZK/TnyKRFfnZ8u pE4MRWqtIr9gs5mIMYVv/2YOfaDcBuZFiU0J3OPa4xrIpQq+hUDYj3ngRiVvRA== 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=1694528344; 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=w6skAdTkJDvb9xMTM/NkOXdw2lHDo2V4vDW4oVa/4SE=; b=AmTk2SOLO9Ur3Nm3PB+jvW8B1I0ZsWSzoPuKXqYMmIDmSk8fosZituaLBgWrNP7pzpMjPb 8jS1n59DJa8oUCbfcb+xE3u2kHkmYTBjKFzNi62Zm/+ki79eYYFPh5S6fxhGZEQOGM2Od4 uQ0V2F3EepIwwbwVU43W03QUU4Rf+ePAkCoGXklrhBKXWGGlzG9yO/stHAOauqTZzoAu+Z vQsHSnkqqTF74k0gyi/CbGhiObDV4i+gvLTfgNev/YuHfT69UNg1RA2fY7bA6IQAmFn6Bq m+ioeI8tZdadhMbTCtXjrTiwCU54G4DADMthWpQL+c+q6JLW3ycn0LPTh6u07w== 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 4RlQgX1gmvzb3r; Tue, 12 Sep 2023 14:19: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 38CEJ4fA020249; Tue, 12 Sep 2023 14:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CEJ4kh020246; Tue, 12 Sep 2023 14:19:04 GMT (envelope-from git) Date: Tue, 12 Sep 2023 14:19:04 GMT Message-Id: <202309121419.38CEJ4kh020246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: deaa6984ada8 - stable/14 - mountd: do not warn about using class mask with -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: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: deaa6984ada80e36aea2f16e5f7211dd0d14800c Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=deaa6984ada80e36aea2f16e5f7211dd0d14800c commit deaa6984ada80e36aea2f16e5f7211dd0d14800c Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-12 14:18:52 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 (cherry picked from commit 48514c5724cdf3338dd6d220e5deee6178d7ee48) --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 436481bad14c..6602dbc09aa0 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -319,6 +319,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1757,6 +1758,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3393,6 +3399,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3426,9 +3433,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3443,7 +3447,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } } From nobody Tue Sep 12 14:19:12 2023 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 4RlQgj0xGGz4t275; Tue, 12 Sep 2023 14:19: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 4RlQgj06C8z4PML; Tue, 12 Sep 2023 14:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694528353; 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=r3srCNDMBeFpTZ+/XJKdALmAmg3qX5JQG2qQX4PXF84=; b=sCJaZT7qbfKFm17fk0G5UXJn/XU15S2kN7hqo5jAeGk0Ip110mrDju8Ocov4gD8gBh6gCe FIozYR2wUXuqv3o+98tgEPa6n+SpYB0EY0JnYU1QtvH73FR/w0OAHferLdpzTIBbsu+TW/ j5QfS43ibkxdu/cN6ZH8O+yNSearmSAk8ImwVpbG9L6hV/5vRRoRD1ZZ55RJJqZ/Ouot+A NfrdWlpe1gbAiSIzZPxFrbqhF8gxbPXkBgocUp2XB6pW9Yee45a14eNlTuRN1l+KWE9wLS lYfFEjHDRgSPk0EsfYrgqgSfZRiEDSo9d6cXqiKz8uCeyQ+oCG+kX1SJ6Cxajg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694528353; a=rsa-sha256; cv=none; b=OwWQXhrHu9GMO9uDJAGEWEvTYJ0K+2qT9MAhRcV9Pi9d4vUQH5ElUJOLV9oitJkXaf8y7i frE/31Zg/1TKNpF54eBMOI8ZI9poWcgZvQyfHkcct+sftKZHUUA24XBiacIOhIQgPxeqQP 8qD7LPs+uzQvE8ajop+WhgD+GmW/58AzscAfeFllMNl1wDbBx45fAJManpAvY7+Z+55dfp lCdde0aqYBH0gtXGWgfyvSP+dn+o9X1mHB2bWdWXRrac/mZBc4uMx2yWirZvZeKQFhVQLc lyhp4w++DYZYTnRC6xhooa1oZ8ijnxcSC6XJh0YGu269IDv6de0GgDIIjjaFdA== 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=1694528353; 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=r3srCNDMBeFpTZ+/XJKdALmAmg3qX5JQG2qQX4PXF84=; b=IXr+qdSMisCDmw32V5yZif4Z6h9Ql1fIQTsc6/rj1hWHE1Q1kI2pWuOYm0/WohhsY14BVx xg1tCC73sj9hRGkI4iylWUJi5BkiRMKkSbrmlUBcnZsLvEzum+0dOdCMlCes0yZQoULPoM 1E3kmPZijT9tfiTo/T5+nArSDQQ+dgvVXW0RaCpItCRT0OOC6QaIJQjiEY9H/dThN61+Hj OdRJ9vH4HhU27NWickkZY4G1WX8JykRKP62sLRN6hOyfC+9zl3ae/egb+iRIimqTkQXwnz Vwr7T6K4ODhwSumLfPGuTN8KgTd7Ucyya75udZzr6vUChUbfX9jET8CzjHui3A== 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 4RlQgh6KYCzZvK; Tue, 12 Sep 2023 14:19: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 38CEJC0G020411; Tue, 12 Sep 2023 14:19:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CEJChE020408; Tue, 12 Sep 2023 14:19:12 GMT (envelope-from git) Date: Tue, 12 Sep 2023 14:19:12 GMT Message-Id: <202309121419.38CEJChE020408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 79ce96abd6c5 - stable/13 - mountd: do not warn about using class mask with -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: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 79ce96abd6c5dee2ddb2e35755c7ff9156510d81 Auto-Submitted: auto-generated The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=79ce96abd6c5dee2ddb2e35755c7ff9156510d81 commit 79ce96abd6c5dee2ddb2e35755c7ff9156510d81 Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-12 14:18:33 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 (cherry picked from commit 48514c5724cdf3338dd6d220e5deee6178d7ee48) --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 34c3387c6236..eba59ebf00a4 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -317,6 +317,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1747,6 +1748,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3383,6 +3389,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3416,9 +3423,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3433,7 +3437,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } } From nobody Tue Sep 12 16:40:16 2023 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 4RlTpT25lmz4ss0v; Tue, 12 Sep 2023 16: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 4RlTpT1hMrz3ZPx; Tue, 12 Sep 2023 16: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=1694536817; 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=I/LqWLdkBsWsY/ezzkYShS4QoVf292BCvN9r9Ly7+eA=; b=vHHz4SEH4yEZN0n6aF8Mv8LSi4uFxwMzIB9xD76Am8B0f0ix3uvoftmanXr74dMPC0B5ps EZ2Qpqng7hossb5rPB66P3TFq7bfEb5uYviKtW/QzydnBAsDGvq9wduL3Dg72sBYyoejxi tL5tDUtU7vmlG4wQs8hX90yQje1CiDPio4ruvmr3LtxUXQXhQmCNLP5PvJNRJ5+9cPzYMJ veECP6SLBMH4iWVCTJRFvHX3b4QrolN6xL00j7/iXxURjLkTsOwLUD8dvzqfdBNn9n0nZ5 cXEyZCKuAuQBMPmsmGVVyW8U7gjX/v8L6Hgot4fUwnWDTHpx+lL/My+ipC0Qdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536817; a=rsa-sha256; cv=none; b=YfBgEmpY+bLAQCZfW2fkZUVIA4OJw3MjPov/audkg0WJq686iX961yRXwOI6YLkI7Xhuyr jmSnK+1GIydJepgTAMhZbnpsa+boizkf2YsW707MQct4hpQ5pPpDFMYJPN8ARthaMjbIjR I7tEdmHEB5CzHBUOqPygraoJGtW4uZjIhG2jyddmiCAGEiMn06wVN72BIuMJbot1bW7wQ5 LDQi9f5PkAQjNZniYCsq2Z83KlQdf/3/GJKAnwqVNfhR4I6LVqtwtz0aihTWbHtuen6DC6 ZZuz2Nfivk17U2ZTNQ+r9DLbY/aSBim3uUr5oLcDypb2FWSALyDGdcDSPMDVfQ== 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=1694536817; 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=I/LqWLdkBsWsY/ezzkYShS4QoVf292BCvN9r9Ly7+eA=; b=IfeTatZpSc/x2pachwX9SrfFF+ske84Qj3RHC70WWsGbKi+sv+v60WvuL8nhTsew0oA2Ep u0U6yEGVd8c/hFQyg1z9VS7DJoTkDP/hBQ6Eq9EwPRXfH8rXhjeqguzA/bIfDjk4g0VwKb LPwlZEguML0w9UqGnk5Lbg76NvQ/m+5OzVTpXNlxH2vb5duHLwdDc+O5Y6mcUVf2rcmlhF Nn5KMbmb+V6xgcOWsE8lTgC8sSkdAmFfnMdlh9JAzzXtJOPegc+xzZjcb0Mg3zu31D4a8W t6wUTnxKxemZfaAgZh2zCSSsimFhMYZ3THfHSu6gEgbLerwRmcol2mq11UYX0A== 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 4RlTpT0djQzfsP; Tue, 12 Sep 2023 16: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 38CGeG2P062780; Tue, 12 Sep 2023 16:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGeG8A062775; Tue, 12 Sep 2023 16:40:16 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:40:16 GMT Message-Id: <202309121640.38CGeG8A062775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 6af462f0ec36 - releng/14.0 - mountd: do not warn about using class mask with -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: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 6af462f0ec36fd8c2f1a679932e71e4afe438be4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=6af462f0ec36fd8c2f1a679932e71e4afe438be4 commit 6af462f0ec36fd8c2f1a679932e71e4afe438be4 Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-12 16:39:46 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org Approved by: re (gjb) Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 (cherry picked from commit 48514c5724cdf3338dd6d220e5deee6178d7ee48) (cherry picked from commit deaa6984ada80e36aea2f16e5f7211dd0d14800c) --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 436481bad14c..6602dbc09aa0 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -319,6 +319,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1757,6 +1758,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3393,6 +3399,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3426,9 +3433,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3443,7 +3447,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } } From nobody Tue Sep 12 16:44:09 2023 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 4RlTtx69Jqz4stXv; Tue, 12 Sep 2023 16:44: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 4RlTtx5lSBz3dLW; Tue, 12 Sep 2023 16:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537049; 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=EG6vaUE1ckAnV3fw4EmRLFPFbRMbdkK1zxYvB+tXBtw=; b=FZslEcBYNCg41xiKGwvwgeZ15N+Zp33v7rDPcdSsy6LRShxZhQj5pEzBLYXQ9SHtY12EKb mj+t3BO0eDiWxP4MJUnyLlOGTpn++/q4/tgbhQZ540Lk3oViVL4dwEEs32xWia6NiFT0G1 K4mmdmDzVZrg0Dcf/HOJ3bIxFdxdbXutfk2Q5UfSUBt6HOubkJA0t5QNag7tYBq+vx2yRi 9jAwZsWnO3gcZTmrMofsWXWyMDggSD2E78bguTeFDwfwSS/hMHJLmue1y+/EL6wXeEGpOY r2AhFmLMHQst22O1XhtyWloQhY/ewdGiFdo12th7r2+f469rZ8XUVXHxDibiJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537049; a=rsa-sha256; cv=none; b=XPRAtzNG7f4/logDl45gmd2pph92scrFj0EjbpRAMQAmci7GU0SqVhXBQ2YIrcw3qsqHfp Jq1CeojcpR55xSPtIi6lYAUVlXK69NhY4ksulrp19NcFrxizVEUU0eNeag5nDcWbE+a0oO DGJF8Dv8D3+P/KoKtWI0GMAf725m/fnstUXQl8hExC8mAKIHd4SAdMz+/4vr0fTOIVzoiu R9G+4oz16X1NrG1vQhZkyasBiXuNriptyCYt3A/zQ9Chbqo8AQlqCE1j7J9O7lJzdrW1ia oj/D2HmdfF+0X8oWAQJU/8UhNmead7dn1bAkwkNt1GRsdf5HmpS4vfrRFHtrIA== 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=1694537049; 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=EG6vaUE1ckAnV3fw4EmRLFPFbRMbdkK1zxYvB+tXBtw=; b=UkozN9mZPsO8nbIgTe+nxXW7VukbVGS4Nt44306cvCo/3HVl6wxt3KdJ/i45BSq/hZtAzg JeL6jR5kSYlVYTuqoKXNYLxgYe8vc4s4Ti0YQrbHe31t4LWLNKaQlEiLkQo4w52A1X6PGl ZDaIYEW0jmiqBQv0y4xlHsNGz2c+AraH4mdBXpTW83uNKENXpPRJT78fnM1VubdScPuwnX MCGE8Aeev5nUK5+9uvSc7cVySV5W3YGZ3o0+UpnLUIzH4VCOZ4fFPUZXm1BZP5nMIURlEy pv/c7BEOJw2VtBnaSiowKOhKGWEqSc4qzva3zr5BRq9/HuQnsp1hLAnzfHnr/g== 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 4RlTtx4pbkzfjj; Tue, 12 Sep 2023 16:44: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 38CGi91q070934; Tue, 12 Sep 2023 16:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGi97c070931; Tue, 12 Sep 2023 16:44:09 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:09 GMT Message-Id: <202309121644.38CGi97c070931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d64356323c10 - releng/14.0 - linux(4): Merge getxattr for future error recode 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d64356323c1058909df7efe772f7ab0843a30f55 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d64356323c1058909df7efe772f7ab0843a30f55 commit d64356323c1058909df7efe772f7ab0843a30f55 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:09:49 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:13 +0000 linux(4): Merge getxattr for future error recode Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit 6b46ec66129d9490c91876f72d98e514121996a6) (cherry picked from commit 803280ea07e9c07007e0acd3864a18d40b86de2a) --- sys/compat/linux/linux_xattr.c | 62 ++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b54a0d2f89ad..901123684154 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -68,6 +68,15 @@ struct setxattr_args { int follow; }; +struct getxattr_args { + int fd; + const char *path; + const char *name; + void *value; + l_size_t size; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -262,47 +271,66 @@ linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) } static int -linux_path_getxattr(struct thread *td, const char *upath, const char *uname, - void *value, l_size_t size, int follow) +getxattr(struct thread *td, struct getxattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_get_path(td, upath, attrnamespace, - attrname, value, size, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_get_path(td, args->path, attrnamespace, + attrname, args->value, args->size, args->follow, UIO_USERSPACE); + else + error = kern_extattr_get_fd(td, args->fd, attrnamespace, + attrname, args->value, args->size); + return (error); } int linux_getxattr(struct thread *td, struct linux_getxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = FOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, FOLLOW)); + return (getxattr(td, &eargs)); } int linux_lgetxattr(struct thread *td, struct linux_lgetxattr_args *args) { + struct getxattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = NOFOLLOW, + }; - return (linux_path_getxattr(td, args->path, args->name, - args->value, args->size, NOFOLLOW)); + return (getxattr(td, &eargs)); } int linux_fgetxattr(struct thread *td, struct linux_fgetxattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct getxattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .value = args->value, + .size = args->size, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_get_fd(td, args->fd, attrnamespace, - attrname, args->value, args->size)); + return (getxattr(td, &eargs)); } static int From nobody Tue Sep 12 16:44:10 2023 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 4RlTtz1tdcz4stmc; Tue, 12 Sep 2023 16:44: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 4RlTty6n4Mz3dYV; Tue, 12 Sep 2023 16:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537051; 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=20GSvIS/ruJetSb45t+Q2oFGx6kihqJj5QWboJN+PZA=; b=lWbnXYOAtqHoArd+68tjeGPr7FwPvZql0SBb14QrF0Z6ihRzlFvO/lNp03WxqLMNzAykjs +Pb6phUlkGKaScULHVzyomeyFhNYCoabj8q0O0R+AdJ4uKllgsNlvqMVWskcZayM+aWKyu 8yOt4CyaD6mRIHeLIAK79KNmRliL3erVpiaIl6XcLQhdIBRhWva82JjumUxiGzug4kPAiK cPZbllZxkcv80sXo/yOiMIfrTgF2I14L7rhv4Y+1FknT1E1dYt8j2J5dtTbNlzYNFOM5fF VHsZErg6lEbbOvNNcaBrYS6xVsuW8YFqgzwSX+Jzjd/BByCK5MUNw3Y6YG7rfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537050; a=rsa-sha256; cv=none; b=irAb+YxfAU8smI75YgnQWM7nq97WG0jw9b1mWefgobBm0i2qVrea59mR65aua+JDUTr5XE qDqhgeCIFvgZSTKSJUArCe32Q8uz8nMmMF2PL3HZuX2OYTJk5BlpBjP5Go3FU/wwSlgXeh izZFOW2fr+1dLs9+z2RNJIhLk7AqNk4g9vr5gVjLdJ7XFJfL4pDfaCpFHjpdC8du2Qe9o2 2XV7rjlkiNJ0ZlQM6fBU/iRyQytMEjhw9cJZlGSXDA87lzqZPFHaqy98iJ9Qw9L6DOibbz /prhsCBABmm9Xuw7ONRbgTKaIcI9y9SERP2fVvDCe04N8cS2UwlfOQt1h9Fleg== 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=1694537050; 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=20GSvIS/ruJetSb45t+Q2oFGx6kihqJj5QWboJN+PZA=; b=ISf7aCuymvz+PCNAhFeypXp281L2NRb/eQn1rJib0voJZwTk9L4/ArcYTVX76jsR2OBGHY oJUGnmV4aJa316osXu0S0F6oL7Lplj8GtRqyMq/sMdo54l+Z1/lSzc7p7ftrisuGHS29jF M7UWoT+BPK75/6it2cLPNrt0w0edI9PADS2obAmA00spLfykfaSJVfEtIJw0IxmPgc0gSA iX/kA7K7W+3LBPISLZjKLQn8X3xtMixiNlYDXXDiPyO3j1UekfYi21cM3BTtI8depUncnc p8EqdIzB4DIzb/VNBgm252yEpmUsQoqIaTB01YIskr4c8uxG6QHO4z7GCCJ6JA== 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 4RlTty5rF5zfjk; Tue, 12 Sep 2023 16:44: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 38CGiABZ070988; Tue, 12 Sep 2023 16:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiAKV070985; Tue, 12 Sep 2023 16:44:10 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:10 GMT Message-Id: <202309121644.38CGiAKV070985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 01d9f0eebf8d - releng/14.0 - linux(4): Return ENODATA from getxattr syscalls instead of EPERM 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 01d9f0eebf8dceddc465fecac919c1e9d7a586a2 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=01d9f0eebf8dceddc465fecac919c1e9d7a586a2 commit 01d9f0eebf8dceddc465fecac919c1e9d7a586a2 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:31 +0000 linux(4): Return ENODATA from getxattr syscalls instead of EPERM On Linux ENODATA mean the named attribute does not exist, or the process has no access to this attribute. Approved by: re (gjb) Reported by: zirias PR: 273517 Tested by: zirias MFC after: 1 week (cherry picked from commit 4d59b790553ef75b9a4b6a673eab3354f3d012b3) (cherry picked from commit a9b8a0ced46efe72ec118a749d191b29ce47712b) --- sys/compat/linux/linux_xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 901123684154..b9717c62133c 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -285,7 +285,7 @@ getxattr(struct thread *td, struct getxattr_args *args) else error = kern_extattr_get_fd(td, args->fd, attrnamespace, attrname, args->value, args->size); - return (error); + return (error == EPERM ? ENOATTR : error); } int From nobody Tue Sep 12 16:44:11 2023 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 4RlTv01R8nz4stk6; Tue, 12 Sep 2023 16:44: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 4RlTv00y8kz3dWk; Tue, 12 Sep 2023 16:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537052; 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=nhkvlxfUs/XetgSCxRPRhhhsAZ7jIYRoz6t+dl0wP9c=; b=kvpmFTm2xXOZPp0yq5v1/x4exaVixLPz8oyxHTKKeHK6s5uo4HC6zOQnt3rpu5+ZT0TLuF 1MGAURlkd6/sQpBaJiS5dqoT43NtAlVCW9ouBLwyZ7odAmaMmvJOvzVobRElEJEqMOB/sE W105XJI+Dqa7oPZ6QUBhaZU/A2uzLVvqdmWnAsW8dvoAsIBtmbEDOSTFy94AT9r7yELsDV VAG1Y6Sa76lMvyUdHydA9cTt3A09MInYYdPlcf6ca0bf5EGXEHv8uwN6mmyJNKXFsaBrK5 lGprcEhWFEGLq+UvZugmREXTQUHZH1rYJLoMaS0/47hCUxNeN9F7zYWrqgkGHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537052; a=rsa-sha256; cv=none; b=F7gMJmiqiNDD7xoR8vPOPw2VHhObnSpnMp5fA8gUh5qm0Astwu/3f1TufiIREgvNiosbt4 dUXSdTvE5VWos2oQtnfUV9lGlAmnEqCNa6G/b+gj7iz3URnb7YHwJyhJbjiWtjbIMkSb19 lGu0L219MkpzAcOJ0UYM7HYrhS/O8GxEaUZsj4ksitjcjAstvJCOuDFs5bJShwRHFK6xZq D9FTjySIEnScoOD2rF+NLVHfO9mrLeuZH8W/ZznMThyqIEjFANtQ/uHRl0Z+6ABZuVNvvG zuMcG+3BYdeIAG166/Eiug0eDos9BKaM78RP+eOMAwmAruV/oKfZSP0dOXWYoA== 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=1694537052; 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=nhkvlxfUs/XetgSCxRPRhhhsAZ7jIYRoz6t+dl0wP9c=; b=JFmsp6jNtb1q0Q4kl/eHsqFOeKfLnTGZizqB7GthC61aQj2d575blQWeu/3aK7vlgZaUpt Xk4uD7SrTcB3/58PIWxCIpy5pkEYDQh9AtEi8EYFNld32iYWirX5eVUc4G0e+kmqELM2eL dU8kPgA9R9RVCVKVqrs+s2eiRiTBTSPXf7RiLaKIjO4S4Athg5du033EIcoWMkMa7A5bD7 LYxPnmSEpgJBPJ8bbAvibagHEgk/6ZV9UJbl6tFTk5kSPR5JsHdvs5LylN2HP76jbwrYuG i8qZCiOnR4+1a6gVBubtpwigUZdgpVcjqSy4YAR4FQZMJTMBwIrhWrdeELXv3g== 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 4RlTtz6v9pzfVk; Tue, 12 Sep 2023 16:44: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 38CGiBMZ071037; Tue, 12 Sep 2023 16:44:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiBUf071034; Tue, 12 Sep 2023 16:44:11 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:11 GMT Message-Id: <202309121644.38CGiBUf071034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: ed3248554e5f - releng/14.0 - linux(4): Merge removexattr for future error recode 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ed3248554e5f4806cbda5198c7af8d3b112518c7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ed3248554e5f4806cbda5198c7af8d3b112518c7 commit ed3248554e5f4806cbda5198c7af8d3b112518c7 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:10:44 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:41 +0000 linux(4): Merge removexattr for future error recode Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit dfcc0237c3a97f4f7962da854389f3c5d976145a) (cherry picked from commit 0f35bf8b294e2c57ef0d9cd39f0f44e36cd4f7be) --- sys/compat/linux/linux_xattr.c | 54 +++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index b9717c62133c..2b46cf708c7d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -77,6 +77,13 @@ struct getxattr_args { int follow; }; +struct removexattr_args { + int fd; + const char *path; + const char *name; + int follow; +}; + static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; @@ -227,47 +234,60 @@ linux_flistxattr(struct thread *td, struct linux_flistxattr_args *args) } static int -linux_path_removexattr(struct thread *td, const char *upath, const char *uname, - int follow) +removexattr(struct thread *td, struct removexattr_args *args) { char attrname[LINUX_XATTR_NAME_MAX + 1]; int attrnamespace, error; - error = xatrr_to_extattr(uname, &attrnamespace, attrname); + error = xatrr_to_extattr(args->name, &attrnamespace, attrname); if (error != 0) return (error); - - return (kern_extattr_delete_path(td, upath, attrnamespace, - attrname, follow, UIO_USERSPACE)); + if (args->path != NULL) + error = kern_extattr_delete_path(td, args->path, attrnamespace, + attrname, args->follow, UIO_USERSPACE); + else + error = kern_extattr_delete_fd(td, args->fd, attrnamespace, + attrname); + return (error); } int linux_removexattr(struct thread *td, struct linux_removexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = FOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - FOLLOW)); + return (removexattr(td, &eargs)); } int linux_lremovexattr(struct thread *td, struct linux_lremovexattr_args *args) { + struct removexattr_args eargs = { + .fd = -1, + .path = args->path, + .name = args->name, + .follow = NOFOLLOW, + }; - return (linux_path_removexattr(td, args->path, args->name, - NOFOLLOW)); + return (removexattr(td, &eargs)); } int linux_fremovexattr(struct thread *td, struct linux_fremovexattr_args *args) { - char attrname[LINUX_XATTR_NAME_MAX + 1]; - int attrnamespace, error; + struct removexattr_args eargs = { + .fd = args->fd, + .path = NULL, + .name = args->name, + .follow = 0, + }; - error = xatrr_to_extattr(args->name, &attrnamespace, attrname); - if (error != 0) - return (error); - return (kern_extattr_delete_fd(td, args->fd, attrnamespace, - attrname)); + return (removexattr(td, &eargs)); } static int From nobody Tue Sep 12 16:44:13 2023 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 4RlTv12XKwz4stxM; Tue, 12 Sep 2023 16:44: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 4RlTv11pTVz3dm7; Tue, 12 Sep 2023 16:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537053; 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=Zel52JLvPLeU5A2eTCmLZdfdDWobqLRJADU5wK8N36U=; b=RELLaI6siF59CIGRQGbD+6L/i6EvwbqOcA3I6T3H9eTuZyZkYK+L3eS34masTDyADHbHqp tehBr8fzf26fdq0Lb85Qvvjbce6QUhJnUZET5wIu+TRWdOA+BbT/BZow16CjUVCRUrQHZZ 8Y4A2gIoKO/jCNVbitMVUp8NmOB0rBjTmZnLj5TurS6fHBmMn7XYM0dxvJbLM7AxmkTLQm feJy7Y0DWixsSPQsl/vx1VaP8dmbonHrHVlh7LNiT81DyUq5omoUpHhUdlwkLuXfP961fI fT5QzI6oH6jVh8iulwIL4R2hGXn41IicZERKH0CIIgus3PbbWCdrVotNgu8yDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537053; a=rsa-sha256; cv=none; b=CodyyTBR669gmIM7t78k6uDD+mFghyfm6e22zSD8PoFkHzC18BCKXr5dc961XqfN2W9lcC nqFcoSu89mK0QyspfzCvkgb+nj9tlqhABBnSRIHlzmXyfrT9UMwsY0N4F0YqKI+ctULmkV RYvfxzoA4kAhFQ0MuLCpfZtT8uZqbeFHzZLzi043xA6xDBcBcgGX7BZwp5Xk4hFZFxmtIX S/z8jJ86tFqHjd4oLK6SaM5Ig0JYe/0VWOVf7wRrZ+tnw7svSmqecwwGXi9GFOKij23Sj2 oKi8/uxoBI8PS+aNF8qAqdEqTRtszIpK1Sw0N42qvpeWMWJ3nuRJt7GydCOmMw== 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=1694537053; 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=Zel52JLvPLeU5A2eTCmLZdfdDWobqLRJADU5wK8N36U=; b=Ntv83BGoLOsGsjj+Zp5c/0c1HjNZB0Tt7N6oNNFngD/CYYomVPd+VTUMWHpX4ueJZIZzGi e7IyjJZHTUCAuz2LEFHvuqFIpAaJWgXpz2voRdrIzXzyVLm0lw/OhbYz5IBB0xz1eP9Jcx X4+O5jsSt2sCzPxK1HrbS43Xi/pDQhUR3YlQROQmIQdnNCO1RUrLJoixXW7ORY8maNCot4 F8cgcJspM32Er+kKMktMbIyPtL3aHerVM2XpE07hheJAia3qgILx62DGivXCaqvoQZNNaq WGJ4ZPE/YVDlRhOfZvWOcjNfeoi8b/8ePZfOrTK0ywp7osyVGFr3Bb1sXysmhg== 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 4RlTv10mPbzfvW; Tue, 12 Sep 2023 16:44: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 38CGiDhY071097; Tue, 12 Sep 2023 16:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiDs8071094; Tue, 12 Sep 2023 16:44:13 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:13 GMT Message-Id: <202309121644.38CGiDs8071094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 108d330fe3a3 - releng/14.0 - linux(4): Return ENOTSUP from xattr syscalls instead of EPERM 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 108d330fe3a3e84ff86737a0ad6fa1de375023e8 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=108d330fe3a3e84ff86737a0ad6fa1de375023e8 commit 108d330fe3a3e84ff86737a0ad6fa1de375023e8 Author: Dmitry Chagin AuthorDate: 2023-09-01 08:11:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:50 +0000 linux(4): Return ENOTSUP from xattr syscalls instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Approved by: re (gjb) Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 1bfc4574f78653e4b64ac9dd31518c96a17fe52b) (cherry picked from commit bce9c2e34006dd70fb77a72f8cce1ead8a01db9e) --- sys/compat/linux/linux_xattr.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 2b46cf708c7d..74b47f1cbaec 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -87,6 +87,16 @@ struct removexattr_args { static char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES; +static int +error_to_xattrerror(int attrnamespace, int error) +{ + + if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM && error == EPERM) + return (ENOTSUP); + else + return (error); +} + static int xatrr_to_extattr(const char *uattrname, int *attrnamespace, char *attrname) { @@ -188,7 +198,7 @@ listxattr(struct thread *td, struct listxattr_args *args) if (error == 0) td->td_retval[0] = cnt; free(data, M_LINUX); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -248,7 +258,7 @@ removexattr(struct thread *td, struct removexattr_args *args) else error = kern_extattr_delete_fd(td, args->fd, attrnamespace, attrname); - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int @@ -392,7 +402,7 @@ setxattr(struct thread *td, struct setxattr_args *args) attrname, args->value, args->size); out: td->td_retval[0] = 0; - return (error); + return (error_to_xattrerror(attrnamespace, error)); } int From nobody Tue Sep 12 16:44:14 2023 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 4RlTv23s8dz4stbP; Tue, 12 Sep 2023 16:44: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 4RlTv2352Nz3dpM; Tue, 12 Sep 2023 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537054; 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=luOmTfveNIfgi7zLnzl7yrKVv7AH8hrBZ05hpQBLpPg=; b=ol4gjBNLKE2CGhYagzEgF/fD01nmYqnkJwCYx4dc5aZjijHIPGRJ2Ip5UiEjIsbNnwugAM 2wNUDi8ztm4FBJ5fJNFWTGkmbh3ai6ZWTzTjT+xDqvk5oBWys2wm0hG1JOXEcWTpfhzFyT 56WKkRYpV2nMuYzs8FhK6aEmXXWOLJsBxg2l5nrIffKRmfWhoF0bODN+2CyjvaPxQyMS2r 5Ifg5sNcIyQY+gkZxsZYWO4y1hjTIEpJqJZHeMDldtKbNXEicMKmMeUY1HkqR80uh0X5C4 d/gr7WZgh92rkMh2iN3tDrcvOTuIGm1LJiDxHrMBVPVNRrlqJ8XZoLUD8vxjIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537054; a=rsa-sha256; cv=none; b=eE73MASnUD7stiGHtxbfIiE3pPslmtFHfcnMoInadn6bUFKIZnxMm0qXXbbZnKdG17A4Vq 3fUm5NQqYmkfaORzoYc2iNG3YZ2JsDspP13DfaXAXhIViAvNEFqAY3T99KthoMcgURPDyq tF7pMgPuUNurpEp+Ffsnk+Z6YjwwtLga1N/9ajcaKnzK9dSiL860OQFvqDeUi2pYdZJmRB IMXNK9sJNuvelbCupfp4a8jFaVMwimCeLIeOv4O324AfmANz4BeRmsfDSnI+LFxJcWAczM 6g8FRCseiEAXdJ3dETOpFp6y4K74ezKZtXnaj5JfPkT4nexgFrASNQ12uhRAYA== 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=1694537054; 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=luOmTfveNIfgi7zLnzl7yrKVv7AH8hrBZ05hpQBLpPg=; b=i0Ny3X5w7jT2xAjEnNRVwLciqQt90PL1632tGvV0iWG6u0kOEWxzthRUugNEkE/HkD+rLT 8WdAw/e9YFlliPYlPQGxVR8BZeH86vFjHv19PBmfq4uvk+sUzogoKOd8SPMrXamO3t6Gu5 TP7lKMBzZq2Sg2tShCNdC031yHiIxIcOUhsM0podryafOs7HSwgxNsQsDF34vbcZOnU2Dr wEHcjFCr3AXhet6/b/rlJOQQTd1GW36UkRVqNJTvdIoJWaENMYhKPDJOhSlugylb8+k9j7 8rL9mtfJ2tOkujOTsThQFplRisaqBmtPdXEqAWbCO8v3SqAV7QyeGXKOP98kIw== 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 4RlTv21qXBzfjl; Tue, 12 Sep 2023 16:44: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 38CGiEvB071157; Tue, 12 Sep 2023 16:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiEOG071154; Tue, 12 Sep 2023 16:44:14 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:14 GMT Message-Id: <202309121644.38CGiEOG071154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 83660158953a - releng/14.0 - linux(4): Fix listxattr for the case when the size is 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 83660158953abcaa5382e35fbd1bdd75a7ccae36 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=83660158953abcaa5382e35fbd1bdd75a7ccae36 commit 83660158953abcaa5382e35fbd1bdd75a7ccae36 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:51:46 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:42:59 +0000 linux(4): Fix listxattr for the case when the size is 0 If size is specified as zero, these calls return the current size of the list of extended attribute names (and leave list unchanged). Approved by: re (gjb) Tested by: zirias MFC after: 1 week (cherry picked from commit 18d1c86788f66f42c4e096142f4f8d168f68732c) (cherry picked from commit 53b3e15d732ff6ff0df7870107d45a371a376e73) --- sys/compat/linux/linux_xattr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 74b47f1cbaec..71d7ae58439e 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -173,24 +173,28 @@ listxattr(struct thread *td, struct listxattr_args *args) while (rs > 0) { keylen = (unsigned char)key[0]; pairlen = prefixlen + 1 + keylen + 1; - if (cnt + pairlen > LINUX_XATTR_LIST_MAX) { + cnt += pairlen; + if (cnt > LINUX_XATTR_LIST_MAX) { error = E2BIG; break; } - if ((args->list != NULL && cnt > args->size) || + /* + * If size is specified as zero, return the current size + * of the list of extended attribute names. + */ + if ((args->size > 0 && cnt > args->size) || pairlen >= sizeof(attrname)) { error = ERANGE; break; } ++key; - if (args->list != NULL) { + if (args->list != NULL && args->size > 0) { sprintf(attrname, "%s.%.*s", prefix, keylen, key); error = copyout(attrname, args->list, pairlen); if (error != 0) break; args->list += pairlen; } - cnt += pairlen; key += keylen; rs -= (keylen + 1); } From nobody Tue Sep 12 16:44:15 2023 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 4RlTv36gQWz4stxR; Tue, 12 Sep 2023 16:44: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 4RlTv33lgbz3dpn; Tue, 12 Sep 2023 16:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537055; 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=w8krLV1Y/jSr2LWiXfQQ+fek2oxm2kQUqs2TmZS/baQ=; b=TeibQqNCaFBuehpoEaBEZ5nCtcufj4zYGpJHcGCq8mNEECJdYiZ1ZlDvbRQNZcTIdrJUyh 3ghwpDcDzqUfswx2KmzXCvXtF+KH0276X0uLqFOESBIghC+M49jS34e6o8+mRSBQkccgE0 1BR2Fc1QVe3w0V8rV6jf3NBzCD1zhEAuThTsTh/1irzDgS/tszvsmofYde527Hnefc4ElD 5U3GJkzH3omNbamTR5ps/ctFeYCITLtT/7wne+ABYgb3PRrjog6D2eoTydwJn2GEmH/9xa YBGGH272101W37Q1tWvypdlK0IpMPAiZoRc1Kah+QnDC5yJiCWmkMIa7CTuzuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537055; a=rsa-sha256; cv=none; b=bgVIWr2JvvpQ+DXF8lgq5KvQpeLdjBseBnmLp9I+X3Ytv7+VFAL8+DagtCnexm7E1ShKL0 ajwsuzI/gbXYugqUBTZIa/zTMuuksF0ufpqcfZiVEdSCLk49ISUkguvsk2jxJSkNWp7unl RHyABEMjgoW8nqGwvFAgL0syLKEGesPVCLyBQwoN6WbcEfCp87vNpeRGL/Tx8bnQhkw4Yf F3bWMasojw/h1n2NLvEdY/HIK8kdA/RVzeH4UIgJCBE1Lei9YLA2CffZGRa0eTV8uj6isp UKwciWTr5Ovkn2J4EpERIdcwRU4g5wsddXbWYxG1aWpS2kIFkD6xvNvZkhunMg== 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=1694537055; 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=w8krLV1Y/jSr2LWiXfQQ+fek2oxm2kQUqs2TmZS/baQ=; b=VwV109QuRMrcYzq+uAw6uhzbo1uHBcktJIoA/BST+3iXgHBdn/IxNBUNfTkJBO6W/UxqPg XN9NFZiZwiei0fgqmBEfYVvo2KqC4priFv57t+R6RksUqzJ2CrnKa1QtT9XzMO0idcPEpP x9YK9dh0QPo+YEFS84ifkzaC1j2yY6BN0xg8iEoTTv7nIJ79YVxcAZaqPjnmjWZpZg0wDA BCbMEFzaioXZDI/CoV23em3wrYmc2OI5iCQw31B4rJ7Bkjpyz7HPWiaHJ7DNBHU5Z0MaNu IFn1Ya2Jb3gcTtKF9cRBONRE5FtrcaJi+wW7wZ8t/Uw5CSG0o8aztK+DxWX4dA== 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 4RlTv32hyKzfvX; Tue, 12 Sep 2023 16:44: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 38CGiFQ3071208; Tue, 12 Sep 2023 16:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiFeJ071205; Tue, 12 Sep 2023 16:44:15 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:15 GMT Message-Id: <202309121644.38CGiFeJ071205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 0f07f838d059 - releng/14.0 - linux(4): Return ENOTSUP from listxattr instead of EPERM 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0f07f838d059a2b56c33cd6340f0a172e8d97af7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0f07f838d059a2b56c33cd6340f0a172e8d97af7 commit 0f07f838d059a2b56c33cd6340f0a172e8d97af7 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:52:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:43:10 +0000 linux(4): Return ENOTSUP from listxattr instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls, cp. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Approved by: re (gjb) Reported by: zirias Tested by: zirias MFC after: 1 week (cherry picked from commit 11e37048db35d7fcfc285b867965de1aeefec2c8) (cherry picked from commit e975d1b72507def7a699adf1cb38c68b48d80f51) --- sys/compat/linux/linux_xattr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 71d7ae58439e..6979fff9c82d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -165,6 +165,8 @@ listxattr(struct thread *td, struct listxattr_args *args) error = kern_extattr_list_fd(td, args->fd, attrnamespace, &auio); rs = sz - auio.uio_resid; + if (error == EPERM) + break; if (error != 0 || rs == 0) continue; prefix = extattr_namespace_names[attrnamespace]; From nobody Tue Sep 12 16:44:16 2023 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 4RlTv50hjXz4stxb; Tue, 12 Sep 2023 16:44: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 4RlTv44LzWz3dsP; Tue, 12 Sep 2023 16:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537056; 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=7jtbtOe6OmEsPKGB2JV1ut177Itj2LSB31NPZ0A2/7M=; b=qSSM5OMqJfOutgHOUFh9f7yqZBRck42OBhtDaNwcif8sYEzrkIZEiivfUDt/lPPNotbeSJ sF/BcQzlqUpdVBqNOP3SY5MR131q3QflMXBgTcXHGCpQpnGFpST6T10BAnLJXiqv4SZfE1 Mgu3X0eHV6a+z6RPLqehcdIFKh3SrrQ90npG/cR2eMRyOH3qGNeNQBlwlvd6ZW17MyZxmZ XhWPaUis5ZgX3yOzmzFqRidrwvi7y+fz+XqhuiWYVmYNRl1/h8zbgZ1KcpoN9/NwmFlp1D 2UvIoVcEZnO9wj0S1G8c7W0TzcHVL4vSaJ4cz+QOib6H44MN4OLzY87CICfAig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537056; a=rsa-sha256; cv=none; b=yycRbYdEvSLQJpyy3CJdyTwqdZcNXPcgID7Q+iIUwkXgQfkZb/ChFRvNF92l7mYPb8ftv8 VXYkR9pY0I4zGNPCjC1y2LmY/NCNazKHJE06IReA8Dd8cXzc6oZ+ei8yn74NZ8vIz4Ls15 ztAH+/OQpWsrQz/+IeKKuuvag3VGJCUw+xMwp5RGXpKVPs0MDtm0kT1R9Jxe5kBjf8euNJ C9Ee0GukXUoZxIQP5nvJg53wMuhnjZp7PKP2S1/yd60wKxIhlax7S+M1/e8BnX+0XRO29/ 71Mj6iwgnwrIe4kPvbZb9XMXrV6Syl9YmJXZNwoKL50HmX5neGVpznPOoglYZQ== 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=1694537056; 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=7jtbtOe6OmEsPKGB2JV1ut177Itj2LSB31NPZ0A2/7M=; b=yArc/x0Ro9Bq0O7r/8++eKwP4VtrieZJUU1n5hfuVgWISs3b36ln9vLgtUhu/hQT4Pk+Rp aVeRK2xsP+gi2hEWOAEMCAV4D/7GLsrrJbUnPpBM/ZQhnJHf655FeSMZzE6Vl+5CmMmVU0 Xp7UkWmc5kQXCgFJLUhAKLMovUB4r0eTt6GQoLaD5gvPaA/MJccls7EOcWWhTAZS+yYTRV Xfmnw3zUaDtBC+S+qBLuE53xtR1xP78cVEe1Ckdy7spGtMrhfmMGlNHGAPrQLWT7bxDGJ/ C1btk7R+mkDyESUqYGufHjYMRa2WsO9kdEBPpvam2kfpDlqPL+73vDDNRKlW3g== 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 4RlTv43R0lzfvY; Tue, 12 Sep 2023 16:44:16 +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 38CGiGrn071251; Tue, 12 Sep 2023 16:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiGUd071248; Tue, 12 Sep 2023 16:44:16 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:16 GMT Message-Id: <202309121644.38CGiGUd071248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 80b763d4a539 - releng/14.0 - linux(4): Convert flags in timerfd_create 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 80b763d4a539854d43535b2f9dcd0b2f739a6502 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=80b763d4a539854d43535b2f9dcd0b2f739a6502 commit 80b763d4a539854d43535b2f9dcd0b2f739a6502 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:43:20 +0000 linux(4): Convert flags in timerfd_create The timerfd is introduced in FreeBSD 14, and the Linux ABI timerfd is also moved to FreeBSD native timerfd, but it can't work well as Linux TFD_CLOEXEC and TFD_NONBLOCK haven't been converted to FreeBSD TFD_CLOEXEC and TFD_NONBLOCK. Approved by: re (gjb) Reviewed by: dchagin, jfree PR: 273662 Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week (cherry picked from commit aadc14bceb4e94f5b75a05de96cd9619b877b030) (cherry picked from commit 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71) --- sys/compat/linux/linux_event.c | 9 +++++++-- sys/compat/linux/linux_event.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 816c68a90f1d..e88791659f1f 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -611,13 +611,18 @@ int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { clockid_t clockid; - int error; + int error, flags; error = linux_to_native_clockid(&clockid, args->clockid); if (error != 0) return (error); + flags = 0; + if ((args->flags & LINUX_TFD_CLOEXEC) != 0) + flags |= O_CLOEXEC; + if ((args->flags & LINUX_TFD_NONBLOCK) != 0) + flags |= TFD_NONBLOCK; - return (kern_timerfd_create(td, clockid, args->flags)); + return (kern_timerfd_create(td, clockid, flags)); } int diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index fa63371b5170..8c6758fefcc9 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -54,4 +54,7 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) +#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC +#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK + #endif /* !_LINUX_EVENT_H_ */ From nobody Wed Sep 13 09:13:50 2023 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 4Rlvrt686Vz4sjnW; Wed, 13 Sep 2023 09:13: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 4Rlvrt5yYSz4Hrl; Wed, 13 Sep 2023 09:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694596430; 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=Bx0LPqHZF7zXBch+LQrAVc0+1DMWA/1Ke6ludI9k1nw=; b=yapSVRaMrQx6udjJrjsxLUkHdXFz2fLxgmWkoOhpg7qI8GyT9g7AyKlz+5i07zPHm8QC0Q i2960naqMznBCIRVt5m6f4Y/VVrDBrWAVgezxDF6V0PftklgVKdIuo4aY1UNmFoe7/RsSS w9URupeU3nwTG4KTVHKXYar4k57p/6rRggu0tIiyvNOIyZSKHL5B4vWpOTgNjxpErMoUe2 7ym4wlDlxbxF7WRS6Fpf4ffs7O7XesGn5Hj8q/B2a6SUKQAYhom4pFNsMd7GuFcKiJfxa5 Q9Cxr8ywrZCJgarSSl3e7zXMkJXpgsI1Wfo9l9aC5kV64iXSyFIkc39zb9uQ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694596430; a=rsa-sha256; cv=none; b=jSmj0Gkw/kPX9S5+Y+5riDodmY7OS2dRIEG0I4gt0zowiVT2UU+KUz6HTv/E54MP+W9Rhq d6r6ZZK70a0Ts1xRRNUWOyFwJq9O7rSeARxmyo6TqwoE/9cGxDiHBKvCYICP7EN96dkckk JjOgL6qmhiKyxUgdPVnRqmlXd9y97X80kKWYlUM3bx2GD96n6HzlmUD8Zt4Hgd7TT+Ht54 HTsb13kKZWPBJM0uC3hoBuGzx/SDWqhntLFcWlvK61GU6ndA31BO4thM8QSRLShodxLIMv v15gPJpbEK1wHPBFaF6Rmm9aQenL1LlH9nPmsi4pPUOLADp3oNKfDwQSrlT5NA== 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=1694596430; 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=Bx0LPqHZF7zXBch+LQrAVc0+1DMWA/1Ke6ludI9k1nw=; b=NYFJQhb0VeXdga9pqPbISruqHE6er7A4vdz5naVNlVxlf4xjmmYNreCnEhF+hS3JuGWUxz NnyaHNv4ZTi05Q/D7c5tQDj8qDLqsmbeuyEDrgDKTEiuHiNgZXTKhz4gaS0AUibegRC4sz omFrfSWGu1ZZPdsRfUl6TMFKqXcnua5QQyigIPH2JZaG/FR2mS5n9FxyMyjRLG4Fsn4iPq Z38K+lJ9TgC7Am5y5MBFOv9x3+DD7H/WtrYM+u9witaIcVIkZl7gYiIKvXTX/JAE2l70Ez WcteBGXT08mjKDraKrUtgnBAkJLdpkTTkAhQLHTI2etDwpHQzr2goYMV938FIA== 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 4Rlvrt51vzz17Yv; Wed, 13 Sep 2023 09:13: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 38D9Dog2016869; Wed, 13 Sep 2023 09:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38D9Doxt016866; Wed, 13 Sep 2023 09:13:50 GMT (envelope-from git) Date: Wed, 13 Sep 2023 09:13:50 GMT Message-Id: <202309130913.38D9Doxt016866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c265e6217951 - stable/14 - qat: Intel 4xxx Series driver API extension 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c265e6217951b8bf71dbf59832e06d9f2c0b0325 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c265e6217951b8bf71dbf59832e06d9f2c0b0325 commit c265e6217951b8bf71dbf59832e06d9f2c0b0325 Author: Piotr Kasierski AuthorDate: 2023-09-06 13:51:41 +0000 Commit: Mark Johnston CommitDate: 2023-09-13 09:12:52 +0000 qat: Intel 4xxx Series driver API extension This commit introduces: - Quick Assist API update for partial decompress and zero padding. - Refactor of UIO locking. - VF driver hotplug fix. - Minor code style fixes for firmware API. Patch co-authored by: Krzysztof Zdziarski Patch co-authored by: Michal Gulbicki Patch co-authored by: Piotr Kasierski Patch co-authored by: Karol Grzadziel Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41613 (cherry picked from commit 22cf89c938886d14f5796fc49f9f020c23ea8eaf) --- share/man/man4/qat.4 | 4 +- sys/dev/qat/qat_api/common/compression/dc_dp.c | 296 ++++++++++++- .../common/compression/include/dc_datapath.h | 11 + sys/dev/qat/qat_api/common/ctrl/sal_compression.c | 8 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h | 18 +- .../qat/qat_api/firmware/include/icp_qat_fw_comp.h | 486 ++++++++++----------- .../qat_api/firmware/include/icp_qat_hw_20_comp.h | 63 ++- .../firmware/include/icp_qat_hw_20_comp_defs.h | 159 ++++++- sys/dev/qat/qat_api/include/dc/cpa_dc.h | 15 +- sys/dev/qat/qat_api/include/dc/cpa_dc_dp.h | 431 ++++++++++++++++++ sys/dev/qat/qat_api/include/icp_sal_versions.h | 2 +- sys/dev/qat/qat_common/adf_ctl_drv.c | 3 +- sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 24 +- sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c | 13 +- sys/dev/qat/qat_common/adf_pfvf_vf_proto.c | 5 + sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c | 18 +- sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c | 32 +- 17 files changed, 1221 insertions(+), 367 deletions(-) diff --git a/share/man/man4/qat.4 b/share/man/man4/qat.4 index 347f257c7aec..b0fa0b0cbc92 100644 --- a/share/man/man4/qat.4 +++ b/share/man/man4/qat.4 @@ -64,8 +64,8 @@ driver supports cryptography and compression acceleration. A complete API for offloading these operations is exposed in the kernel and may be used by any other entity directly. For details of usage and supported operations and algorithms refer to the -following documentation available from -.Lk 01.org : +following documentation available from Intel Download Center +.Lk https://downloadcenter.intel.com : .Bl -bullet -compact .It .Rs diff --git a/sys/dev/qat/qat_api/common/compression/dc_dp.c b/sys/dev/qat/qat_api/common/compression/dc_dp.c index 1bc50d89365d..8b409d9ad7ca 100644 --- a/sys/dev/qat/qat_api/common/compression/dc_dp.c +++ b/sys/dev/qat/qat_api/common/compression/dc_dp.c @@ -217,6 +217,89 @@ dcDataPlaneParamCheck(const CpaDcDpOpData *pOpData) return CPA_STATUS_SUCCESS; } +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Partial-read parameters validation utility. + * + * @description + * Basic check that all partial-read related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * + *****************************************************************************/ +static CpaStatus +dcDataPlanePartReadCheck(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData) +{ + sal_compression_service_t *pService = NULL; + + LAC_CHECK_NULL_PARAM(pPartReadData); + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_COMPRESS) { + /* Decompression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + if (pPartReadData->length > pOpData->bufferLenForData) { + QAT_UTILS_LOG( + "Partial read data length can not be greater than the destination buffer size\n"); + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} + +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Zero-padding parameters validation utility. + * + * @description + * Basic check that all zero-padding related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * @retval CPA_STATUS_NOT_SUPPORTED Feature not supported + * + *****************************************************************************/ +static CpaStatus +dcDataPlaneZeroPadCheck(CpaDcDpOpData *pOpData) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_DECOMPRESS) { + /* Compression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} CpaStatus cpaDcDpGetSessionSize(CpaInstanceHandle dcInstance, CpaDcSessionSetupData *pSessionData, @@ -379,8 +462,60 @@ dcDpWriteRingMsg(CpaDcDpOpData *pOpData, icp_qat_fw_comp_req_t *pCurrentQatMsg) pCurrentQatMsg->comp_pars.out_buffer_sz = pOpData->bufferLenForData; } -CpaStatus -cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +/** + ***************************************************************************** + * @ingroup cpaDcDp + * + * @description + * Updates the request decryptor with optional parameters: + * - partial read specific fields + * - zero-padding specific field + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * @param[in] zeroPadFlag Boolean indicator containing the + * zero-padding enablement flag. + * @param[in] pCurrentQatMsg Pointer to current QAT message on the ring. + * + *****************************************************************************/ +static void +dcDpUpdateRingMsg(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + icp_qat_fw_comp_req_t *pCurrentQatMsg) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + if (!isDcGen4x(pService)) { + return; + } + + /* Partial read settings */ + if (NULL != pPartReadData) { + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_offset = pPartReadData->dataOffset; + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_length = pPartReadData->length; + ICP_QAT_FW_COMP_PART_DECOMP_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_PART_DECOMP); + } + /* Zero padding settings */ + if (CPA_TRUE == zeroPadFlag) { + ICP_QAT_FW_COMP_ZEROPAD_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_ZEROPAD); + } +} + +static CpaStatus +dcDpEnqueueOpBase(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -392,6 +527,20 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) return status; } + if (NULL != pPartReadData) { + status = dcDataPlanePartReadCheck(pOpData, pPartReadData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + if ((CPA_FALSE == pOpData->compressAndVerify) && (CPA_DC_DIR_COMPRESS == pOpData->sessDirection)) { return CPA_STATUS_UNSUPPORTED; @@ -422,6 +571,13 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } dcDpWriteRingMsg(pOpData, pCurrentQatMsg); + if (NULL != pPartReadData || CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData, + pPartReadData, + zeroPadFlag, + pCurrentQatMsg); + } + pSessionDesc->pendingDpStatelessCbCount++; if (CPA_TRUE == performOpNow) { @@ -432,9 +588,36 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } CpaStatus -cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, - CpaDcDpOpData *pOpData[], - const CpaBoolean performOpNow) +cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +{ + + return dcDpEnqueueOpBase(pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartRead(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, + pPartReadData, + CPA_FALSE, + performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPad(CpaDcDpOpData *pOpData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, NULL, CPA_TRUE, performOpNow); +} + +static CpaStatus +dcDpEnqueueOpBatchBase(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartData[], + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -462,6 +645,21 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return status; } + if (NULL != pPartData) { + status = + dcDataPlanePartReadCheck(pOpData[i], pPartData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + /* Check that all instance handles and session handles are the * same */ if (pOpData[i]->dcInstance != pOpData[0]->dcInstance) { @@ -516,6 +714,18 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, for (i = 0; i < numberRequests; i++) { dcDpWriteRingMsg(pOpData[i], pCurrentQatMsg); + if (pPartData) { + dcDpUpdateRingMsg(pOpData[i], + pPartData[i], + CPA_FALSE, + pCurrentQatMsg); + } + if (CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData[i], + NULL, + CPA_TRUE, + pCurrentQatMsg); + } icp_adf_getQueueNext(trans_handle, (void **)&pCurrentQatMsg); } @@ -528,6 +738,34 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return CPA_STATUS_SUCCESS; } +CpaStatus +cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartReadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartReadData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, pPartReadData, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_TRUE, performOpNow); +} + CpaStatus icp_sal_DcPollDpInstance(CpaInstanceHandle dcInstance, Cpa32U responseQuota) { @@ -565,3 +803,51 @@ cpaDcDpPerformOpNow(CpaInstanceHandle dcInstance) return CPA_STATUS_SUCCESS; } + +CpaStatus +cpaDcDpIsPartReadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_part_read; + + return CPA_STATUS_SUCCESS; +} + +CpaStatus +cpaDcDpIsZeroPadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_zero_pad; + + return CPA_STATUS_SUCCESS; +} diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h index 5bcff65c4fb3..58fb56f3c8ae 100644 --- a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h +++ b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h @@ -196,4 +196,15 @@ typedef enum dc_cnv_mode_s { /* CNV = TRUE, CNVNR = TRUE */ } dc_cnv_mode_t; +/* Type to access extended features bit fields */ +typedef struct dc_extended_features_s { + unsigned is_cnv : 1; /* Bit<0> */ + unsigned padding : 7; + unsigned is_cnvnr : 1; /* Bit<8> */ + unsigned reserved : 2; + unsigned is_part_read : 1; /* Bit<11> */ + unsigned is_zero_pad : 1; /* Bit<12> */ + unsigned not_used : 19; +} dc_extd_ftrs_t; + #endif /* DC_DATAPATH_H_ */ diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c index f0e8d28949ff..c0f5a411d87e 100644 --- a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c +++ b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c @@ -52,14 +52,6 @@ /* C string null terminator size */ #define SAL_NULL_TERM_SIZE 1 -/* Type to access extended features bit fields */ -typedef struct dc_extended_features_s { - unsigned is_cnv : 1; /* Bit<0> */ - unsigned padding : 7; - unsigned is_cnvnr : 1; /* Bit<8> */ - unsigned not_used : 23; -} dc_extd_ftrs_t; - /* * Prints statistics for a compression instance */ diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h index 28dfeff6579e..b4d1f5829ba2 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h @@ -1386,21 +1386,9 @@ typedef struct icp_qat_fw_comn_resp_s { /**< Error Code constant value for submission of empty dynamic stored block to * slice */ -#define ERR_CODE_EXCEED_MAX_REQ_TIME -24 -/**< Error Code constant for exceeding max request time */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_HANDLE -20 -/**< Error Code constant for invalid handle in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_HMAC_FAILED -21 -/**< Error Code constant for failed hmac in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_WRAPPING_ALGO -22 -/**< Error Code constant for invalid wrapping algo in kpt crypto service */ - -#define ERR_CODE_KPT_DRNG_SEED_NOT_LOAD -23 -/**< Error Code constant for no drng seed is not loaded in kpt ecdsa signrs -/service */ +#define ERR_CODE_REGION_OUT_OF_BOUNDS -21 +/**< Error returned when decompression ends before the specified partial + * decompression region was produced */ #define ERR_CODE_MISC_ERROR -50 /**< Error Code constant for error detected but the source diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h index 5edf7022ee1d..fe1b7ad55de8 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h @@ -47,6 +47,7 @@ typedef enum { } icp_qat_fw_comp_cmd_id_t; + /* * REQUEST FLAGS IN COMMON COMPRESSION * In common message it is named as SERVICE SPECIFIC FLAGS. @@ -64,7 +65,8 @@ typedef enum { * are don't care. i.e., these features are removed from QAT 2.0. */ -/** Flag usage */ + +/**< Flag usage */ #define ICP_QAT_FW_COMP_STATELESS_SESSION 0 /**< @ingroup icp_qat_fw_comp @@ -108,7 +110,7 @@ typedef enum { * Flag representing secure RAM from being used as * an intermediate buffer is ENABLED. */ -/** Flag mask & bit position */ +/**< Flag mask & bit position */ #define ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS 2 /**< @ingroup icp_qat_fw_comp @@ -148,7 +150,7 @@ typedef enum { #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS 7 /**< @ingroup icp_qat_fw_comp * Starting bit position for flag used to disable secure ram from - * being used as an intermediate buffer. */ + being used as an intermediate buffer. */ #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK 0x1 /**< @ingroup icp_qat_fw_comp @@ -170,7 +172,7 @@ typedef enum { * @ret_uncomp RetUnCompressed * @secure_ram Secure Ram usage * - *********************************************************************************/ + ******************************************************************************/ #define ICP_QAT_FW_COMP_FLAGS_BUILD( \ sesstype, autoselect, enhanced_asb, ret_uncomp, secure_ram) \ (((sesstype & ICP_QAT_FW_COMP_SESSION_TYPE_MASK) \ @@ -215,7 +217,7 @@ typedef enum { * * @param flags Flags to extract the session type bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SESSION_TYPE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS, \ @@ -230,7 +232,7 @@ typedef enum { * * @param flags Flags to extract the autoSelectBest bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_AUTO_SELECT_BEST_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_AUTO_SELECT_BEST_BITPOS, \ @@ -245,7 +247,7 @@ typedef enum { * * @param flags Flags to extract the enhanced asb bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_EN_ASB_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_ENHANCED_AUTO_SELECT_BEST_BITPOS, \ @@ -260,7 +262,7 @@ typedef enum { * * @param flags Flags to extract the Ret Uncomp bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_RET_UNCOMP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_RET_DISABLE_TYPE0_HEADER_DATA_BITPOS, \ @@ -275,21 +277,21 @@ typedef enum { * * @param flags Flags to extract the Secure Ram usage from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SECURE_RAM_USE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK) /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression header cd pars block * @description * Definition of the compression processing cd pars block. * The structure is a service-specific implementation of the common * structure. - ******************************************************************************/ + *****************************************************************************/ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { /**< LWs 2-5 */ struct { @@ -301,15 +303,10 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint8_t content_desc_params_sz; /**< Size of the content descriptor parameters in quad words. - * These - * parameters describe the session setup configuration info for - * the - * slices that this request relies upon i.e. the configuration - * word and - * cipher key needed by the cipher slice if there is a request - * for - * cipher - * processing. */ + * These parameters describe the session setup configuration + * info for the slices that this request relies upon i.e. the + * configuration word and cipher key needed by the cipher slice + * if there is a request for cipher processing. */ uint8_t content_desc_hdr_resrvd2; /**< Content descriptor reserved field */ @@ -324,28 +321,28 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint32_t content_desc_resrvd4; /**< Content descriptor reserved field */ + } sl; } icp_qat_fw_comp_req_hdr_cd_pars_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression request parameters block * @description * Definition of the compression processing request parameters block. * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 14-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_req_params_s { /**< LW 14 */ uint32_t comp_len; /**< Size of input to process in bytes Note: Only EOP requests can be - * odd - * for decompression. IA must set LSB to zero for odd sized intermediate - * inputs */ + * odd for decompression. IA must set LSB to zero for odd sized + * intermediate inputs */ /**< LW 15 */ uint32_t out_buffer_sz; @@ -368,10 +365,10 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< CRC data structure pointer */ } crc; - /** LW 18 */ + /**< LW 18 */ uint32_t req_par_flags; - /** LW 19 */ + /**< LW 19 */ uint32_t rsrvd; } icp_qat_fw_comp_req_params_t; @@ -394,8 +391,10 @@ typedef struct icp_qat_fw_comp_req_params_s { * @param cnvnr Whether internal CNV recovery is to be performed * * ICP_QAT_FW_COMP_NO_CNV_RECOVERY * * ICP_QAT_FW_COMP_CNV_RECOVERY + * @param cnvdfx Whether CNV error injection is to be performed + * * ICP_QAT_FW_COMP_NO_CNV_DFX + * * ICP_QAT_FW_COMP_CNV_DFX * @param crc CRC Mode Flag - 0 legacy, 1 crc data struct - * *****************************************************************************/ #define ICP_QAT_FW_COMP_REQ_PARAM_FLAGS_BUILD( \ sop, eop, bfinal, cnv, cnvnr, cnvdfx, crc) \ @@ -411,21 +410,64 @@ typedef struct icp_qat_fw_comp_req_params_s { ((crc & ICP_QAT_FW_COMP_CRC_MODE_MASK) \ << ICP_QAT_FW_COMP_CRC_MODE_BITPOS)) + +/* + * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION + * + * +=====+-----+----- + --- + --- +-----+ --- + ----- + --- + ---- + -- + -- + + * | Bit |31-24| 20 | 19 | 18 | 17 | 16 | 15-7 | 6 | 5-2 | 1 | 0 | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + * |Flags|Resvd|xxHash| CRC | CNV |CNVNR| CNV | Resvd |BFin | Resvd|EOP |SOP | + * | |=0 |acc | MODE| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + */ + + +/** +***************************************************************************** +* @ingroup icp_qat_fw_comp +* Definition of the additional QAT2.0 Compression command types +* @description +* Enumeration which is used to indicate the ids of functions +* that are exposed by the Compression QAT FW service +* +*****************************************************************************/ +typedef enum { + ICP_QAT_FW_COMP_20_CMD_LZ4_COMPRESS = 3, + /*!< LZ4 Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4_DECOMPRESS = 4, + /*!< LZ4 Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_COMPRESS = 5, + /*!< LZ4S Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_DECOMPRESS = 6, + /*!< LZ4S Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_XP10_COMPRESS = 7, + /*!< XP10 Compress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_XP10_DECOMPRESS = 8, + /*!< XP10 Decompress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_DELIMITER + /**< Delimiter type */ + +} icp_qat_fw_comp_20_cmd_id_t; + + /* * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION * - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + - * --- + - * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 - * | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + - * | Flags | Resvd | CRC |Resvd| CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | - * SOP | - * | | =0 | Mode| =0 | | | =0 | | =0 | | | - * | | | | | | | | | | | | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + --- + + * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + + * | Flags | Resvd | CRC | CNV | CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | SOP | + * | | =0 | Mode| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + */ #define ICP_QAT_FW_COMP_NOT_SOP 0 @@ -434,15 +476,15 @@ typedef struct icp_qat_fw_comp_req_params_s { #define ICP_QAT_FW_COMP_SOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS Start of Packet */ + * * Flag representing that a request IS Start of Packet */ #define ICP_QAT_FW_COMP_NOT_EOP 0 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request is NOT Start of Packet */ + * Flag representing that a request is NOT Start of Packet */ #define ICP_QAT_FW_COMP_EOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS End of Packet */ + * Flag representing that a request IS End of Packet */ #define ICP_QAT_FW_COMP_NOT_BFINAL 0 /**< @ingroup icp_qat_fw_comp @@ -484,6 +526,30 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Flag representing to use the external CRC data struct */ +#define ICP_QAT_FW_COMP_NO_XXHASH_ACC 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash will NOT be accumulated across requests */ + +#define ICP_QAT_FW_COMP_XXHASH_ACC 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash WILL be accumulated across requests */ + +#define ICP_QAT_FW_COMP_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_NO_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_ZEROPAD 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform zero-padding in compression request */ + +#define ICP_QAT_FW_COMP_NO_ZEROPAD 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform zero-padding in compression request */ + #define ICP_QAT_FW_COMP_SOP_BITPOS 0 /**< @ingroup icp_qat_fw_comp * Starting bit position for SOP */ @@ -516,14 +582,6 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Starting bit position for the CNV bit */ -#define ICP_QAT_FW_COMP_CNV_RECOVERY_MASK 0x1 -/**< @ingroup icp_qat_fw_comp - * One bit mask for the CNV Recovery bit */ - -#define ICP_QAT_FW_COMP_CNV_RECOVERY_BITPOS 17 -/**< @ingroup icp_qat_fw_comp - * Starting bit position for the CNV Recovery bit */ - #define ICP_QAT_FW_COMP_CNVNR_MASK 0x1 /**< @ingroup icp_qat_fw_comp * One bit mask for the CNV Recovery bit */ @@ -556,6 +614,22 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * One bit mask used to determine xxHash accumulate mode */ +#define ICP_QAT_FW_COMP_PART_DECOMP_BITPOS 27 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress bit */ + +#define ICP_QAT_FW_COMP_PART_DECOMP_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress mask */ + +#define ICP_QAT_FW_COMP_ZEROPAD_BITPOS 26 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad bit */ + +#define ICP_QAT_FW_COMP_ZEROPAD_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad mask */ + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -565,7 +639,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the SOP bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SOP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SOP_BITPOS, \ @@ -585,8 +659,9 @@ typedef struct icp_qat_fw_comp_req_params_s { QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_EOP_BITPOS, \ ICP_QAT_FW_COMP_EOP_MASK) - /** + + ****************************************************************************** * @ingroup icp_qat_fw_comp * @@ -595,7 +670,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the bfinal bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_BFINAL_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_BFINAL_BITPOS, \ @@ -663,6 +738,70 @@ typedef struct icp_qat_fw_comp_req_params_s { ICP_QAT_FW_COMP_XXHASH_ACC_MODE_BITPOS, \ ICP_QAT_FW_COMP_XXHASH_ACC_MODE_MASK) +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the partial de-compress on/off bit + * + * @param flags Flags to extract the partial de-compress on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the partial de-compress on/off bit + * + * @param flags Flags to set the partial de-compress on/off bit to + * @param val partial de-compress on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the zero padding on/off bit + * + * @param flags Flags to extract the zero padding on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the zero-padding on/off bit + * + * @param flags Flags to set the zero-padding on/off bit to + * @param val zero-padding on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -670,23 +809,23 @@ typedef struct icp_qat_fw_comp_req_params_s { * @description * Definition of the translator processing request parameters block * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 20-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_xlt_req_params_s { /**< LWs 20-21 */ uint64_t inter_buff_ptr; /**< This field specifies the physical address of an intermediate - * buffer SGL array. The array contains a pair of 64-bit - * intermediate buffer pointers to SGL buffer descriptors, one pair - * per CPM. Please refer to the CPM1.6 Firmware Interface HLD - * specification for more details. - * Placeholder for QAT2.0. */ + * buffer SGL array. The array contains a pair of 64-bit + * intermediate buffer pointers to SGL buffer descriptors, one pair + * per CPM. Please refer to the CPM1.6 Firmware Interface HLD + * specification for more details. */ + } icp_qat_fw_xlt_req_params_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Compression header of the content descriptor block * @description @@ -697,7 +836,7 @@ typedef struct icp_qat_fw_xlt_req_params_s { * cd block, thus differing from the common base content descriptor * structure. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_cd_hdr_s { /**< LW 24 */ *** 1566 LINES SKIPPED *** From nobody Wed Sep 13 11:16:35 2023 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 4RlyZZ2h9Sz4src6; Wed, 13 Sep 2023 11:16: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 4RlyZX1YY5z4rt7; Wed, 13 Sep 2023 11:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694603796; 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=X6ug1KKTSE/o6UHgkAjN2n01hArIUdlY+eoEFSaMI3s=; b=Mex6mlwghDYEmvAnLOItmVu8qQ84eLsZuIY2sMp517OCG16uPag5b/Q/vKMjRSCQ+NNjOZ BCoB5sgur/XFFFl/H65Xk/z8HnHDAGZQWvqG12PH2iFRUjFA8phHTEaqJRKJLdnOUPr15q cFgZvW0rYzdqKVqmGG1X4qn/PAGyqkoEYUB5J2YCgkcExG1KxjNd4trbozWCp4102w8v9/ 66PKVnifRma+R6m0VejOnSpsl2nJtUpn40NAaXkjyr4vc8Ja8toH/EIGMs3WTAJGWQsgV+ UwZong+ohCMOPdJIqxeg3rWSPwM9bgPEzpiHGbEho8UD776G2s98TMf4C4FWkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694603796; a=rsa-sha256; cv=none; b=wtyVb4Yd8lEPvd433DkJgIwJHJm/LI6hHNeYis37GdkWemwv+26OtHHzm5IvbNnzn9BBu+ sH+VQUVu3AuTXRFBWNOpd9DtOuGymp37WAoIbn5FjGM2hWyARyxXnv0Rl9+vWHgHH1wKCK skljYjMcwUBeTANz/o9PsQGE+xC3zWOxvhoGLztzzajJ0yBI0lZ9sVPatwP8cU8yBgxjSM FFag63YYUo4djHuQpkzYAhVHcNgGX5sWt0755AlzwGX8wBbEjgsTlRXqjiVp7dlXLzxyV6 FH7WjfDxKv8TPNzWdCKmsj4+4+LxzG4JjtEZmU7QXnflGWIyTuUtuxEHCVDuCA== 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=1694603796; 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=X6ug1KKTSE/o6UHgkAjN2n01hArIUdlY+eoEFSaMI3s=; b=qWGZroqHIbf+OxwtR+xF1+Nx6RxCs8NtNFfwy0BIxU3qaZ7cb/VTNsN65+uuSb0vPrRWKj yGPY54zsUwzXcd2gUe0/hnxL1E6ijSV8xDYhNng07lGh12fQtgRlIvd7eXNm3WKp4IKeAe Kf+80lg1PR6/NqNnyK0fyLEREjlWKrn5mP9fNNHjZoc+6yj3a0G5l4XwGWY6lvijQYRg2a 7FS/60yrTbNKkpyWCvekGJcaTQ5DXhoGiHnZoSA104B2uVjNbfwlZaZTiILB2NVN1mS9GX qBHliKwf3w5rb+MyS35wlDk1DpnR9vVA9HyOj3OhkYTzFmNSW47A7CXR5f5kQg== 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 4RlyZX0bpMz1BNY; Wed, 13 Sep 2023 11:16:36 +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 38DBGZgX017234; Wed, 13 Sep 2023 11:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DBGZaC017231; Wed, 13 Sep 2023 11:16:35 GMT (envelope-from git) Date: Wed, 13 Sep 2023 11:16:35 GMT Message-Id: <202309131116.38DBGZaC017231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1bd8fa1dd0ba - stable/14 - pfsync: fix state leak 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6 commit 1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6 Author: Kristof Provost AuthorDate: 2023-09-08 09:21:12 +0000 Commit: Kristof Provost CommitDate: 2023-09-13 10:18:38 +0000 pfsync: fix state leak If we receive a state with a route-to interface name set and we can't find the interface we do not insert the state. However, in that case we must still clean up the state (and state keys). Do so, so we do not leak states. Reviewed by: Kajetan Staszkiewicz MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41779 (cherry picked from commit f415a5c1bd56933367e42312731e4ec553e256ed) --- sys/netpfil/pf/if_pfsync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index db448c9bbc48..e29c00fcb879 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -685,8 +685,10 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) printf("%s: unknown route interface: %s\n", __func__, sp->pfs_1400.rt_ifname); if (flags & PFSYNC_SI_IOCTL) - return (EINVAL); - return (0); /* skip this state */ + error = EINVAL; + else + error = 0; + goto cleanup_keys; } break; default: @@ -734,6 +736,7 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) cleanup: error = ENOMEM; +cleanup_keys: if (skw == sks) sks = NULL; uma_zfree(V_pf_state_key_z, skw); From nobody Wed Sep 13 15:47:57 2023 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 4Rm4bd2spSz4t3xJ; Wed, 13 Sep 2023 15:47: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 4Rm4bd2Qx5z3Sdq; Wed, 13 Sep 2023 15:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694620077; 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=VN+2fYmQmBTbli8KIXRvgYDPTzng7JZa/cMqlt5zSDA=; b=DiEWV6vPM9faCUnJAwOMsvGr+4xK8Hdg6K1jSfsTH5epJpMD56M3u78Uu3oIaezv6bP+X6 q3xuzDQAbXb2MceBYORCWbo0AGL/kaKF/MaIkFirKz7VYqEXat5A01Ztc6d69fjcjiqJW/ aU2HgJM1cwUxWg9EhZl5r0n8NG+FH4Wo6W5i4wSXz1Jfdq39krMwLafTB32KOQa4SkSh3L dotAMeeyzJuJglZMEgZjh6Jr9diVaTd4G6n+APiXbA8E2y0lKPAaTN24UrGqQYQvZCS5ij YyOkMYNbeCVubjzsNQ5Dh3ml+uU542AO8yYGA1ENs1b9+gUQrzjciJ1HVqMMfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694620077; a=rsa-sha256; cv=none; b=l4wZgDBFQJm7jC3b4eWXpiyDSLIqhaRhnwjr6jydhUe1s3ibeA70gvLaVJ7ZxHS2MrFrY8 MlQQuTmTS3Kn6x8Eq7iF8jcCV749+xqxskBJ3gajW7jz5e899SNWioPRRE4I4REiKfDTAE uoc7D0Gn6ZaL9ETiCuSpnzx8LPmeBjIhlrCY/JO3kwAtabNyfW0+THHQf4hctpks42vC8k +gjGSueCH2XLmnvLN9NhCkVhuHZysTClcHDgKfIHhUM1rOa6xh+bVIp/zQ+97RFylerEJW pEJlBjxSU/KJC0mAlr7u3sm+t27GD81EzO/CiDv5z2UctvKzrfdA1V7Fywpt3g== 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=1694620077; 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=VN+2fYmQmBTbli8KIXRvgYDPTzng7JZa/cMqlt5zSDA=; b=BrQu+WPZmJapKM4zb2PbJRBKdkwmT7Vnbgl5gShl0dX1452Hbd44FZ1GlUseVj2/54FPP5 dJHRLOnJKBq4Dk0fjq8PZLCcmcIEhaYxjuAUSz0SCJ3qvWcPOrTT5oU7qtbbRRUVbqRwjz ED2b+5hDOuFV6EnZwOmF0D1orceA4uLbzHxQWbGLvQAjKMDYWMARdya9P0A7WYtTQc6H8S c0M/OqvDhtSLJtlvPYHfs/TGRpgtMcxhbSrRqDjgFhpfxVCboLNq20+L4MHlYtRX2CcbZT etp15pWkYYSiKY8QNcciX9hdtDGmih39Rsk1yeIOzXrjWxSy6QY0EYkUykVR6g== 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 4Rm4bd1NGGz502; Wed, 13 Sep 2023 15:47: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 38DFlv2L065646; Wed, 13 Sep 2023 15:47:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DFlvNm065643; Wed, 13 Sep 2023 15:47:57 GMT (envelope-from git) Date: Wed, 13 Sep 2023 15:47:57 GMT Message-Id: <202309131547.38DFlvNm065643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 144db6a1c9fe - stable/14 - init_main: Switch from SLIST to STAILQ, fix order 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce commit 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce Author: Colin Percival AuthorDate: 2023-09-05 23:46:38 +0000 Commit: Colin Percival CommitDate: 2023-09-13 15:47:31 +0000 init_main: Switch from SLIST to STAILQ, fix order Constructing an SLIST of SYSINITs by inserting them one by one at the head of the list resulted in them being sorted in anti-stable order: When two SYSINITs tied for (subsystem, order), they were executed in the reverse order to the order in which they appeared in the linker set. Note that while this changes struct sysinit, it doesn't affect ABI since SLIST_ENTRY and STAILQ_ENTRY are compatible (in both cases a single pointer to the next element). Fixes: 9a7add6d01f3 "init_main: Switch from sysinit array to SLIST" Reported by: gallatin Reviewed by: jhb, gallatin, emaste Tested by: gallatin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41748 (cherry picked from commit 71679cf468ba28c0e3c88371f3fde13fccec99bd) --- sys/kern/init_main.c | 22 +++++++++++----------- sys/sys/kernel.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index aa82eafff9b0..a6b327339c80 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -165,7 +165,7 @@ SET_DECLARE(sysinit_set, struct sysinit); /* * The sysinit list itself. Items are removed as they are run. */ -static SLIST_HEAD(sysinitlist, sysinit) sysinit_list; +static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -194,12 +194,12 @@ sysinit_mklist(struct sysinitlist *list, struct sysinit **set, TSENTER(); TSENTER2("listify"); - SLIST_INIT(list); + STAILQ_INIT(list); for (sipp = set; sipp < set_end; sipp++) - SLIST_INSERT_HEAD(list, *sipp, next); + STAILQ_INSERT_TAIL(list, *sipp, next); TSEXIT2("listify"); TSENTER2("mergesort"); - SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next); + STAILQ_MERGESORT(list, NULL, sysinit_compar, sysinit, next); TSEXIT2("mergesort"); TSEXIT(); } @@ -218,9 +218,9 @@ sysinit_add(struct sysinit **set, struct sysinit **set_end) sysinit_mklist(&new_list, set, set_end); /* Merge the new list into the existing one. */ - TSENTER2("SLIST_MERGE"); - SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); - TSEXIT2("SLIST_MERGE"); + TSENTER2("STAILQ_MERGE"); + STAILQ_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("STAILQ_MERGE"); TSEXIT(); } @@ -284,11 +284,11 @@ mi_startup(void) * Perform each system initialization task from the ordered list. Note * that if sysinit_list is modified (e.g. by a KLD) we will nonetheless * always perform the earlist-sorted sysinit at each step; using the - * SLIST_FOREACH macro would result in items being skipped if inserted + * STAILQ_FOREACH macro would result in items being skipped if inserted * earlier than the "current item". */ - while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) { - SLIST_REMOVE_HEAD(&sysinit_list, next); + while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { + STAILQ_REMOVE_HEAD(&sysinit_list, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,7 +904,7 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); - SLIST_FOREACH(sip, &sysinit_list, next) { + STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) break; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 12e346514d1a..62b9e6a02b3c 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -220,7 +220,7 @@ typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ - SLIST_ENTRY(sysinit) next; /* singly-linked list */ + STAILQ_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; From nobody Wed Sep 13 15:47:58 2023 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 4Rm4bf4lgcz4t44q; Wed, 13 Sep 2023 15:47: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 4Rm4bf3B8mz3STL; Wed, 13 Sep 2023 15:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694620078; 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=jcWZ9MQUSD9J2wUyVB+mpX425v1iqmq0UFsiRx/dXHs=; b=R/qLpM9DEFopydOnJsIeBv/zrPAce6hyAkntbqp0DxShhR5KVJIsCtK/kq6W4ZGS6yrP1x Cn9YeLLY3J36AYAyYK7nu6DDFHNPW2qndPQrnd1np6jMsSSWvzQwL2EPkD1LE6ZYInrcV+ 4w9RZsYOCww5mq86GJssfEL47EEVA7Z1ZijUuOO2jLNMxG9mO+k62IoUaYxh9poFDQzmaH 5m26NcvYP+o5QsgcNX7g7DnjluivSFRj/JusnGlGXz6+9kZYSsmCNTobeF3+B7NpvPbj2E FTWM8+QxNCsQH7UqwVT+V63WjWHuSzStld2qk+lQNPsWn7NPcxrtyWMH+28www== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694620078; a=rsa-sha256; cv=none; b=bq+pX5rJCCZMev+D+GA2eA/rMYLcE+ZKOqnQf+qPn0O7HUtdLiYnBRsnweiBXQcCnugPAC 03xJCPonY5i2M25iiU6P1Chkny0Yu8RHJYymdyZtFnjtkqYtRixNykS9bDk8+b9eNWp0Xv CoY+3TNke0f9AoO9/tiLmuPN9OVkhaPWRlpjTLtdfyURO/ruQ6liDOnaVwSZ3AB6anwHOD 20TVd0XO/BHUjLbqjm21K1EP3bg7SKggJHlZCx9jBMm2VRBA4MIeP4c3DSMEYlUT0gm1/6 ZYk4/evKlhtrXK2myQBa/lPUOPwNkIFEWmKm7qXky5W3Mn9PxsQcU2jC28ZbmQ== 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=1694620078; 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=jcWZ9MQUSD9J2wUyVB+mpX425v1iqmq0UFsiRx/dXHs=; b=R2sH2vDZKdsj8ZcVRwx4cJTc2SfRHHdVO9jObLZ8qbXIKzKHRbsW7oUwK9LEzbJBbDHBSk DYz0kKC09D11kVuOOnNt0gfNlB5/onO+foUpxnixHPVPss1HSmfStXbSLoYZ4WNsr1H2bB z6tEIvdBvm5s9xh2QKwDYjX6c2Y5oeSg9K2fmG5qaXPwvk/NL65lPeKzmGwek4XS5CZMYu zKp90LW1s78KLYWIF8LveauR0cW0fNk52oO3Y7a00FKN0MePsycxMpu9PjJ3VpFPj/END5 8aYHbTYTvGoxXUjsjMBZKC4+NWhNTMDZP5vZOnPKG2+W/LoBbnw2/7+6ZQ+mPg== 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 4Rm4bf25Fkz4Rs; Wed, 13 Sep 2023 15:47: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 38DFlwoA065691; Wed, 13 Sep 2023 15:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DFlwhk065688; Wed, 13 Sep 2023 15:47:58 GMT (envelope-from git) Date: Wed, 13 Sep 2023 15:47:58 GMT Message-Id: <202309131547.38DFlwhk065688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c31f2b5e6b59 - stable/14 - init_main: Record completed SYSINITs 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c31f2b5e6b591c61711018c3d6e52067ae860e9c Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c31f2b5e6b591c61711018c3d6e52067ae860e9c commit c31f2b5e6b591c61711018c3d6e52067ae860e9c Author: Colin Percival AuthorDate: 2023-09-05 23:47:57 +0000 Commit: Colin Percival CommitDate: 2023-09-13 15:47:36 +0000 init_main: Record completed SYSINITs When removing them from sysinit_list, append them to sysinit_done_list; print this list from 'show sysinit' along with the list of future sysinits. Reviewed by: jhb, gallatin (previous version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41749 (cherry picked from commit 1926d5cef6eaa1302024d6471271c930ad65f9b2) --- sys/kern/init_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a6b327339c80..a8df9f84a29a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -163,9 +163,11 @@ SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); SET_DECLARE(sysinit_set, struct sysinit); /* - * The sysinit list itself. Items are removed as they are run. + * The sysinit lists. Items are moved to sysinit_done_list when done. */ static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; +static struct sysinitlist sysinit_done_list = + STAILQ_HEAD_INITIALIZER(sysinit_done_list); /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -289,6 +291,7 @@ mi_startup(void) */ while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { STAILQ_REMOVE_HEAD(&sysinit_list, next); + STAILQ_INSERT_TAIL(&sysinit_done_list, sip, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,6 +907,11 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); + STAILQ_FOREACH(sip, &sysinit_done_list, next) { + db_show_print_syinit(sip, true); + if (db_pager_quit) + return; + } STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) From nobody Wed Sep 13 17:20:20 2023 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 4Rm6fD5hd7z4tccn; Wed, 13 Sep 2023 17:20: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 4Rm6fD59Zrz4K6H; Wed, 13 Sep 2023 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694625620; 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=pBtv9+7M9gp5sEnXj2l+muMyHwsx8GUjlUxZtVti+6M=; b=pEvuovdM99oLwBM1kFEf9N+nfWpxdbfH7jgZ2qQjKI+t8Z5DQ8il02/KHl6FndOEGysOYk +vhDoUgRu9XIcTeNLbnDnNjCCC3CKUBsDa4UUfD1ICY13cWNqtv9tZ1sHY0kVLt6wRHWCT 1axGq6Fg7XfoqRf8pbPsae3iqocePibOXpzG31TuAmRaMjMUJAoHzZONM/78L0cQFKKoom SRFEw0iXY37xeXapKYECiHTvbhyrTZPEAc8oux6EXFpIOiP0JOf3IXRgyI2oGoYD4iUlV8 yttCIq9SEK/xR3LTeckpaSaTXq5qUh8d9Y63zOfN6j8JBxdGNc+xjO/nL9lSBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694625620; a=rsa-sha256; cv=none; b=RhnDaTY9AioTXvQcEdvbXi5zZn7Xke5al4KdE2XctpO8c5LNktbt1Dp8fRcngTZc/C715E qz+9jz2gS4GBz9dPPGFBQdGkEbmBl5GqtO/8m08/Vsh/bHJ3aVW0fqGINZWHnwu4F89F2v JE0Cfehg4rKRBXzu7Ouvh6gO18WMJqaa63Tw8xau256/0Q8/76155xaDsCj4f/TvpcqrM8 EffLoWRD5a678lo0Rj4rn2+XYkq9DM8U3uDQ6/Mlw+bISleyco+ItYldMIG7LWYj+wUTf+ QmqDuOwC6GwuLjAzwl23cN/XE6WUZoOGKGFGLOD02vXHdJyyTXQmgicCI6Wg6Q== 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=1694625620; 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=pBtv9+7M9gp5sEnXj2l+muMyHwsx8GUjlUxZtVti+6M=; b=pP6AW5+N+TR7ZDNsvAR5af/pzB0nZe+LlPqWxyH3jGL1S8VXpHtgsgxiSnJSiRLticGCXO Ew8/B53IK+WqofQUmiyYPj1kl2wbxLrJdewojt8ngRcs2dlK4ngAavdm+13yngi1OSn7YV RMcWL+x6feQ2FoBTWAq+/oV0SgVk3Kop6kqVNOjgLeVC8MLqj+vTgXM81hA+f9zA/H3sgZ HOdlC8aZh5P/DdjCYMLDIUZ25KersVfFAaYGsOFl+EM8uyBFgMwtI3oFjcfcC1mEI9N7Fh WADXrl3GGe6pO7ScwXa4LM7YFAdTNhvbSZo0iRuBaZkuNK9qSsri40CSurdZnw== 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 4Rm6fD4DdWz7cc; Wed, 13 Sep 2023 17:20: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 38DHKKaO023884; Wed, 13 Sep 2023 17:20:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHKKOE023881; Wed, 13 Sep 2023 17:20:20 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:20:20 GMT Message-Id: <202309131720.38DHKKOE023881@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: cc9347cc79d3 - stable/14 - ftpd: add deprecation notice 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: cc9347cc79d320cac00ccf5d5f23971de2c887a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cc9347cc79d320cac00ccf5d5f23971de2c887a1 commit cc9347cc79d320cac00ccf5d5f23971de2c887a1 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-13 17:19:49 +0000 ftpd: add deprecation notice Approved by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) --- libexec/ftpd/ftpd.8 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index c45df161575c..f5353be894fe 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -43,6 +43,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh .Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Wed Sep 13 17:43:59 2023 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 4Rm79W2jCkz4sVf0; Wed, 13 Sep 2023 17:43: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 4Rm79W1sC1z4PvS; Wed, 13 Sep 2023 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627039; 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=q61sJqkZq8vzpcHfIG5GZuDavVrgE17AhWd4ELEgZ70=; b=aSXrvo1YWtrtT1P+nNaFqzBhM2cgsIVvQux6T4PsPfWIvKX0sU1jviBTXX5/YB88yL8XQj vFuClns7ai9M1TWsKWGSxtg3kUbNfifw24Pa33kYKRhbbXh0ajkVCjpjTyoD7DAFljLgJl pH85ArLNWSnsmR5IasUtEWUYqR9ZQ1Us65jPB8z90iUpkyTEY0TMClkp6UXLhwhu567opR S8zwoEE6dRQyYrP90MDpXVFbz5pk7OV2drzyx/4G5REhtGmG0oiaVlGeoa8qhmLJ7XbBql +GtkzjEpXCnOV6Ro/nuXPoXrl/JDd+BaOPjWF5CtOCirAe+eHgkYcsNCk+ptTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694627039; a=rsa-sha256; cv=none; b=FyhL+GcjBE0Uuzq2I7TcPNwUsLPcX1xp8eH3A8xGSmAs2NjeAuw+1viwSuYjkOLk4qdBc0 6+ft7AxZbpJdYoMDuzYrAlmn+agMQQAvtSl+FFBDwN9pArzeOLS85QXNY3ETWTx/MokbMe kn08zyC9GkaGXiUsix+EAscSGJVYPn7sTRChGqbeiBEusBQZesZDciCbl1ptvs8ASi5AN1 V0VBDv7syW6mFpwkRBFLv3EFAfmPcj33XpXwnpBE0C+VjEsaGdgdPzyXaaT+EarHAi9qoV low/DPNKjVutPIRtr0ndUBjxtI7IEh+ZVcheYbEPOpneXUbzdv/SPBw3e8q+4A== 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=1694627039; 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=q61sJqkZq8vzpcHfIG5GZuDavVrgE17AhWd4ELEgZ70=; b=aX2cY7eCnMSwgLz2T/cZcOAa9zfGkzcJybJ0UgBKz6OiHmOLS0BXRaO5EwG7g1EbgjncYY 3syncLqOyOhK3pOSfGFmyPwQoHRQuEqFZ2zJSjk56SemA8wK3DZmXE2oldWi4W7BaGZG9S bv+Jw/1Yh75QmA5f91Z0jJ0LEkk4Ghv2GEaXlA+0jHn2uVtfgKCbiiCnnfw+wNbwworVYI KC9tjwMrsYK55femGPksmKRs47OttZWHQC1VIZdTUEclzv0Z5n7cJpdMp0+Ov4Q7ZcNTRh TqH+AD+4jd3vBoyCpWtJIexH+Yf7vnP3bJ/dA1jZ+pTbRtQlSKcQ/IUMgiGFGQ== 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 4Rm79W0wqcz8K6; Wed, 13 Sep 2023 17:43: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 38DHhxVm063656; Wed, 13 Sep 2023 17:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHhxVg063653; Wed, 13 Sep 2023 17:43:59 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:43:59 GMT Message-Id: <202309131743.38DHhxVg063653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 0307168d927b - stable/14 - ahci: add AMD device id in RAID mode 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0307168d927b5ec7a7889a29d09fe1500d0b514c Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=0307168d927b5ec7a7889a29d09fe1500d0b514c commit 0307168d927b5ec7a7889a29d09fe1500d0b514c Author: Andrey V. Elsukov AuthorDate: 2023-09-04 12:33:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-13 17:43:33 +0000 ahci: add AMD device id in RAID mode Found on Asus ROX Strix X570-F Gaming. MFC after: 1 week (cherry picked from commit 3afe6b525386af1dda7791ea2a9d718fa634d4fd) --- sys/dev/ahci/ahci_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 80ab01732c7b..93a72875b502 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -83,6 +83,7 @@ static const struct { {0x79021022, 0x00, "AMD KERNCZ", 0}, {0x79031022, 0x00, "AMD KERNCZ", 0}, {0x79041022, 0x00, "AMD KERNCZ", 0}, + {0x79161022, 0x00, "AMD KERNCZ (RAID)", 0}, {0x06011b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06021b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06111b21, 0x00, "ASMedia ASM1061", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, From nobody Wed Sep 13 17:45:17 2023 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 4Rm7C2161Sz4sW7G; Wed, 13 Sep 2023 17:45: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 4Rm7C20dS9z4QQR; Wed, 13 Sep 2023 17:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627118; 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=hev9b8XH2RUC9RbOHnV4tdgL883vnsd0dCJO2E3iXmM=; b=QGTMa5aOCzSWR7lTO27N34QEiugmMRMXVTsuiYiABVl8k4bEYykDZz09BBZx5zSQPo6PqX Rr9Anf/jPYoK8QKO5GbOe3lckq/j3fW2Ch7inZbSTtkPdxXf97BS+t48s7GARl+2G4R42H MKaoVlgvoHPOS/sWD664cu+cx0zevj0m36aM1zdpNgYMw17YQuj9ZLBJPOb9V/RTE0ICc6 nfWbpR9bMh+UnlAhFEuYbQyNEH/PL9VjXSKrtKOwNW0Wg9uTr8zOj0GUjWKgf7BbGLDLLs 75KnDVPmx85/QQ8rTRDgN0GIriUXNbd7DrLpCchmT3MZPQSFoQmn2oyNOcl8nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694627118; a=rsa-sha256; cv=none; b=xCqw6KdO/08rZmdG6dQwLyh0YZlIF/xvtCu8ELLvjniwrwFyxADiDCwxX7gSxxsWNt+9iT ASw9Q2vGQxi4xH0zrVgYLxfSP9Dtl56fRdnVWw4L5tIvHQLG62kEKTGSpVWY+EzWeQES6k agWGJBIK49d30U60M4/HOQ78H3kMHf0dTEV3U+jIOfw9zSloTOE6+8Swe05ICBFTvtVi/3 ECUtHrZfpDIQkn0enGZVQQPgAsaSEe+QgbcXU/pWUFQdUWRZ5IpYxQgzLvq5Dd2xq6Rrh4 Y9QDTc0ImFpxKgLE8MzZmAxGt6KrbvAbhWnoU4OO7Hesh9LkVi3RLKK9uFPC+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=1694627118; 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=hev9b8XH2RUC9RbOHnV4tdgL883vnsd0dCJO2E3iXmM=; b=N+7BRcy9dhEACk5SQOyuZr+21ZNZcGcGExza7sqVsll26HeohSbbpbh0RIhU/8wyUt/XCH SG1X/pZVwnlXwv9EliG21brAywgyeWb+dj7VxCSTgcxoRKY+YexnYB8M20IYKmCsQjbezY a67TlPaFUHoheJf1h4SeD8EoSIiO0u1Nf10vuMaWTGF0EmcxjoH2aLgP6Lpn98s8g+2Kdv 7SrAv3WKVNeNOxAMjqMvsvlknZFOC4+KAJLCTFQv/0l9Qie2ATeTzbSFjrmfygRugUXYHu PHfgAFMCcQDGg5A2Izl2diMcIwEsGuDbudNIXpbprMmzlhYZiojyLeh7ox01GQ== 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 4Rm7C16qlhz84t; Wed, 13 Sep 2023 17:45: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 38DHjHcI063958; Wed, 13 Sep 2023 17:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHjHaW063955; Wed, 13 Sep 2023 17:45:17 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:45:17 GMT Message-Id: <202309131745.38DHjHaW063955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: cf7203dba7a8 - stable/13 - ahci: add AMD device id in RAID mode 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf7203dba7a801454abf106449d7bf08d7b08813 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=cf7203dba7a801454abf106449d7bf08d7b08813 commit cf7203dba7a801454abf106449d7bf08d7b08813 Author: Andrey V. Elsukov AuthorDate: 2023-09-04 12:33:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-13 17:44:58 +0000 ahci: add AMD device id in RAID mode Found on Asus ROX Strix X570-F Gaming. MFC after: 1 week (cherry picked from commit 3afe6b525386af1dda7791ea2a9d718fa634d4fd) --- sys/dev/ahci/ahci_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 53f49dcd8d4a..07a1e908ad4a 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -83,6 +83,7 @@ static const struct { {0x79021022, 0x00, "AMD KERNCZ", 0}, {0x79031022, 0x00, "AMD KERNCZ", 0}, {0x79041022, 0x00, "AMD KERNCZ", 0}, + {0x79161022, 0x00, "AMD KERNCZ (RAID)", 0}, {0x06011b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06021b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06111b21, 0x00, "ASMedia ASM1061", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, From nobody Wed Sep 13 17:46:49 2023 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 4Rm7Dp0xt9z4sWGF; Wed, 13 Sep 2023 17:46: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 4Rm7Dp0XY7z4R0j; Wed, 13 Sep 2023 17:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694627210; 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=KjIehjwSp4VqlDLBhLZ7wGsHHTZPgJKX4wuTIfciW80=; b=OuJBq6VbqYEm+atkaCodxaM/3BOVZS5naNGedAYHk/6lMFJk7z7tEJNNvTIQDTLO+pKx7b 5VwfD5ltzm9KXLPTR/MmXvoS5PdWnNuQlytKvuiuwI50P86ZgoireZm6oHWn7Pcdgf8qqj FrR5svPdwPlFABelYAAa9p90QqCASadKQuQIBAtkZb9QkpwGs3VPbf1SMELtcIZYxOyT2F oXkQ6kBLQQduB6kMM+MK5cp0e1anunpY1oYGzba+XEs5tILJKYPxhx7keW+ngHSRynw/az nowM+ZCRWxnbiWvKfs+X3E8w1C/z1QfpZIeCDF9InfWFFIMahoBpZ8xB0NOJxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694627210; a=rsa-sha256; cv=none; b=EATE4vlRTFYpGd9v+P7q9rfuBmFRod94nym1NRVWJ7S1jy4WBrPeC06d6oFFUpNv63UPtp 9yXSr2DMq65XX0lPEARU8n0Wnvy4JuX6LOBrzaYEUCjkjKiBiR5UbOfamnzXwvtekTEkBX JI7IXSUG+n7z4CUvnltqjUgrtLAqYYgfybc7B35wiQPIHhlldg9dZJQP1wFSfQxfPEX/Gm BoCZJF4P/KwgIhgWqdSFfQd4E5vjhegAiRY5YiS/NZFsVz6IwR5pe4CWBFhf6P6j6nzzSC lFpeLEsUXtn8O+RiSftqKeu05f6KAi3q8n4DmxFCSy6TkFHpY/jjAgz7tTXopA== 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=1694627210; 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=KjIehjwSp4VqlDLBhLZ7wGsHHTZPgJKX4wuTIfciW80=; b=W/MOWHgj7sl7if8HrTd/F7gc/dVnuRIMb/el1l3rp62czMgo40jLyZmrettMgG2yIFIBUH Mwe8VKCxOqXtYuPlX7979xJKiw51ponWWCX6SCUkuIQJGeYjGA2VmqfHkZ7TApEzzT1q5t SC3Jom9TUnhfG5oEjWe6v0Cftk3OD10L+bZFNj2KhlnDCnr/Y+OYGpGwVyNxKxOJGE4P+u tgAo7VucG5BbIPhMTD1p6fHODi4XHbFe4FYpdq+jjRHKdZfqx858cv2mgGf80k1SCMb27l pruBxm5MKb1j6aqI0pL3maoDV4k7bYLoOzc4zcgeB8ufLbp5dXjcM4wHzt2MKg== 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 4Rm7Dn6lM9z8B4; Wed, 13 Sep 2023 17:46:49 +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 38DHknn8064294; Wed, 13 Sep 2023 17:46:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DHknZW064291; Wed, 13 Sep 2023 17:46:49 GMT (envelope-from git) Date: Wed, 13 Sep 2023 17:46:49 GMT Message-Id: <202309131746.38DHknZW064291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 5f30a218cafe - stable/12 - ahci: add AMD device id in RAID mode 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5f30a218cafe8bac5cbfc5e57c3b6027f8894318 Auto-Submitted: auto-generated The branch stable/12 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=5f30a218cafe8bac5cbfc5e57c3b6027f8894318 commit 5f30a218cafe8bac5cbfc5e57c3b6027f8894318 Author: Andrey V. Elsukov AuthorDate: 2023-09-04 12:33:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-13 17:46:29 +0000 ahci: add AMD device id in RAID mode Found on Asus ROX Strix X570-F Gaming. MFC after: 1 week (cherry picked from commit 3afe6b525386af1dda7791ea2a9d718fa634d4fd) --- sys/dev/ahci/ahci_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index fd0a808f1d9c..bdca241910a5 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -81,6 +81,7 @@ static const struct { {0x79021022, 0x00, "AMD KERNCZ", 0}, {0x79031022, 0x00, "AMD KERNCZ", 0}, {0x79041022, 0x00, "AMD KERNCZ", 0}, + {0x79161022, 0x00, "AMD KERNCZ (RAID)", 0}, {0x06011b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06021b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06111b21, 0x00, "ASMedia ASM1061", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, From nobody Wed Sep 13 20:03:45 2023 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 4RmBGn5HVSz4tFpG; Wed, 13 Sep 2023 20:03:45 +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 4RmBGn3s5hz3N89; Wed, 13 Sep 2023 20:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694635425; 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=PsRqOmI2cdpWl9Nevr4kAXiSE1cROKcdo6DlTasWrdY=; b=pv5SIsPbmCeCOnaE5AKkaG5Dxy54MSuePCcmtq9kDJsA+xu465wiqAL66hJJQ85tzaHnWN o/2+J3M0bz5lDvXcFCd1E/DRR1yqm8B/GeJjMvDLFinhVwb0zuKPHzPQVGvQcPIpjipU0m fkLIz3V1sUDhabvvg3YSWMBi/arYUNp/TMqph3uRmu2CHaFwxaD6QuOFJAxfoMu7+r2GnP 4TDSMehBlxVdFP7GkM3rrTVcaOaF+kJbCD1JdIQviRBFcr7cgLoAn7dUSIKhUnG+02WHtt p1GMkLS5iAF94tRCMW6Y833C73/fhMo0d/nWeH7UbNNM/aLYvN4cvgmTdvDoTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694635425; a=rsa-sha256; cv=none; b=YhBETKV+fXTz8qJnV14X7Ay9bF/q6N8hgYq1QChkch6/jPo4ROAMXsdkiZ28D/M38kWJMc DfSvIld8wu6VwF6taTxd3lTpy6MP/WEPKiKEn9XXuA5OAhQBtczDNXGBJiItXvWmA7tC1x 4t81gk4lC120VLt7oSphOZLJ2rUdmy9LoNL5wmR4rx5tNBwEghKsI8E3jUH1rjmdAbckFv 7iYjCf4mDOga6ohWj2hzO34tnnnPHH7zND6sSjtSB5KHrStceo15NRE+orvMuqqcPozW9o omRhP9ZyQ+Xse4PwLuhEJQXA1Sbvw8KgzehTFnCOx7SDdxMAggGaUFwhvCw+dA== 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=1694635425; 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=PsRqOmI2cdpWl9Nevr4kAXiSE1cROKcdo6DlTasWrdY=; b=EEK0WOXFLSHWP5N6yPBnAOTQ6cAvgzNeH7hd85HJsxLKbiD08XcLzXpFgI/GbcofnFqAcC YLly5gtb0jDTFgBjWB6m6PciWisdGHxLliPJ5VRYzGfG62H/KEwdED/QFonc+ePoOomPoV GQybLU/YSXUxEqqcKqty8As/PoZ8yo3DwPq7b45ypYTkyj/S4JkFG5Ww1Dr6zZgGnwop+h zxm/crtq5gvVXjNF0j0q+p4ioKFoAanKB04kXYlbQvCWO4U/dQoFJgHg06WWXxT2+0Y2UC 5uPzo9oEwEXfvB7UlUF7tYEjtK513tUOGXhTQYlSkQwfj7KpMRLXniAIpjSlxQ== 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 4RmBGn2dsJzCfP; Wed, 13 Sep 2023 20:03:45 +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 38DK3jiN096959; Wed, 13 Sep 2023 20:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DK3j1q096956; Wed, 13 Sep 2023 20:03:45 GMT (envelope-from git) Date: Wed, 13 Sep 2023 20:03:45 GMT Message-Id: <202309132003.38DK3j1q096956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3a9ca394c0c9 - releng/14.0 - init_main: Switch from SLIST to STAILQ, fix order 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3a9ca394c0c9b2a3deb43910d05982495ef8e491 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3a9ca394c0c9b2a3deb43910d05982495ef8e491 commit 3a9ca394c0c9b2a3deb43910d05982495ef8e491 Author: Colin Percival AuthorDate: 2023-09-05 23:46:38 +0000 Commit: Colin Percival CommitDate: 2023-09-13 20:03:09 +0000 init_main: Switch from SLIST to STAILQ, fix order Constructing an SLIST of SYSINITs by inserting them one by one at the head of the list resulted in them being sorted in anti-stable order: When two SYSINITs tied for (subsystem, order), they were executed in the reverse order to the order in which they appeared in the linker set. Note that while this changes struct sysinit, it doesn't affect ABI since SLIST_ENTRY and STAILQ_ENTRY are compatible (in both cases a single pointer to the next element). Fixes: 9a7add6d01f3 "init_main: Switch from sysinit array to SLIST" Reported by: gallatin Reviewed by: jhb, gallatin, emaste Approved by: re (gjb) Tested by: gallatin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41748 (cherry picked from commit 71679cf468ba28c0e3c88371f3fde13fccec99bd) (cherry picked from commit 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce) --- sys/kern/init_main.c | 22 +++++++++++----------- sys/sys/kernel.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index aa82eafff9b0..a6b327339c80 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -165,7 +165,7 @@ SET_DECLARE(sysinit_set, struct sysinit); /* * The sysinit list itself. Items are removed as they are run. */ -static SLIST_HEAD(sysinitlist, sysinit) sysinit_list; +static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -194,12 +194,12 @@ sysinit_mklist(struct sysinitlist *list, struct sysinit **set, TSENTER(); TSENTER2("listify"); - SLIST_INIT(list); + STAILQ_INIT(list); for (sipp = set; sipp < set_end; sipp++) - SLIST_INSERT_HEAD(list, *sipp, next); + STAILQ_INSERT_TAIL(list, *sipp, next); TSEXIT2("listify"); TSENTER2("mergesort"); - SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next); + STAILQ_MERGESORT(list, NULL, sysinit_compar, sysinit, next); TSEXIT2("mergesort"); TSEXIT(); } @@ -218,9 +218,9 @@ sysinit_add(struct sysinit **set, struct sysinit **set_end) sysinit_mklist(&new_list, set, set_end); /* Merge the new list into the existing one. */ - TSENTER2("SLIST_MERGE"); - SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); - TSEXIT2("SLIST_MERGE"); + TSENTER2("STAILQ_MERGE"); + STAILQ_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("STAILQ_MERGE"); TSEXIT(); } @@ -284,11 +284,11 @@ mi_startup(void) * Perform each system initialization task from the ordered list. Note * that if sysinit_list is modified (e.g. by a KLD) we will nonetheless * always perform the earlist-sorted sysinit at each step; using the - * SLIST_FOREACH macro would result in items being skipped if inserted + * STAILQ_FOREACH macro would result in items being skipped if inserted * earlier than the "current item". */ - while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) { - SLIST_REMOVE_HEAD(&sysinit_list, next); + while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { + STAILQ_REMOVE_HEAD(&sysinit_list, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,7 +904,7 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); - SLIST_FOREACH(sip, &sysinit_list, next) { + STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) break; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 12e346514d1a..62b9e6a02b3c 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -220,7 +220,7 @@ typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ - SLIST_ENTRY(sysinit) next; /* singly-linked list */ + STAILQ_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; From nobody Wed Sep 13 20:03:46 2023 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 4RmBGp5dbRz4tGG3; Wed, 13 Sep 2023 20:03:46 +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 4RmBGp4fBxz3NF2; Wed, 13 Sep 2023 20:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694635426; 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=sxBlE8Iax24SBH0Wc5qbkcNtBSqeRXL3xTiZqbzaN8M=; b=U08M6fThj/Eig5+7zwvcSgU4v6D0YNo7KJCVgibdpjNkr+PMvEE7SYbPQC4PpNQVzRXfSP 9ThmerNWihshgTzi8LVXdhbRUrTpToau11oDJn+mK/y9t2jebEkelxyOQ37qwPmXi4rjfv DokWyFWfZ3rDk7UTdeiVii0qENg5EPpTjB0P/qx5qxkusoEaCg+PtdcRBXXyfZ4Q+T7FzC S9w4rDZ/a8xxoQBazrjEwwiymhOv7p9okHKHOWgs9X9Np9XOxDBjUTfDmqFhs1ZWDJttCM WDqvwzDGl/GUFLEw21gyE2mTSBOS8PxbW61wZvO1uGO7fN4BitctXRcwG/Zf+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694635426; a=rsa-sha256; cv=none; b=a1ierK1vGCB1/Dg+ifWRlZ/1tnMczQvW+AMCpaKdox2+dSIfugGhIsrLQehzBxtVS/SOXW W9QU8WxOA21P1EAZ7N1JwZXwgTE1hokPDzZgWsJnpS1BdfcJDz4JHx5SZT/0FR2bhtoGhP XhtTBCDVYOlEXGBw4x8KAt8MddnZDzm9aFBHIJPME1y5R4rP+gSmux2Z09ndQa1nEw9ak+ XxPkdco8qg6037hGi4g2K7ig6oUeLVoDEvqPTv0BPwDP0kBTnFp2d2e33suicEs9sV0AJu LGIuE6JiuMMnYifwepof62V2RG2/buTgvuMzEj7PdHi5kMD2B/DNq1U153BgfQ== 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=1694635426; 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=sxBlE8Iax24SBH0Wc5qbkcNtBSqeRXL3xTiZqbzaN8M=; b=NiZGUrFe28TKV+MAUOJOq8+fZB8NnjOS9ihC/I8TCoapypnDJVQ8LSOFMdkBvv2wWtiDYs 7BVh2+8Ek+v+jnOWaa95jNzA5vksrHCFrH8mS2JXfPfUtQokxlnSmQS1Tx8vl92qVhG9WN jPKQXhjg2JQ7Meu0LFrzEuF4R0YaPcGP3R0kfszHIxblseJeGjHXsgnqqnPETNtv8qSC7d GYPkOnfdvB9Q4KYjj9u2ol34bl6uxcCj6DJLxTPqftEv0iMSqCzQUgqXSZiYOqRG8Zv2Pb SjZ0eZoHFtncH6rhid5xCBk9Eyj3qdP99plKlvPYir6MA9Sqgo/hRZqpCkOuMA== 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 4RmBGp3NvLzCqQ; Wed, 13 Sep 2023 20:03:46 +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 38DK3kFh096998; Wed, 13 Sep 2023 20:03:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DK3kiW096995; Wed, 13 Sep 2023 20:03:46 GMT (envelope-from git) Date: Wed, 13 Sep 2023 20:03:46 GMT Message-Id: <202309132003.38DK3kiW096995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 81be13da3ecf - releng/14.0 - init_main: Record completed SYSINITs 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 81be13da3ecf8e32b6cbe93d301b4c24c36e43d4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=81be13da3ecf8e32b6cbe93d301b4c24c36e43d4 commit 81be13da3ecf8e32b6cbe93d301b4c24c36e43d4 Author: Colin Percival AuthorDate: 2023-09-05 23:47:57 +0000 Commit: Colin Percival CommitDate: 2023-09-13 20:03:28 +0000 init_main: Record completed SYSINITs When removing them from sysinit_list, append them to sysinit_done_list; print this list from 'show sysinit' along with the list of future sysinits. Reviewed by: jhb, gallatin (previous version) Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41749 (cherry picked from commit 1926d5cef6eaa1302024d6471271c930ad65f9b2) (cherry picked from commit c31f2b5e6b591c61711018c3d6e52067ae860e9c) --- sys/kern/init_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a6b327339c80..a8df9f84a29a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -163,9 +163,11 @@ SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); SET_DECLARE(sysinit_set, struct sysinit); /* - * The sysinit list itself. Items are removed as they are run. + * The sysinit lists. Items are moved to sysinit_done_list when done. */ static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; +static struct sysinitlist sysinit_done_list = + STAILQ_HEAD_INITIALIZER(sysinit_done_list); /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -289,6 +291,7 @@ mi_startup(void) */ while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { STAILQ_REMOVE_HEAD(&sysinit_list, next); + STAILQ_INSERT_TAIL(&sysinit_done_list, sip, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,6 +907,11 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); + STAILQ_FOREACH(sip, &sysinit_done_list, next) { + db_show_print_syinit(sip, true); + if (db_pager_quit) + return; + } STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) From nobody Wed Sep 13 21:42:56 2023 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 4RmDTD2Ybpz4spn5; Wed, 13 Sep 2023 21:42:56 +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 4RmDTD26xvz3dxY; Wed, 13 Sep 2023 21:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694641376; 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=dx5sjSJdnhcUVoYAJPsMQkayaoAIPqcd50idItIZ1Oo=; b=m0Cm2iwCp+k1L2tDWKOc0+mD6USJzmCwIh24vy7RuT3fMy6A711N5d9NIExzWtN7Iiiwh1 iBwxLqys4yKUQ7P3CNKHOGaG0hrlszijc5O6CluxRQxSYmTZrILPcHc+hDXc3OhAEufTzP DZOidvW/FZpXPm2oCr47VE0/0wkfsvsYgzNQDS+7UM+JUQjb8IH/FERgsN2eyVUYgumAuU FInTY7FUyH5D15adyBxFMaMYKgt+z/gRttDQHbY18WjrCkRnT5juXUtwzn7JyKYBm0/UFn OLvqBq74NEHrDWh6kXshrST7vhZ1IyGsv25nNqStrhspfDJ0UzOMqB6jPcMJhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694641376; a=rsa-sha256; cv=none; b=wgVEZxo2GTMnwXElq98rxvntgCeoHRxK91gu65RgoFK/piaMriqUe8bOine4fVPi+B/KoI bIc9p41W9datmVVkflnOZcQuGow/DuQIDip/bZ0JpMHDjldqgJuUZN8BqjvyQZOZAA/hLw A07tCjY5GFBKsOAIlAO3nI4Cui3hnYW+1ERZhlv9Th5QvGHB9qQea3OTz3sMGGyUit5ErZ gPuQxZbs1BQERSJPQmJ98hcKo4f5Mwr/8xc3U6Q1cJ3kcQwWDHwKJXKGLCr38RA8cfE3Vd 26A6gvcS2cNDDHm3KuY3W8qjLSGfmSzmlwIhCmSfnVjmsBVWlI7SMK+ht/Ldrw== 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=1694641376; 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=dx5sjSJdnhcUVoYAJPsMQkayaoAIPqcd50idItIZ1Oo=; b=J0iwrZP3JM3pIT90bCGRjlZkZl0zTu+uI6cbQBT7PsINVmwWPFEhNTz4OZ9KH8NN7sU93H vLIjCNe1KNfglSU5OHVCiMUKUd5/Jwb+GxM21bupGhg+m1MF85OkVN57D4M91ic2umqZX8 YyzdkCteHsVK9nCIwLWrEF9uGpLUXBGzunhPerkq8ODg2at//HfMUIGAUJQmtItm8032de GjtJp434dk4ZdxRq8ZHOOjBhtQIPK4l5aczPns4jVwUvR8n+fblJKTjmZh3I+mWqgc8+uc yfbc3mRfZftoHPk1BQSLOGFJcftWbuztQJFJWpY+Zku8uh2Vzl2R72sG8iDEdQ== 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 4RmDTD1C2NzWSr; Wed, 13 Sep 2023 21:42: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 38DLguQU062000; Wed, 13 Sep 2023 21:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DLguXw061997; Wed, 13 Sep 2023 21:42:56 GMT (envelope-from git) Date: Wed, 13 Sep 2023 21:42:56 GMT Message-Id: <202309132142.38DLguXw061997@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: 3ea83e94cdfa - stable/14 - ftpd: correct deprecation notice markup 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: 3ea83e94cdfa34745641dfa5f43debfdcd79e229 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3ea83e94cdfa34745641dfa5f43debfdcd79e229 commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229 Author: Ed Maste AuthorDate: 2023-09-13 21:13:42 +0000 Commit: Ed Maste CommitDate: 2023-09-13 21:42:00 +0000 ftpd: correct deprecation notice markup Also bump .Dd for the original change. Reported by: karels Fixes: 98b98ec1bc7e ("ftpd: add deprecation notice") Sponsored by: The FreeBSD Foundation (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) --- libexec/ftpd/ftpd.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index f5353be894fe..ec4ce0c65100 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -43,7 +43,7 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask -.Sh .Sh DEPRECATION NOTICE +.Sh DEPRECATION NOTICE The .Fx base system From nobody Wed Sep 13 22:12:51 2023 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 4RmF7l60Y5z4t0cp; Wed, 13 Sep 2023 22:12: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 4RmF7l51FBz4Hg8; Wed, 13 Sep 2023 22:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694643171; 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=1a2KDkZmHnj2icv9pWckXQxBqRB6wuZw78gZhja8wrI=; b=hxe8zcfxGzfssBHQjkeK0hg+OHnPiMTbnaOf1tDJ9jSd6pC/m4rkb3tcyknLOXGvYyV+nA lTu1hq5nMfr1RpR3GH+FqcZpIwWpk/duN49DIc3xQd7kb88SFYC8H5z6xiplukdH0vHU/t piz8LFmf/NS/i8VUBCmGWxR6R/621LoVcS2VD2xT2g7goFmFgYEMcwCfHNzZ0KKIr/HdiZ nWBWMGfl6st24xzmZq8ZDb5E5QqDke6Lia4bsHk4D5xNuAeAO2TLc0X4C8eFlbON9AENhQ l/7qMgHogR3nSPBfQBDpOzTTFCjFjHpBAq9AQKwgMWeJzxqgpJYaFlNsWSj5IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694643171; a=rsa-sha256; cv=none; b=EVRUJ5pwuAV+a6CDlqu4ilwr79M/ndS8LDThnxTr3bzz4lrGagIFacinibIrUu7vklHMtE Y7AcR6/N4F1NSrlDtZN4b74Iq5R5P0VF1gYt2n6aRkmmEBdEsrs0wm/dfO1Gav7uxPJ5kn w4GvaaQT8cv8pk35wV0Bwn7VB6HuX1VFVV3ewcbI2oaQSLr6E4m82joX3AKcm0mIki0LIX mgY5QczregwUFj+DdohYoCgsyZc7EpGpXtJ2UvECv8B9IKT7Y/Z0Sn8FGA1J4DYVKRlivG bbeHxYDpOCvn62adr2Wtz2tmdCeczS97RI/YdfS1RblyJucgvHW2ZX+zzXJK3Q== 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=1694643171; 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=1a2KDkZmHnj2icv9pWckXQxBqRB6wuZw78gZhja8wrI=; b=YZryBKR0NGJqNaubCKdJyYWpk9yhZMX99jeyy+MJJzt5u9Bp89FkrLEjJeMd+ci80rB1DO GkgtIlsMuYyN5SWsV4cAWyhMuYlEpnprJYTzblQecbT2uNAoABSsN0ADCrEcm1k6ZJYsfN mVyiRTJ0Bwxq/s0Jgw38dt3Bs3uyiCMh/e8PEu2WXGO4iV7qKi9oZ7SN3BoCp7l9rMNJqE MZGQYRCrX8HA4gYLWwiBv+MIdPdaVcCHQkvj02WdHF55twSKXKbFiqNviXFU6UTrvOrzcH rLmKzkYNp1tTevvwoA2n7c/MtpwDMTFN3DNsFu3VS3MXwcgAm36Mbl5KESIt+w== 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 4RmF7l447vzWd3; Wed, 13 Sep 2023 22:12: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 38DMCp0J011735; Wed, 13 Sep 2023 22:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DMCpAY011732; Wed, 13 Sep 2023 22:12:51 GMT (envelope-from git) Date: Wed, 13 Sep 2023 22:12:51 GMT Message-Id: <202309132212.38DMCpAY011732@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: da722491d3cb - releng/14.0 - ftpd: add deprecation notice 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: da722491d3cbf995c1eb95a40a4402e1955fa962 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=da722491d3cbf995c1eb95a40a4402e1955fa962 commit da722491d3cbf995c1eb95a40a4402e1955fa962 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-13 22:12:42 +0000 ftpd: add deprecation notice Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) (cherry picked from commit cc9347cc79d320cac00ccf5d5f23971de2c887a1) (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) (cherry picked from commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229) Approved by: re (gjb) --- libexec/ftpd/ftpd.8 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index c45df161575c..ec4ce0c65100 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -43,6 +43,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Thu Sep 14 07:49:42 2023 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 4RmTxM2Jtbz4sbM8; Thu, 14 Sep 2023 07:49: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 4RmTxM1GYtz3dCZ; Thu, 14 Sep 2023 07:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694677783; 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=jQRD2anfiWQN5YDFkI4B9YMMW/p1gyIeBJleAeZ5ovo=; b=pn5XRe7nRfNyJrRHzVj5s7rH/VJ7ZuqgqPJPdDKMVFI/54Vh7JceF0QydiRqkqyCf17JIq uy/+9OoygUouKYe90TvnEE4u97ePVVyIZgFk54/jiatf/oGc9NyaQXXlpUFVWztCYuir+q +1ZlROLfOtdrtJJIrQGt8yJREGZ+z+XxgQoUKzpkM4yBkvtWK8XqlbdG8/Ejp46W+bwL3k Fmx4BL/gCj+gjGMb0/nCQQVG9anwTIPvRjeqz/nG9X3om3ZfFETQRMUSrUWQ+pYQC881aX vnR9hExIeZVmeyUMSiw+qAb6Q8bFuDgu9C6knp8NFfD/7enoEgO5pLO0dLGlIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694677783; a=rsa-sha256; cv=none; b=bFFfSqSxv13jGF98EApvriytTJXR/fUtYGh+QoO9+cBwmcfNPvQYjNl60f7+F4TzvL3LnT uOuoUhw1eUIzeD/Ttvu5fJkaN5Hm2Icb2zhzVPlESUJ0E76C93VU9qoxq+CX04zdTiqwn5 RPaCAHk/PV1z9yugy52i6cQfZ0TqfWUSJHoGHMIUP8Sof3x+QT25r3iaXFks07/yHeUtxK gPC8oBT14DOksslLLg8HYuV8r4I8rTLkOEHTZBc6AiCofA3EIKtAuhgYHAqZbyy19srVFI UdGzPinQhKgGbAfeqmTG7It4f7zORE6Sl833VuRljyf3Dzb8+2OIU2dRQEfS/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=1694677783; 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=jQRD2anfiWQN5YDFkI4B9YMMW/p1gyIeBJleAeZ5ovo=; b=vC1yJMilIbkbplgOEFA4yX/GJRmkCXjsiY5HZaZ//cRiY/VoAXjI/OICDh41VwYBYye9os jsbAc6v0ZyLJTRTszG6zmuLFNJuOLUIeV8cggW4mv+/Fo5UC1V+sAg6463z2mGcF/eknXm AVdO6JX8AXoFjTV7lX9KP0XLzRqYLxHCFoGW38PPzZQckPBvfrhmqr3A6IkSek3bEBkSX3 f/NmjhUiAoxl6o3Bw3+SeHggfRBRY09bakocsWRWGEF4EULioXf2+9WcikPVPFwT7Q0GZ7 Z0Sr083jvbJm0oeyaHATwFNynfl0xdVsEn3oEQTtUsVDBWqACgfX+a+4y603+A== 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 4RmTxM0LDbzpGh; Thu, 14 Sep 2023 07:49:43 +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 38E7ngru059208; Thu, 14 Sep 2023 07:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E7nggO059204; Thu, 14 Sep 2023 07:49:42 GMT (envelope-from git) Date: Thu, 14 Sep 2023 07:49:42 GMT Message-Id: <202309140749.38E7nggO059204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ffaa91929f2d - releng/14.0 - qat: Intel 4xxx Series driver API extension 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ffaa91929f2d30fb78ba36c768e975ecfe28124a Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffaa91929f2d30fb78ba36c768e975ecfe28124a commit ffaa91929f2d30fb78ba36c768e975ecfe28124a Author: Piotr Kasierski AuthorDate: 2023-09-06 13:51:41 +0000 Commit: Mark Johnston CommitDate: 2023-09-14 07:49:18 +0000 qat: Intel 4xxx Series driver API extension This commit introduces: - Quick Assist API update for partial decompress and zero padding. - Refactor of UIO locking. - VF driver hotplug fix. - Minor code style fixes for firmware API. Patch co-authored by: Krzysztof Zdziarski Patch co-authored by: Michal Gulbicki Patch co-authored by: Piotr Kasierski Patch co-authored by: Karol Grzadziel Approved by: re (delphij) Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41613 (cherry picked from commit 22cf89c938886d14f5796fc49f9f020c23ea8eaf) (cherry picked from commit c265e6217951b8bf71dbf59832e06d9f2c0b0325) --- share/man/man4/qat.4 | 4 +- sys/dev/qat/qat_api/common/compression/dc_dp.c | 296 ++++++++++++- .../common/compression/include/dc_datapath.h | 11 + sys/dev/qat/qat_api/common/ctrl/sal_compression.c | 8 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h | 18 +- .../qat/qat_api/firmware/include/icp_qat_fw_comp.h | 486 ++++++++++----------- .../qat_api/firmware/include/icp_qat_hw_20_comp.h | 63 ++- .../firmware/include/icp_qat_hw_20_comp_defs.h | 159 ++++++- sys/dev/qat/qat_api/include/dc/cpa_dc.h | 15 +- sys/dev/qat/qat_api/include/dc/cpa_dc_dp.h | 431 ++++++++++++++++++ sys/dev/qat/qat_api/include/icp_sal_versions.h | 2 +- sys/dev/qat/qat_common/adf_ctl_drv.c | 3 +- sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 24 +- sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c | 13 +- sys/dev/qat/qat_common/adf_pfvf_vf_proto.c | 5 + sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c | 18 +- sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c | 32 +- 17 files changed, 1221 insertions(+), 367 deletions(-) diff --git a/share/man/man4/qat.4 b/share/man/man4/qat.4 index 347f257c7aec..b0fa0b0cbc92 100644 --- a/share/man/man4/qat.4 +++ b/share/man/man4/qat.4 @@ -64,8 +64,8 @@ driver supports cryptography and compression acceleration. A complete API for offloading these operations is exposed in the kernel and may be used by any other entity directly. For details of usage and supported operations and algorithms refer to the -following documentation available from -.Lk 01.org : +following documentation available from Intel Download Center +.Lk https://downloadcenter.intel.com : .Bl -bullet -compact .It .Rs diff --git a/sys/dev/qat/qat_api/common/compression/dc_dp.c b/sys/dev/qat/qat_api/common/compression/dc_dp.c index 1bc50d89365d..8b409d9ad7ca 100644 --- a/sys/dev/qat/qat_api/common/compression/dc_dp.c +++ b/sys/dev/qat/qat_api/common/compression/dc_dp.c @@ -217,6 +217,89 @@ dcDataPlaneParamCheck(const CpaDcDpOpData *pOpData) return CPA_STATUS_SUCCESS; } +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Partial-read parameters validation utility. + * + * @description + * Basic check that all partial-read related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * + *****************************************************************************/ +static CpaStatus +dcDataPlanePartReadCheck(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData) +{ + sal_compression_service_t *pService = NULL; + + LAC_CHECK_NULL_PARAM(pPartReadData); + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_COMPRESS) { + /* Decompression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + if (pPartReadData->length > pOpData->bufferLenForData) { + QAT_UTILS_LOG( + "Partial read data length can not be greater than the destination buffer size\n"); + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} + +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Zero-padding parameters validation utility. + * + * @description + * Basic check that all zero-padding related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * @retval CPA_STATUS_NOT_SUPPORTED Feature not supported + * + *****************************************************************************/ +static CpaStatus +dcDataPlaneZeroPadCheck(CpaDcDpOpData *pOpData) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_DECOMPRESS) { + /* Compression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} CpaStatus cpaDcDpGetSessionSize(CpaInstanceHandle dcInstance, CpaDcSessionSetupData *pSessionData, @@ -379,8 +462,60 @@ dcDpWriteRingMsg(CpaDcDpOpData *pOpData, icp_qat_fw_comp_req_t *pCurrentQatMsg) pCurrentQatMsg->comp_pars.out_buffer_sz = pOpData->bufferLenForData; } -CpaStatus -cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +/** + ***************************************************************************** + * @ingroup cpaDcDp + * + * @description + * Updates the request decryptor with optional parameters: + * - partial read specific fields + * - zero-padding specific field + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * @param[in] zeroPadFlag Boolean indicator containing the + * zero-padding enablement flag. + * @param[in] pCurrentQatMsg Pointer to current QAT message on the ring. + * + *****************************************************************************/ +static void +dcDpUpdateRingMsg(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + icp_qat_fw_comp_req_t *pCurrentQatMsg) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + if (!isDcGen4x(pService)) { + return; + } + + /* Partial read settings */ + if (NULL != pPartReadData) { + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_offset = pPartReadData->dataOffset; + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_length = pPartReadData->length; + ICP_QAT_FW_COMP_PART_DECOMP_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_PART_DECOMP); + } + /* Zero padding settings */ + if (CPA_TRUE == zeroPadFlag) { + ICP_QAT_FW_COMP_ZEROPAD_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_ZEROPAD); + } +} + +static CpaStatus +dcDpEnqueueOpBase(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -392,6 +527,20 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) return status; } + if (NULL != pPartReadData) { + status = dcDataPlanePartReadCheck(pOpData, pPartReadData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + if ((CPA_FALSE == pOpData->compressAndVerify) && (CPA_DC_DIR_COMPRESS == pOpData->sessDirection)) { return CPA_STATUS_UNSUPPORTED; @@ -422,6 +571,13 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } dcDpWriteRingMsg(pOpData, pCurrentQatMsg); + if (NULL != pPartReadData || CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData, + pPartReadData, + zeroPadFlag, + pCurrentQatMsg); + } + pSessionDesc->pendingDpStatelessCbCount++; if (CPA_TRUE == performOpNow) { @@ -432,9 +588,36 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } CpaStatus -cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, - CpaDcDpOpData *pOpData[], - const CpaBoolean performOpNow) +cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +{ + + return dcDpEnqueueOpBase(pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartRead(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, + pPartReadData, + CPA_FALSE, + performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPad(CpaDcDpOpData *pOpData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, NULL, CPA_TRUE, performOpNow); +} + +static CpaStatus +dcDpEnqueueOpBatchBase(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartData[], + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -462,6 +645,21 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return status; } + if (NULL != pPartData) { + status = + dcDataPlanePartReadCheck(pOpData[i], pPartData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + /* Check that all instance handles and session handles are the * same */ if (pOpData[i]->dcInstance != pOpData[0]->dcInstance) { @@ -516,6 +714,18 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, for (i = 0; i < numberRequests; i++) { dcDpWriteRingMsg(pOpData[i], pCurrentQatMsg); + if (pPartData) { + dcDpUpdateRingMsg(pOpData[i], + pPartData[i], + CPA_FALSE, + pCurrentQatMsg); + } + if (CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData[i], + NULL, + CPA_TRUE, + pCurrentQatMsg); + } icp_adf_getQueueNext(trans_handle, (void **)&pCurrentQatMsg); } @@ -528,6 +738,34 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return CPA_STATUS_SUCCESS; } +CpaStatus +cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartReadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartReadData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, pPartReadData, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_TRUE, performOpNow); +} + CpaStatus icp_sal_DcPollDpInstance(CpaInstanceHandle dcInstance, Cpa32U responseQuota) { @@ -565,3 +803,51 @@ cpaDcDpPerformOpNow(CpaInstanceHandle dcInstance) return CPA_STATUS_SUCCESS; } + +CpaStatus +cpaDcDpIsPartReadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_part_read; + + return CPA_STATUS_SUCCESS; +} + +CpaStatus +cpaDcDpIsZeroPadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_zero_pad; + + return CPA_STATUS_SUCCESS; +} diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h index 5bcff65c4fb3..58fb56f3c8ae 100644 --- a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h +++ b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h @@ -196,4 +196,15 @@ typedef enum dc_cnv_mode_s { /* CNV = TRUE, CNVNR = TRUE */ } dc_cnv_mode_t; +/* Type to access extended features bit fields */ +typedef struct dc_extended_features_s { + unsigned is_cnv : 1; /* Bit<0> */ + unsigned padding : 7; + unsigned is_cnvnr : 1; /* Bit<8> */ + unsigned reserved : 2; + unsigned is_part_read : 1; /* Bit<11> */ + unsigned is_zero_pad : 1; /* Bit<12> */ + unsigned not_used : 19; +} dc_extd_ftrs_t; + #endif /* DC_DATAPATH_H_ */ diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c index f0e8d28949ff..c0f5a411d87e 100644 --- a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c +++ b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c @@ -52,14 +52,6 @@ /* C string null terminator size */ #define SAL_NULL_TERM_SIZE 1 -/* Type to access extended features bit fields */ -typedef struct dc_extended_features_s { - unsigned is_cnv : 1; /* Bit<0> */ - unsigned padding : 7; - unsigned is_cnvnr : 1; /* Bit<8> */ - unsigned not_used : 23; -} dc_extd_ftrs_t; - /* * Prints statistics for a compression instance */ diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h index 28dfeff6579e..b4d1f5829ba2 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h @@ -1386,21 +1386,9 @@ typedef struct icp_qat_fw_comn_resp_s { /**< Error Code constant value for submission of empty dynamic stored block to * slice */ -#define ERR_CODE_EXCEED_MAX_REQ_TIME -24 -/**< Error Code constant for exceeding max request time */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_HANDLE -20 -/**< Error Code constant for invalid handle in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_HMAC_FAILED -21 -/**< Error Code constant for failed hmac in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_WRAPPING_ALGO -22 -/**< Error Code constant for invalid wrapping algo in kpt crypto service */ - -#define ERR_CODE_KPT_DRNG_SEED_NOT_LOAD -23 -/**< Error Code constant for no drng seed is not loaded in kpt ecdsa signrs -/service */ +#define ERR_CODE_REGION_OUT_OF_BOUNDS -21 +/**< Error returned when decompression ends before the specified partial + * decompression region was produced */ #define ERR_CODE_MISC_ERROR -50 /**< Error Code constant for error detected but the source diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h index 5edf7022ee1d..fe1b7ad55de8 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h @@ -47,6 +47,7 @@ typedef enum { } icp_qat_fw_comp_cmd_id_t; + /* * REQUEST FLAGS IN COMMON COMPRESSION * In common message it is named as SERVICE SPECIFIC FLAGS. @@ -64,7 +65,8 @@ typedef enum { * are don't care. i.e., these features are removed from QAT 2.0. */ -/** Flag usage */ + +/**< Flag usage */ #define ICP_QAT_FW_COMP_STATELESS_SESSION 0 /**< @ingroup icp_qat_fw_comp @@ -108,7 +110,7 @@ typedef enum { * Flag representing secure RAM from being used as * an intermediate buffer is ENABLED. */ -/** Flag mask & bit position */ +/**< Flag mask & bit position */ #define ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS 2 /**< @ingroup icp_qat_fw_comp @@ -148,7 +150,7 @@ typedef enum { #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS 7 /**< @ingroup icp_qat_fw_comp * Starting bit position for flag used to disable secure ram from - * being used as an intermediate buffer. */ + being used as an intermediate buffer. */ #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK 0x1 /**< @ingroup icp_qat_fw_comp @@ -170,7 +172,7 @@ typedef enum { * @ret_uncomp RetUnCompressed * @secure_ram Secure Ram usage * - *********************************************************************************/ + ******************************************************************************/ #define ICP_QAT_FW_COMP_FLAGS_BUILD( \ sesstype, autoselect, enhanced_asb, ret_uncomp, secure_ram) \ (((sesstype & ICP_QAT_FW_COMP_SESSION_TYPE_MASK) \ @@ -215,7 +217,7 @@ typedef enum { * * @param flags Flags to extract the session type bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SESSION_TYPE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS, \ @@ -230,7 +232,7 @@ typedef enum { * * @param flags Flags to extract the autoSelectBest bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_AUTO_SELECT_BEST_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_AUTO_SELECT_BEST_BITPOS, \ @@ -245,7 +247,7 @@ typedef enum { * * @param flags Flags to extract the enhanced asb bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_EN_ASB_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_ENHANCED_AUTO_SELECT_BEST_BITPOS, \ @@ -260,7 +262,7 @@ typedef enum { * * @param flags Flags to extract the Ret Uncomp bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_RET_UNCOMP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_RET_DISABLE_TYPE0_HEADER_DATA_BITPOS, \ @@ -275,21 +277,21 @@ typedef enum { * * @param flags Flags to extract the Secure Ram usage from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SECURE_RAM_USE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK) /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression header cd pars block * @description * Definition of the compression processing cd pars block. * The structure is a service-specific implementation of the common * structure. - ******************************************************************************/ + *****************************************************************************/ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { /**< LWs 2-5 */ struct { @@ -301,15 +303,10 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint8_t content_desc_params_sz; /**< Size of the content descriptor parameters in quad words. - * These - * parameters describe the session setup configuration info for - * the - * slices that this request relies upon i.e. the configuration - * word and - * cipher key needed by the cipher slice if there is a request - * for - * cipher - * processing. */ + * These parameters describe the session setup configuration + * info for the slices that this request relies upon i.e. the + * configuration word and cipher key needed by the cipher slice + * if there is a request for cipher processing. */ uint8_t content_desc_hdr_resrvd2; /**< Content descriptor reserved field */ @@ -324,28 +321,28 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint32_t content_desc_resrvd4; /**< Content descriptor reserved field */ + } sl; } icp_qat_fw_comp_req_hdr_cd_pars_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression request parameters block * @description * Definition of the compression processing request parameters block. * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 14-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_req_params_s { /**< LW 14 */ uint32_t comp_len; /**< Size of input to process in bytes Note: Only EOP requests can be - * odd - * for decompression. IA must set LSB to zero for odd sized intermediate - * inputs */ + * odd for decompression. IA must set LSB to zero for odd sized + * intermediate inputs */ /**< LW 15 */ uint32_t out_buffer_sz; @@ -368,10 +365,10 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< CRC data structure pointer */ } crc; - /** LW 18 */ + /**< LW 18 */ uint32_t req_par_flags; - /** LW 19 */ + /**< LW 19 */ uint32_t rsrvd; } icp_qat_fw_comp_req_params_t; @@ -394,8 +391,10 @@ typedef struct icp_qat_fw_comp_req_params_s { * @param cnvnr Whether internal CNV recovery is to be performed * * ICP_QAT_FW_COMP_NO_CNV_RECOVERY * * ICP_QAT_FW_COMP_CNV_RECOVERY + * @param cnvdfx Whether CNV error injection is to be performed + * * ICP_QAT_FW_COMP_NO_CNV_DFX + * * ICP_QAT_FW_COMP_CNV_DFX * @param crc CRC Mode Flag - 0 legacy, 1 crc data struct - * *****************************************************************************/ #define ICP_QAT_FW_COMP_REQ_PARAM_FLAGS_BUILD( \ sop, eop, bfinal, cnv, cnvnr, cnvdfx, crc) \ @@ -411,21 +410,64 @@ typedef struct icp_qat_fw_comp_req_params_s { ((crc & ICP_QAT_FW_COMP_CRC_MODE_MASK) \ << ICP_QAT_FW_COMP_CRC_MODE_BITPOS)) + +/* + * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION + * + * +=====+-----+----- + --- + --- +-----+ --- + ----- + --- + ---- + -- + -- + + * | Bit |31-24| 20 | 19 | 18 | 17 | 16 | 15-7 | 6 | 5-2 | 1 | 0 | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + * |Flags|Resvd|xxHash| CRC | CNV |CNVNR| CNV | Resvd |BFin | Resvd|EOP |SOP | + * | |=0 |acc | MODE| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + */ + + +/** +***************************************************************************** +* @ingroup icp_qat_fw_comp +* Definition of the additional QAT2.0 Compression command types +* @description +* Enumeration which is used to indicate the ids of functions +* that are exposed by the Compression QAT FW service +* +*****************************************************************************/ +typedef enum { + ICP_QAT_FW_COMP_20_CMD_LZ4_COMPRESS = 3, + /*!< LZ4 Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4_DECOMPRESS = 4, + /*!< LZ4 Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_COMPRESS = 5, + /*!< LZ4S Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_DECOMPRESS = 6, + /*!< LZ4S Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_XP10_COMPRESS = 7, + /*!< XP10 Compress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_XP10_DECOMPRESS = 8, + /*!< XP10 Decompress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_DELIMITER + /**< Delimiter type */ + +} icp_qat_fw_comp_20_cmd_id_t; + + /* * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION * - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + - * --- + - * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 - * | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + - * | Flags | Resvd | CRC |Resvd| CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | - * SOP | - * | | =0 | Mode| =0 | | | =0 | | =0 | | | - * | | | | | | | | | | | | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + --- + + * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + + * | Flags | Resvd | CRC | CNV | CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | SOP | + * | | =0 | Mode| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + */ #define ICP_QAT_FW_COMP_NOT_SOP 0 @@ -434,15 +476,15 @@ typedef struct icp_qat_fw_comp_req_params_s { #define ICP_QAT_FW_COMP_SOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS Start of Packet */ + * * Flag representing that a request IS Start of Packet */ #define ICP_QAT_FW_COMP_NOT_EOP 0 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request is NOT Start of Packet */ + * Flag representing that a request is NOT Start of Packet */ #define ICP_QAT_FW_COMP_EOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS End of Packet */ + * Flag representing that a request IS End of Packet */ #define ICP_QAT_FW_COMP_NOT_BFINAL 0 /**< @ingroup icp_qat_fw_comp @@ -484,6 +526,30 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Flag representing to use the external CRC data struct */ +#define ICP_QAT_FW_COMP_NO_XXHASH_ACC 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash will NOT be accumulated across requests */ + +#define ICP_QAT_FW_COMP_XXHASH_ACC 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash WILL be accumulated across requests */ + +#define ICP_QAT_FW_COMP_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_NO_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_ZEROPAD 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform zero-padding in compression request */ + +#define ICP_QAT_FW_COMP_NO_ZEROPAD 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform zero-padding in compression request */ + #define ICP_QAT_FW_COMP_SOP_BITPOS 0 /**< @ingroup icp_qat_fw_comp * Starting bit position for SOP */ @@ -516,14 +582,6 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Starting bit position for the CNV bit */ -#define ICP_QAT_FW_COMP_CNV_RECOVERY_MASK 0x1 -/**< @ingroup icp_qat_fw_comp - * One bit mask for the CNV Recovery bit */ - -#define ICP_QAT_FW_COMP_CNV_RECOVERY_BITPOS 17 -/**< @ingroup icp_qat_fw_comp - * Starting bit position for the CNV Recovery bit */ - #define ICP_QAT_FW_COMP_CNVNR_MASK 0x1 /**< @ingroup icp_qat_fw_comp * One bit mask for the CNV Recovery bit */ @@ -556,6 +614,22 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * One bit mask used to determine xxHash accumulate mode */ +#define ICP_QAT_FW_COMP_PART_DECOMP_BITPOS 27 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress bit */ + +#define ICP_QAT_FW_COMP_PART_DECOMP_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress mask */ + +#define ICP_QAT_FW_COMP_ZEROPAD_BITPOS 26 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad bit */ + +#define ICP_QAT_FW_COMP_ZEROPAD_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad mask */ + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -565,7 +639,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the SOP bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SOP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SOP_BITPOS, \ @@ -585,8 +659,9 @@ typedef struct icp_qat_fw_comp_req_params_s { QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_EOP_BITPOS, \ ICP_QAT_FW_COMP_EOP_MASK) - /** + + ****************************************************************************** * @ingroup icp_qat_fw_comp * @@ -595,7 +670,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the bfinal bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_BFINAL_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_BFINAL_BITPOS, \ @@ -663,6 +738,70 @@ typedef struct icp_qat_fw_comp_req_params_s { ICP_QAT_FW_COMP_XXHASH_ACC_MODE_BITPOS, \ ICP_QAT_FW_COMP_XXHASH_ACC_MODE_MASK) +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the partial de-compress on/off bit + * + * @param flags Flags to extract the partial de-compress on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the partial de-compress on/off bit + * + * @param flags Flags to set the partial de-compress on/off bit to + * @param val partial de-compress on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the zero padding on/off bit + * + * @param flags Flags to extract the zero padding on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the zero-padding on/off bit + * + * @param flags Flags to set the zero-padding on/off bit to + * @param val zero-padding on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -670,23 +809,23 @@ typedef struct icp_qat_fw_comp_req_params_s { * @description * Definition of the translator processing request parameters block * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 20-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_xlt_req_params_s { /**< LWs 20-21 */ uint64_t inter_buff_ptr; /**< This field specifies the physical address of an intermediate - * buffer SGL array. The array contains a pair of 64-bit - * intermediate buffer pointers to SGL buffer descriptors, one pair - * per CPM. Please refer to the CPM1.6 Firmware Interface HLD - * specification for more details. - * Placeholder for QAT2.0. */ + * buffer SGL array. The array contains a pair of 64-bit + * intermediate buffer pointers to SGL buffer descriptors, one pair + * per CPM. Please refer to the CPM1.6 Firmware Interface HLD + * specification for more details. */ + } icp_qat_fw_xlt_req_params_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Compression header of the content descriptor block * @description @@ -697,7 +836,7 @@ typedef struct icp_qat_fw_xlt_req_params_s { * cd block, thus differing from the common base content descriptor * structure. * - ******************************************************************************/ + *****************************************************************************/ *** 1568 LINES SKIPPED *** From nobody Thu Sep 14 07:50:39 2023 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 4RmTyR2yVwz4sbXn; Thu, 14 Sep 2023 07:50: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 4RmTyR2C2nz3dRc; Thu, 14 Sep 2023 07:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694677839; 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=dfosmuuHJo84b40Q3fBsU61YxixJ2V6+aLzz7nCd/nM=; b=yZ4Xv9VJUNQmDpQaEbJRVf3KXW7WUjIxwbzsL/zjjGt+m8pxjz3FidYA+Qni3+g70azbzy h1MdtLAiv8ffQkc3S7ND7/PwC7aM3fLV9voEzczp8v2xiGj2fX69sgWB7jW3uRpeuWvqj5 ahEKlQyaiPWdEum67MPoSXu9gMcajEDOwgNfuSftppLaXq/it5ar2M9K5uFw52kpWFFpQy O+lrod8UkkofKuLRYIp2NjxLqHkal8yOrSADDLz68Xg0vSynwaIiDyxnl5lYAMmn/jdySG 8IwW2QndntNqr1tKfjpoS1TProXsGFytcXe+qQy5U/hff5pfO2kJRxxg7qb36A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694677839; a=rsa-sha256; cv=none; b=AVwAzFLjx2+revwsam/YhJoa5oM0igEdzYzXTdSY5bxsUyLYhr7Jm+RG/GSWzinRHwbbCd aMx857fbZ2+ABYTTey6GGqhQhTO6naTxAt7LhJRZp1VrMbRPBcG9+dpdSzHtd0iXx5HEPD X/fo0VCZG+0CHOoG6vz+LLOjvnn60IlBYUXN8xejXfZ08djDtlsVJI8yHkvcG4EINXMTrQ 0sBqDVncd2+AP7CrFPR9si7njlg89TERUkbvVSHUJkzl2geCCy8UPaEiu7WvBoxyrY2GRM MQdAJvTnZeopCcD/yEpt/RTR2eo0I1neppofICehgx9f+qpEmtrK16WCnnIkeg== 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=1694677839; 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=dfosmuuHJo84b40Q3fBsU61YxixJ2V6+aLzz7nCd/nM=; b=MqDFNVnsAOx8kaAlgRTiX0ojFarj8gCUr8FWyA4/mWvR1TrsW2qqZDPOIoA6OmTjXp8D61 Nki/UDO2z45e4KwoeqR1kptmF0GiyniiY/JqfvzUfgxXeY/MVVw6/FPHWiWhjuyGec2Htg SiYp9+TfP+1+I7W2q3+ig2GVacPl+XKucbp6AxsPfLL5WkNtYApTX0GwBRkh7bY5hpVD5M 6YMAlW9ZkzSRhWGEjekhOfqlPvryAaXWPQPY4jnVUl5yiZdzS0cBoCk4LVPxMAjiXNf92V j28qXeO41Ve5Z71D0n2/W75oaepc4PDxCMmkiRdp0vfbG97rxl/kEgkXsvtbIQ== 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 4RmTyR1F9tzpPp; Thu, 14 Sep 2023 07:50: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 38E7od5d067886; Thu, 14 Sep 2023 07:50:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E7odkt067884; Thu, 14 Sep 2023 07:50:39 GMT (envelope-from git) Date: Thu, 14 Sep 2023 07:50:39 GMT Message-Id: <202309140750.38E7odkt067884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 04ada3cc2b53 - stable/14 - gve: Make LRO work for jumbo packets 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 04ada3cc2b530a5c170ebefa8c28c5625009d37a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04ada3cc2b530a5c170ebefa8c28c5625009d37a commit 04ada3cc2b530a5c170ebefa8c28c5625009d37a Author: Shailend Chand AuthorDate: 2023-09-07 13:28:26 +0000 Commit: Mark Johnston CommitDate: 2023-09-14 07:50:15 +0000 gve: Make LRO work for jumbo packets Each Rx descriptor points to a packet buffer of size 2K, which means that MTUs greater than 2K see multi-descriptor packets. The TCP-hood of such packets was being incorrectly determined by looking for a flag on the last descriptor instead of the first descriptor. Also fixed and progressed the version number. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41754 (cherry picked from commit 5f62584a9adb7887bae33af617cfa4f43017abf8) --- sys/dev/gve/gve.h | 1 + sys/dev/gve/gve_main.c | 8 ++++---- sys/dev/gve/gve_rx.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 61781cddee94..c446199dff2d 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -164,6 +164,7 @@ struct gve_rx_ctx { struct mbuf *mbuf_tail; uint32_t total_size; uint8_t frag_cnt; + bool is_tcp; bool drop_pkt; }; diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index c3ee6d5c3433..cd7849778bce 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -31,10 +31,10 @@ #include "gve.h" #include "gve_adminq.h" -#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.0\n" -#define GVE_VERSION_MAJOR 0 -#define GVE_VERSION_MINOR 9 -#define GVE_VERSION_SUB 0 +#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.1\n" +#define GVE_VERSION_MAJOR 1 +#define GVE_VERSION_MINOR 0 +#define GVE_VERSION_SUB 1 #define GVE_DEFAULT_RX_COPYBREAK 256 diff --git a/sys/dev/gve/gve_rx.c b/sys/dev/gve/gve_rx.c index f5d8fd7a7b75..9be96cf1ee3a 100644 --- a/sys/dev/gve/gve_rx.c +++ b/sys/dev/gve/gve_rx.c @@ -546,6 +546,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, if (is_first_frag) { mbuf->m_pkthdr.rcvif = priv->ifp; + ctx->is_tcp = desc->flags_seq & GVE_RXF_TCP; if (gve_needs_rss(desc->flags_seq)) { gve_set_rss_type(desc->flags_seq, mbuf); @@ -567,7 +568,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, do_if_input = true; if (((if_getcapenable(priv->ifp) & IFCAP_LRO) != 0) && /* LRO is enabled */ - (desc->flags_seq & GVE_RXF_TCP) && /* pkt is a TCP pkt */ + (ctx->is_tcp) && /* pkt is a TCP pkt */ ((mbuf->m_pkthdr.csum_flags & CSUM_DATA_VALID) != 0) && /* NIC verified csum */ (rx->lro.lro_cnt != 0) && /* LRO resources exist */ (tcp_lro_rx(&rx->lro, mbuf, 0) == 0)) From nobody Thu Sep 14 08:57:06 2023 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 4RmWR64nBhz4t0C9; Thu, 14 Sep 2023 08:57: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 4RmWR64M34z4SRw; Thu, 14 Sep 2023 08:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681826; 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=793cgjg4EfPkjbanghP2LsbPWv/xk4dycqLb1O3Koy8=; b=k0cXgXBJ00sWbhpqUhzBIB+D73CTmECuCL7Nf8ipSbmyne84duf/cEpmqi7QDAm7SedWo/ FGs/gmveMntZk6oqUT0VoHSGLOXQNjza0MBzTQBAQKbi7sqtwaYMw64xtpcoKnNfGUaDOj K/YJfE0Ez8C/MVJedJZ4yypqq8CmvCTETwED5aLZc2sgsMQQ6xFMmyNH5Lzr6pW9pVvqwj uksU7c7fhsMoULAXWNsa8AN/WZXYSa7B9f7IXsofoOaFvq1xlOESff9fc77fRn+OMSBQ6a CpbrfbUSGY0IMnvsIwrQWC2DVJX+hkHj5zCIgEQt3ZqafqldSb0MR7hibpci6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681826; a=rsa-sha256; cv=none; b=N9tr4wAdeVJvn3CX8wTp1kf3NnMFLdm76ifc+veIjHRRzj3D5QYSCuokQEwbCLbys8k6uD n1SMXUYmrpsLkdx18zie54jgIppBXZlhTMNBBlivojmNLuCOUdOGeOl8uJ1/gZm+spM8m7 2cGNRPYOKdBQ/GJ794GbZmgOKgmvvRPeIBLX3t4d/abjl4Q54TWAjqEU28EBAOfmrfMi7f aX+Od209TD+mkOUPAIbm/oGMsSSpplxsTtP12VPqLAi2yfSoGZeSAJExTXeUQb9boJYIFZ MkW6Q2lNlWk7EngzHTzrbbiLnNx5hyEC+Q/TAne6WF72r1/jPPyKKeW0rPnyFw== 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=1694681826; 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=793cgjg4EfPkjbanghP2LsbPWv/xk4dycqLb1O3Koy8=; b=oA5b4m82xOEBsKoBB86Pvk7GAcVqFOX+qA2HfcG6FOYVu1DOQ+epLAdvXLvtJQBdMLRqoI K9CLb6xhab2vKpejDcyNgEJ17JmbmQvxdvjiwEE8azdfJgYdxAa6C02SsDK+xS/0rda2oB Iid7gs/rq80AD9kfd1YibtlHc6wXctRjDoti3wVLKKVsUKafaP4iTMU+OyAXNd6sYGQSCl 5MX5i3ggrvc6P++wxCwxOgPcabEFhCD7wdKxuoZVFMS4oMmO8maewPnD/kmu1oIcqedI8S adJbmW3KzijoLrIRwGoqACs64ujjs2C3vm59Zil3l1UrICF0KHOZ54390WQ/ZA== 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 4RmWR63Py1zqjv; Thu, 14 Sep 2023 08:57: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 38E8v60D076559; Thu, 14 Sep 2023 08:57:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v6gL076556; Thu, 14 Sep 2023 08:57:06 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:06 GMT Message-Id: <202309140857.38E8v6gL076556@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: 24b741db5fc9 - stable/14 - grep: Suppress EISDIR when reading. 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: 24b741db5fc907d35e51c97f8ef8ad595474e6b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=24b741db5fc907d35e51c97f8ef8ad595474e6b9 commit 24b741db5fc907d35e51c97f8ef8ad595474e6b9 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index cd2764811776..3349b72842ca 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1); From nobody Thu Sep 14 08:57:07 2023 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 4RmWR75kRCz4syyL; Thu, 14 Sep 2023 08:57: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 4RmWR74yl8z4Sjs; Thu, 14 Sep 2023 08:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681827; 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=ZnXuoGlvX+cEQcEx/NIb++qWwocQ1GItzqVlNCL/yF0=; b=ZW1LEB1iDldP9+V++vpBmGjk6ceXl8TqAwk3Mhj1qqpXgWvkwS8m3iKQ4xShF5oBfYmG29 orc6v3307P53ZBclRTz9zQqdaKdtc/7BCUwANPXYNsbL+7MXJ6IDToaOLf4VR4Y6I+8m/y zlDgdvx9FWJuDzlFlneY+EuHBWc/wEFPXi0yn2nf2E7tpbIljKzXmblWxBruYjgSqnQ2Tu lRkXBWyREAttq4jL0Qj1xj3zWUF6W1QXZC2k8TfZ1k9NpYW7ZOnpgXwgsUc9vrtoNMc7jd PYaWVOCxiapN5hyKQ1//9I744IEseT/CS+/riZZdGnRB7WGOXAcX0N2KPGwcTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681827; a=rsa-sha256; cv=none; b=cPf5F7kJ5sqz+VW9TGhP6m1Maz+/ENLfXVTNCFmdUMXVkZSbrc17SxINenX1dtP921yarZ QMVLWGO1bWnsBE2iaK3iE0CQzCBaqtJr9SLPm/VybxlSzvf9s58qJBGDoV3QWkDU9FCb/k lbsbDoRCY8+jnr9Jc6qHxGphA7drQbzRREpDEtSc73TOx5ep0lF8zSaSR8Qt9+Ixv0aGp4 pld7e/n4ekZLj44YXHxxMBgkz5a7Ph3AROUSCL7Id1hpw/XC0/pvFnE/WcRRZMZcY5Pqn0 3aDDlef64yLVzQuaukHWtKMV+phZmooSHOn99dMBG3F5tkgXH9mT/0sH+5FYBg== 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=1694681827; 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=ZnXuoGlvX+cEQcEx/NIb++qWwocQ1GItzqVlNCL/yF0=; b=x3lBr25iYkXGnYHrWOlx04/O3BNUKJFwKzWqwkq8q//7bfwv1Z26Xq7tKyqgStV2OcipPn EtXX1JLd2lGvHdGPrkZzFfVCECF3I/D21WNzkgy+gM4xvi1Cq0nEgfpY9p0AS+myjsCK6A bw2avPY+lWrsRo7QH2o/uvOeBP6bnQsDV/Iqs/DCjJK8cOhr7WOsE+nTUZXcPEH+Nb9i9s aAfGipgNnZqEVFkf6SqKH7/wdIUtY7iO27Wqhq4Kpptc2TY4c8bZM/TVKZhJkVNTxoDwvE zB/qD1BPXwVWJHAO3MGZ5wjOEyZwrMK85lfZFu0o/fkMZFjkbOL7ffPtGXPVig== 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 4RmWR7444szqg7; Thu, 14 Sep 2023 08:57: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 38E8v737076613; Thu, 14 Sep 2023 08:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v7SG076610; Thu, 14 Sep 2023 08:57:07 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:07 GMT Message-Id: <202309140857.38E8v7SG076610@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: 6bd2be4c4971 - stable/14 - mkfile: getopt() returns an int, not a char. 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: 6bd2be4c4971f58c51509ce8856bd5331f979e85 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd2be4c4971f58c51509ce8856bd5331f979e85 commit 6bd2be4c4971f58c51509ce8856bd5331f979e85 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-10 18:33:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 mkfile: getopt() returns an int, not a char. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41804 (cherry picked from commit ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62) --- tests/sys/cddl/zfs/bin/mkfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/bin/mkfile.c b/tests/sys/cddl/zfs/bin/mkfile.c index b1034b9ca500..c1afdbd61196 100644 --- a/tests/sys/cddl/zfs/bin/mkfile.c +++ b/tests/sys/cddl/zfs/bin/mkfile.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { unsigned long long fsize; - char ch; + int ch; /* We have at least 2 arguments. */ if (argc < 3) { From nobody Thu Sep 14 08:57:08 2023 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 4RmWR86TWMz4t042; Thu, 14 Sep 2023 08:57: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 4RmWR85rf4z4Sbr; Thu, 14 Sep 2023 08:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681828; 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=r2JqYbgPex14LxNytHP2t/eGYwFe8n5IzAlCO1RBi/0=; b=q4tMAyVZWuwGB+k+uzSCkKX7/b+UuT8eziF4JEjzKfMLCik5+SLxEHoJn2dT28F96QpV9h BX/NPjlwarbHlduPfX0XFXfGEJ4Z5KPgR1ifHu/7dMjHA8aLufaKpKNWupSoIPE27ps/Or 4zLOoe4toM+BtoFdMJYBroJpXSXZJY6PY15TklC+gHKg9WOsG1WXGXhOU47YBH+kv44dbk jN41z3U7ejOm2FfHzXXwWlV2I8up6ZsnOlp3FjRPa5XNnwgCPdYalUqZD2842yqdz85f0g 3WI8iMHx6Bcvvc+6Kn5cwyZ713NcxEWIqo3TflkEgbRV90KGel3aRhiah4UYkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681828; a=rsa-sha256; cv=none; b=BIIMm41fDigApXzSNE1HG/jnmait7u6HZbyssmdJXOaXqt5sLVNapnwEo2qu3pw6GEr8iT 2cXOMWE7AUYHYVq+1oy0UBpChsAPeMRZKGukPASDyRF2pFhMqqBT2tZJ4Elgz/Mvpvso2G yyBOMJ+CQZMUsGzfj7a28POzgLXaAuEuW018TjXrrBddXv+4GbmIaSxAbqhotaqHnrNwXS jw/rEupjb4/PNrZXAutWfDKohuB0w88cYOw+m9WpSa0qFFnUcMVnpWchWKqIchJU0i/OcV 1oHamaZqCpvvlbZUPjiM2NkLztAHdJf0pWRHSgJohqBiPBT1z55snsbQlcAqcw== 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=1694681828; 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=r2JqYbgPex14LxNytHP2t/eGYwFe8n5IzAlCO1RBi/0=; b=la4Pm2Db4StFyT978q3Mqb7HjzRre3vfzYIAtdYpxm6Q2HJ8d8V7v9uawC361q6ws3iX8v w/gzgfY8liXU94Lq5bf4L+WM3Gq1M6IKNgGS20rgKFq0Itztj6C0dDL5Ha84+LgoiaVVyt pjRuik1k3JeHpNwAFEKdZS8HCBu4FKOlBZ53oawfQ6fO4XhU9bOsahgOpH4h2sS5RdL8RN YuduUCH0Q5ObmLNylU4HYWhL8qLI5kqLPGQVwkGyyWv/2ewLZVZyu7irp8evlw06b4oP5c YZqQfrQR9AwHrCbDfIWRrtqnrZjPPawLt7C5YSFF1Fi0mm6GOAPVYIc/e+7IWA== 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 4RmWR84vH0zqg8; Thu, 14 Sep 2023 08:57:08 +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 38E8v8iQ076660; Thu, 14 Sep 2023 08:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v82N076657; Thu, 14 Sep 2023 08:57:08 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:08 GMT Message-Id: <202309140857.38E8v82N076657@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: c1335a776b0f - stable/14 - libc: Don't assume signed char. 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: c1335a776b0ff33a715bdaa2be59412006cb4053 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c1335a776b0ff33a715bdaa2be59412006cb4053 commit c1335a776b0ff33a715bdaa2be59412006cb4053 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-11 13:18:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 libc: Don't assume signed char. MFC after: 3 days Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D41814 (cherry picked from commit 88a9b6e1ed82b562f52bae26b3de257495cd1983) --- lib/libc/tests/stdio/snprintf_test.c | 4 ++-- lib/libc/tests/stdio/swprintf_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 323356b37a7d..29b908b65120 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -131,8 +131,8 @@ ATF_TC_WITHOUT_HEAD(snprintf_wN); ATF_TC_BODY(snprintf_wN, tc) { SNPRINTF_TEST("0", "%w8d", (int8_t)0); - SNPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SNPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SNPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SNPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SNPRINTF_TEST("0", "%w8u", (uint8_t)0); SNPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index f5dde349412b..f00ecc7f1c1d 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -132,8 +132,8 @@ ATF_TC_WITHOUT_HEAD(swprintf_wN); ATF_TC_BODY(swprintf_wN, tc) { SWPRINTF_TEST("0", "%w8d", (int8_t)0); - SWPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SWPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SWPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SWPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SWPRINTF_TEST("0", "%w8u", (uint8_t)0); SWPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); From nobody Thu Sep 14 08:57:09 2023 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 4RmWRB0FqLz4t01J; Thu, 14 Sep 2023 08:57: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 4RmWR96ZVhz4Shn; Thu, 14 Sep 2023 08:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681829; 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=ptIKD6KtKjcs9NyQsg1Wc0U7vBY1DNOHS8tOwXcKl8E=; b=TSMASGt4IZJ6bmL3RFtt9hjWqnkhwkwN01u+X6/9YdPLbf0oeS+JWBHOKnCgA1fopQEzmF 9A8WbYzb5ozeE2cPLrPiCOkeU0VPJGCWmNDp64yyJeNXgPNlSlhSO9OKir5p2zwuXqGjBY 8XDPksQYBPMZotBHYNpRYfi1BAfHyZnB3hvdPytE6fCv/MurirP4dw2xh4cllQDXIxRNP3 H3BuJno2upANbCrvaRFhcJvxMtZSIf71CADdFT5LgxYs//eX0Lqi6jEpisvpqgOCsuo5OE AuxPBg3giCj9qrQMiWEf5PVP40wx70/gkrQyXTeff6iJuKQ2YA3TXVNS009M8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681829; a=rsa-sha256; cv=none; b=EA0pbQ64VPRolXXilnvNlwp/qB+9vIXo1C974NqdVGsVFL8fSJdcGIXz6v/fvrHzkZ7LVW BGYmA+OR2AZtP9crTOVQ+CnItUyz4/6/LLu9wusipMhtbvKVhiTpA23IVOP0M6yg5hYBHu wBYUbALqw3FHt9bBQN2QAzusBsarZdbre0bByRxZKvlDe6VT1CBiS0P983NMjXj4kEnyg4 65YqiMPDpoH5SgCiY/zfYUV+ZvBU75KZRNfmiZrjWBGtyA5xpe695/wSLAl8EOXxCii8sK orfsCTo9G8PsIU6ODkV9hzX09alznkARmzZk1FmPbM5jwAlxmGQSSyKW4YGsKg== 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=1694681829; 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=ptIKD6KtKjcs9NyQsg1Wc0U7vBY1DNOHS8tOwXcKl8E=; b=ggoAVqfrvyIOZEr3wMSDYXHkDLjoMsZnjiPM06Q7GfJEDSXcQ21zSoC3Nn2bPjtC4tOTkI EnfodXSuNev8IaCJDPDzpy0JpVsvN69zTPGJmph8tNsV67lnWyh79Hfzat29oRT3w79TOD K0BE7/TyqHuG0eNza359fhoJSl3xdGQdPSebGxr1/Uf5rZxI58Qc3vwaDEQNJSUl2h7Xzp +7uqlw5YjaZXIAyN4+d9KAcYAlVh6026+tYB2Yg9tgbf8vAdam3TW5IilUs9d7rxGoQ1dC D29OKSYnFgQV2iCIVIZFdYW39ZdbEKOUechMyFIggVTC9L5cBgEj2AYQ2gDKLA== 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 4RmWR95gBXzqsD; Thu, 14 Sep 2023 08:57: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 38E8v9pS076714; Thu, 14 Sep 2023 08:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8v970076711; Thu, 14 Sep 2023 08:57:09 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:09 GMT Message-Id: <202309140857.38E8v970076711@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: 2e38377fcda2 - stable/14 - Belatedly document OPIE removal in RELNOTES and UPDATING. 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: 2e38377fcda2eebb2f76f7f82352643a050d736e Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2e38377fcda2eebb2f76f7f82352643a050d736e commit 2e38377fcda2eebb2f76f7f82352643a050d736e Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 11:43:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 Belatedly document OPIE removal in RELNOTES and UPDATING. MFC after: 3 days Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41822 (cherry picked from commit d2c839eee0d5410095f5984d2126f41f4cf62a00) --- RELNOTES | 7 +++++++ UPDATING | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/RELNOTES b/RELNOTES index 0ff123618e14..f3d717525929 100644 --- a/RELNOTES +++ b/RELNOTES @@ -148,6 +148,13 @@ f0bc4ed144fc: instructions may be probed instead of logical entry and return instructions. The provider is currently amd64-only. +0aa2700123e2: + OPIE has been removed from the base system. If you still wish + to use it, install the security/opie port. Otherwise, make + sure to remove or comment out any mention of pam_opie and + pam_opieaccess from your PAM policies (etcupdate will normally + take care of this for the stock policies). + 0eea46fb1f83: Removed telnetd. diff --git a/UPDATING b/UPDATING index ee096e9a6fa6..fe80f259cb12 100644 --- a/UPDATING +++ b/UPDATING @@ -182,6 +182,12 @@ and/or ports. after upgrading to restore all the component that were previously installed. +20221002: + OPIE has been removed from the base system. If needed, it can + be installed from ports (security/opie) or packages (opie). + Otherwise, make sure that your PAM policies do not reference + pam_opie or pam_opieaccess. + 20220610: LinuxKPI pm.h changes require an update to the latest drm-kmod version before re-compiling to avoid errors. From nobody Thu Sep 14 08:57:10 2023 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 4RmWRC2J80z4t01P; Thu, 14 Sep 2023 08:57: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 4RmWRC0dtNz4SwM; Thu, 14 Sep 2023 08:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681831; 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=BiAONLoSJIWJmqlowaKU4ezwYJnI56rtOCP4HJQwU40=; b=S5+0ejgPTmMu9IDRDKGTar3KsDxbtYtY95CbUrBkur6uyBQ8HJeOlvs0F0XF2Aq1+zOw1S W6qUhLU6YygtW9PUdDEpsaD/d8/hZaGbOmBGL96dGUSwK8SryKW1Ebn4JtVv+k9co3NeYG Bj4ZG/vWf0ujH4qMmTNDLmp4aSYtUsJ8krmMP+rCvZOj4piImmnWqXjP4wFYWm6Ce66qKo j9iCNoUESVsK3+hA8fa3s0XM9C4oyGDiCQi4ez2+5ubMJRLQFBUc5Fscj5AM9sgxinLCxZ FPJZMdvNMnwBuVkcYsRtqh+58d68KZGgyoBYya2mzc7VA50SIWc2p9mufDX8/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681831; a=rsa-sha256; cv=none; b=mqm1gSLZwlTChLxxFg5UMI3VxpGvL5ElRWP2gSKng+FpdwqGox1Rdi8IyNE3/xU2yEnZyi H4cEnwfQLb80ct85W9Dnf5aR45oipTj/iIsJWRJV5itrD7Z7LzJOX7L9abXCCEUQR7ZJmZ Oi/9CRqiw9mBSn6UfdykVu1atA7MJ6cVnmJDbi5apvdy2IHCwIDk20TmHXhG3nmQ58Jere OlSh+dCbNzqADdN6a31AXa7H0hpKxHRsIOXkvA4BLh1ehJdIBDsDK5bpbIrfBNecOjlZTW 8pakLxe7sZHmEGFpnn6mCuJBUjR56eKSwpLfAof8PBfW6ivpw2G+arDD5vQ2xw== 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=1694681831; 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=BiAONLoSJIWJmqlowaKU4ezwYJnI56rtOCP4HJQwU40=; b=iTlHz1psRYKImHLsbyvWQqhcistBTz9x30zu2VEIQciFRgJc0Q4j/TO4CZFtl0zCRGZVCX pynv9RehiEDtHnktl8r0u5/4VEZN6TKMbWxjkjLODGa8qGK05hrPmYGqkM1DkkOPBzd3gL htlrxum5SOGfo6eCRw7Mn5MpAMx4PGqysF0TNQ8791nTjfVoI4BiVqWQchy8ymjAMOxN0r 09ve5sZVKYEdIRzIMRxDvRGk2YmUI3J56W205kGsSDvIcOQCN/c6EynZFAWTQySnFpNnbo /ElhULfhVbfLX0pLnuYxQtfA0wIExc4IOyrp59muW7UsvzUBh/aLvJtDNN3ILA== 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 4RmWRB6sdmzr7d; Thu, 14 Sep 2023 08:57: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 38E8vAk9076778; Thu, 14 Sep 2023 08:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8vAMZ076775; Thu, 14 Sep 2023 08:57:10 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:10 GMT Message-Id: <202309140857.38E8vAMZ076775@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: f92a598782c2 - stable/14 - newvers.sh: Avoid picking up stray envars. 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: f92a598782c2f671559a919f353b1505f6fe09ca Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f92a598782c2f671559a919f353b1505f6fe09ca commit f92a598782c2f671559a919f353b1505f6fe09ca Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 newvers.sh: Avoid picking up stray envars. 89f361f742ae added a mechanism to allow arbitrary overrides from the command line. Unfortunately, it also had the (likely unintended) effect of allowing RELEASE and VERSION to be passed in from the environment, and Makefile.inc1 happens to define VERSION for the benefit of pkgbase. To restore the status quo, unset RELEASE and VERSION at the top of the script. Fixes: 89f361f742ae MFC after: 3 days Reviewed by: gallatin, sjg, emaste Differential Revision: https://reviews.freebsd.org/D41845 (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3) --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d9bccdfdf191..bb6f3349d87b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="STABLE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/.. From nobody Thu Sep 14 08:57:12 2023 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 4RmWRF1YtCz4t06D; Thu, 14 Sep 2023 08:57: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 4RmWRF0ywCz4T0Y; Thu, 14 Sep 2023 08:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681833; 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=YhhCmEFUz0qfmn0QxtYnDiDbafvaAp+U9bSLsLMiEFM=; b=EHuR6SqClkaLXX5LcLAaUdpto/bRiO/IPnGbgDFRG3lD8hhUWvbtTAW34BcGaDxPM7xYq+ Vs5BJL0U5cMSMdAWybSLvcpOzUwooshKcYPnATZSGVKDrQUTJILPnBCfwghFBswK6I1gVm xGxUFyk0c5dMEoPMSwpN/upVfWwekXRolKg2cI56FKWuovFvafzXhyc6NrUOd/jjcvqdG4 4vPrIOZ9dYU5NVMX5rzove/fAsQIcipyyMKrSsRn1x9jZsfa/3fop8GCIjv+hSYSSSEbSf txeI9quTPI/pDGaNb9UlOG1JPO0c9zpuRRTg9+O5rqN9CxBuYPMfYuhiflwHeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681833; a=rsa-sha256; cv=none; b=PqfWZgeYTRo+Alg7ziP7/MhMMfPBGeprHJufZDETnXQEz4e7VGqhvNTUVmA+D03H/tWoNw 56MqB+1ynXuBqXACBYC2Tb4F6iu8F+9eEzahmbzcUE7VqA2ap8wXp0NydJf3Lga0B7kXyT i0GIb2lqKec1/8Xaw/fb33aFHkAUC/uWUADn9N93wS+cM6TAyz29gZL/zG5aSqNyWyK5wh Fbfz1/vk8DztdBxn4OQeD1zuEmxLp1/NZNjR1LVHywxvRBhbcV2lc9ZQqhSiM5qMW1hDOk WL33qHZtN6ijztIt02UyGCxDmJSoF5Mm7szOgZnhFU0/aKHhj+27NhA4lv4i5g== 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=1694681833; 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=YhhCmEFUz0qfmn0QxtYnDiDbafvaAp+U9bSLsLMiEFM=; b=caSFjHjRAPW/+ohKWFOoETqfLrtj0HtEhyhgLQEsruJINjhTrnhfSWhLa5NSiuEMVuZlX3 0Kkit2RKHjOkxy9W9oPvwkZ8pKahEZYzfCivMLTJxzuC+vP3Xhnw2K9dea+Oc44ZT3o80+ bpoaJmJS9fDtrWQxLESNliqX5iz80D74WBoxlY/8kk9XNPbSrkStPQ2OGemZNSgeqolmpp phO3xf37w4BVfYWXk7YF4EAtGr0lNpq+tZlkID6zH+q2JKAoVYIiRIk+sY4mD+Jqc/gQIY SOmZ+TlhV2fnPo/C1tzMGjIc7U7aIf7T3DOTBNkCL6DF5rlnLBZTyD9cMwwdVQ== 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 4RmWRF04fKzr0g; Thu, 14 Sep 2023 08:57: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 38E8vCYs076927; Thu, 14 Sep 2023 08:57:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8vCAJ076924; Thu, 14 Sep 2023 08:57:12 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:12 GMT Message-Id: <202309140857.38E8vCAJ076924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f08b43610ea1 - releng/14.0 - pfsync: fix state leak 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f08b43610ea1e7804fc5ddb1bd5f3c2b1fce18c3 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f08b43610ea1e7804fc5ddb1bd5f3c2b1fce18c3 commit f08b43610ea1e7804fc5ddb1bd5f3c2b1fce18c3 Author: Kristof Provost AuthorDate: 2023-09-08 09:21:12 +0000 Commit: Kristof Provost CommitDate: 2023-09-14 08:56:49 +0000 pfsync: fix state leak If we receive a state with a route-to interface name set and we can't find the interface we do not insert the state. However, in that case we must still clean up the state (and state keys). Do so, so we do not leak states. Approved by: re (delphij) Reviewed by: Kajetan Staszkiewicz MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41779 (cherry picked from commit f415a5c1bd56933367e42312731e4ec553e256ed) (cherry picked from commit 1bd8fa1dd0ba562c6b60fe1a316cfcca637d14d6) --- sys/netpfil/pf/if_pfsync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index db448c9bbc48..e29c00fcb879 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -685,8 +685,10 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) printf("%s: unknown route interface: %s\n", __func__, sp->pfs_1400.rt_ifname); if (flags & PFSYNC_SI_IOCTL) - return (EINVAL); - return (0); /* skip this state */ + error = EINVAL; + else + error = 0; + goto cleanup_keys; } break; default: @@ -734,6 +736,7 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) cleanup: error = ENOMEM; +cleanup_keys: if (skw == sks) sks = NULL; uma_zfree(V_pf_state_key_z, skw); From nobody Thu Sep 14 09:49:12 2023 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 4RmXbD45wXz4tGQd; Thu, 14 Sep 2023 09:49: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 4RmXbD3gCxz4hLc; Thu, 14 Sep 2023 09:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694684952; 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=VW1wXhi7hzbyYVbxzfW79nfYNPd4WoVte6PTThqzb4g=; b=Sa5HklFesAxDKxb2bOS+vvh5UbWSXU2s+mmSjDNinQGw4dqPkYVu54rEdvjXa5gCfKbJCo HuWwOejPHRQSpXkHCUb9Lka2J5Ef4EHKVYKrcMg7bEEHYheL+n83OhuuXbOGypZPSu9aH/ mMcNLxlR8PgfFKUC8yxhmkIwzoOlUat4sVBde6+LplVuJpbrAVcKIHuJvUzkAKaCApCtwq TDrU0rQCfF5VvQbv++gJ49gPQQ0vFyBbYRyzDxLiDjQA4q/+MFI/15tSYGKdpGXrnEGNQ8 kNbfBQehCXzCJ8JcY1YeCo5pXOeuqrvBAg4LHlE+smj6yeqyQFtnYxgm8gLrqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694684952; a=rsa-sha256; cv=none; b=MeRAhe02h9/tfQYtSqwE6Uhh9L7OiGDDxaqbxq87blBXhpTJJw71kdccHBY1vdSwu+HbwH 0HA1SAmhdp4egooi4T97mZYwIsfyR56obZVcemSEbQ812Zn/4kDv5JGBgHCJdGZzgKNa23 sUiwWXHl8WSuCqegedb43EzgBRkgguKl5eh/AhssCVJzxxcBG4UBH1Q0LE5noow8KXWKK+ lZDYgk3MPflXFq55N/zdXEV23snuv+T1nhdOh+yTOH+nwvl1NEDdoAF+nlunM5206LW2Ut 4HVv2lj4MLNVq6TWET+ZvBMTi3a/3EVoib5lzog28yDa3QwtW28AHZPeGIqgrg== 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=1694684952; 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=VW1wXhi7hzbyYVbxzfW79nfYNPd4WoVte6PTThqzb4g=; b=AC1usfwAI3CKgFIplit65z3jlNMiSoOtM5RDF3CIYIGEfdnWUAf+W6D4qdyzQd01enSu1q xuiKdgoRwkBEvlj3ems0+MWedgvxCAJ/A+UdBWW8gcOU5jW5N88WpAy90WINCX5yM79FfZ HOmpRb4O9LqibGp1oXhBLq0b24abXQCLMxkd92cRiBMTXZcnHhg2AnYTIq3gmNRBmAZKIH EgVMFXBb78yiuZAj95HqQQFtJWE1AGVqd+HGuWqrdt3w76FSws+4IHrA8MEKqJffD7qpLv kCNjrqXIAD8JW9oT6dnHo0MzxlWcf3LYw368cwVlNbgnnajXGB9NsF/iDCuKtg== 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 4RmXbD2l37zs9W; Thu, 14 Sep 2023 09:49: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 38E9nC6e061217; Thu, 14 Sep 2023 09:49:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E9nCkJ061214; Thu, 14 Sep 2023 09:49:12 GMT (envelope-from git) Date: Thu, 14 Sep 2023 09:49:12 GMT Message-Id: <202309140949.38E9nCkJ061214@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: 0e383bb3cd18 - stable/13 - ftpd: add deprecation notice 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: 0e383bb3cd1856515c4b67cbced76952280b4fb2 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e383bb3cd1856515c4b67cbced76952280b4fb2 commit 0e383bb3cd1856515c4b67cbced76952280b4fb2 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-14 09:48:24 +0000 ftpd: add deprecation notice Approved by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) (cherry picked from commit cc9347cc79d320cac00ccf5d5f23971de2c887a1) (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) (cherry picked from commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229) --- libexec/ftpd/ftpd.8 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index 7fec5aaea6d9..1c4424825833 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -43,6 +43,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Thu Sep 14 09:58:17 2023 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 4RmXnk235Mz4tK73; Thu, 14 Sep 2023 09:58: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 4RmXnk1VtXz4jq6; Thu, 14 Sep 2023 09:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694685498; 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=2nCMi+OO860MOmfLvbA8wp9n+2VSwx0fTZPzKZCpx5Y=; b=SqGluY0wzz0B+3i06mWX/m3KGIJ5DcEVB7X7fgIE/nin5Jt2fodf3lPlb1wPOWIExWyKE0 dWziqva/QaYx89BUoUpF9NCITT+57bIcxn+g/Z6etbuUpcnkJvUyJFDIcVzD7jWuXrj4ks 6mIcdCUp1DKo0YRMrR7xW/Vvnq+h8AtrvjNO1f2vGyzuuUMyD4GQ9yUiKJ1lw2ec1oCRri vFrYOO7oAXQGenXuuqF2hWya41WcoIP5qhpepe8XXBe0gdoEWANR3il7x738/KZ0zbJB3+ wKIt0A8FN6AT4Xs6gQ4Mzr9SCCe5QJCKkO/lzQRiqRf94NBn3qssQZnMPM8/TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694685498; a=rsa-sha256; cv=none; b=cMiJYy/AFK2qnkuRWP+vN5uDSJN+Gyt3xGGbVgtmroStYIFKXz6MqVoskOEZXhsVWdfrDr HqVekuti170G6Wj7ZmpmOUSO0UJ9GRLz4Uas4fFreCODYkva3965RxcdU5pQ7PYF0Eweg9 GRptH8T6SFGbQKLUvqUkvQbKK7dwAGr2OAizXFRmHZdpGeRX8a8IYbl4rRn6lY8//hZndB cuEjLmIBQ+//a59hDUlfkbKO6mHfaZP27XaoiRKx6qCeoDPiqyK311cGntqxjHp1nfyxpX X9IePXS3NCCaKygb60c1IRqhbHqFH2QNsa2hLKnGuc8M9QAYw8/Yi8HdTbmhMg== 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=1694685498; 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=2nCMi+OO860MOmfLvbA8wp9n+2VSwx0fTZPzKZCpx5Y=; b=QiF65riHYPiBOrcnTfMtOVetNV1J74VCNZ4LDi+3O8xEMX1krel13MOlSXYdR494XxQX7W yMnqu7zH3AdZcY2sqwtAS7AN376TkBY+kFpYSrzae5vnrMVuaaRHO4XtcDOJaDMZnALxXY CFHLJtAcuQtxek76bVoYqs74veOpcuvO9wpsLGDOk+MCx2dxQGxAk/PK/1x0O6ZEXnbYsl C0hJnV25FEV2XzrSeLntl7s/wtm+RsYSBXHN2GMTwmPb9rsbGeGhcyW0bJzOwHq/coXVzz JVDKv07fkVtwF0pMB8FnvaDEpzS0Ky6OKPs0Kg5n00Oatwx48QpHuOASFdmIjQ== 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 4RmXnk0ZNczsLV; Thu, 14 Sep 2023 09:58: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 38E9wHBC077041; Thu, 14 Sep 2023 09:58:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E9wHmg077038; Thu, 14 Sep 2023 09:58:17 GMT (envelope-from git) Date: Thu, 14 Sep 2023 09:58:17 GMT Message-Id: <202309140958.38E9wHmg077038@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: 4214f6cbb467 - stable/12 - ftpd: add deprecation notice 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/12 X-Git-Reftype: branch X-Git-Commit: 4214f6cbb467cb5a81ba9fa9ec9df0b992ecb913 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4214f6cbb467cb5a81ba9fa9ec9df0b992ecb913 commit 4214f6cbb467cb5a81ba9fa9ec9df0b992ecb913 Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-14 09:57:57 +0000 ftpd: add deprecation notice Approved by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 (cherry picked from commit 98b98ec1bc7e961c3d3468b0e481080580c902cf) (cherry picked from commit cc9347cc79d320cac00ccf5d5f23971de2c887a1) (cherry picked from commit 01d82151022cb1383e83c331708a787f1907b00f) (cherry picked from commit 3ea83e94cdfa34745641dfa5f43debfdcd79e229) (cherry picked from commit 0e383bb3cd1856515c4b67cbced76952280b4fb2) --- libexec/ftpd/ftpd.8 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index 868acac61699..f9651a4987d6 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -28,7 +28,7 @@ .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd June 28, 2022 +.Dd September 9, 2023 .Dt FTPD 8 .Os .Sh NAME @@ -44,6 +44,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Thu Sep 14 10:34:10 2023 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 4RmYb63BVlz4sWmb; Thu, 14 Sep 2023 10:34: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 4RmYb62hfzz4s3C; Thu, 14 Sep 2023 10:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694687650; 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=GTigjqPH6iW6NaJZIZ5Q7qbj8ZZvHJbic9TMPEqiqKU=; b=bWctJ6SxXM13ek+9tHqrlVZjzoTrpXQgo1HoFY65vh0oavneF1FROFg3D+g9X1g0SnPClg 2Of7xsrN9qdhWIW4WF79RypeEc8Q9K2cxieA98TtMWjrzuO1qcIw7UvUy6Ari5gKi8hRks JO+dyeCkJ/EeF2mzD/lO9RSsPS8GT9fs65dur03t9dFaC8/gRaydbqKXmjUuX4GGtSPQw7 1kynwXKvvCxguvatHVo4gyKDYGmnhvl40oE4OeJ+27Ojy7T0mK1cBv67ajWB3VTmy/VCgf pN4wqd4gI4PBvvxXWfzWarbuiuYrkjV9SZKBJUhKHykNA0Sl38l8qUZbIjgHqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694687650; a=rsa-sha256; cv=none; b=coE+bg2z+PdJc9rFrb7P73nUWyhQVYlB/iNRoITwvHNeqhcHP5dXjhEKQN04vmWTu0CA2Y 8AJ8s0SKoEmXZkbNkCfBExzosw/4xq34llE4ApuDU5unC9MZRekppn65+vQwG3D9XVYUf/ +JET3AfmCiEEd6T3Jj/ofZh0P+TIPw37NEbLr3eQ+YeQ+9cbHTkuNSI5H1+4bdMylUb43N hX72c2WCm8XaKOQp6M6cGFRGYQaQd7j87D/ugniPDZTw+9jdELMd9BKytZ+8JOmbUkgqdi X+7dXLSCzKMAD3jd++OmmnNSLdfK8XBU91q7yrA4Yvt36F+plT9goq0mhKFPLQ== 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=1694687650; 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=GTigjqPH6iW6NaJZIZ5Q7qbj8ZZvHJbic9TMPEqiqKU=; b=xevPJAALlvcTxEtLyS/lytpxl7Virj9V7tkqPNWadT93gCYFP5POVz/Wg/TprYZU0xkOMF pyAxGn+HPFaw87vD/NvGn3qmdHuc1U2EfTNLolDzVk5NICXZ86r05Jjhqn8Ogh11ELuzKd paCc7FWnOCQZvP9VuTlLiDsf3hsjj6ztHYxHY/nosGyjqDsju5A8aoiMnt7y+fCW2OqnG1 nuVNFTqLn9HzNpKRCDDXcpz75C0dC2GCyzhO+FERz3o8sZBIx5spXDtQPkUi9xzcBg8MgG v0vgfTr4YW+NIHfKoL/WXx6aZXH2X6tyxABYUO/OS2d3RHOzYp6Cdp1Ci0RBbA== 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 4RmYb61pmvztPG; Thu, 14 Sep 2023 10:34: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 38EAYAmB043620; Thu, 14 Sep 2023 10:34:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EAYAtS043617; Thu, 14 Sep 2023 10:34:10 GMT (envelope-from git) Date: Thu, 14 Sep 2023 10:34:10 GMT Message-Id: <202309141034.38EAYAtS043617@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: 027418a4d8bd - stable/13 - blackhole(4): disable for locally originated TCP/UDP packets 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: 027418a4d8bdf58b606fab7505bcb841cc3a6d7c Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=027418a4d8bdf58b606fab7505bcb841cc3a6d7c commit 027418a4d8bdf58b606fab7505bcb841cc3a6d7c Author: Gleb Smirnoff AuthorDate: 2021-10-28 15:11:45 +0000 Commit: Ed Maste CommitDate: 2023-09-14 09:54:04 +0000 blackhole(4): disable for locally originated TCP/UDP packets In most cases blackholing for locally originated packets is undesired, leads to different kind of lags and delays. Provide sysctls to enforce it, e.g. for debugging purposes. Reviewed by: rrs Differential revision: https://reviews.freebsd.org/D32718 (cherry picked from commit 3ea9a7cf7b09a355cde3a76824809402b99d0892) (cherry picked from commit ad3ad06477d013371b95af673a9776c62f49a97f) --- share/man/man4/blackhole.4 | 12 +++++++++++- sys/netinet/tcp_input.c | 19 +++++++++++++++++-- sys/netinet/udp_usrreq.c | 7 ++++++- sys/netinet/udp_var.h | 2 ++ sys/netinet6/udp6_usrreq.c | 3 ++- 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/share/man/man4/blackhole.4 b/share/man/man4/blackhole.4 index f7256146eaef..00c8e3d7a2b6 100644 --- a/share/man/man4/blackhole.4 +++ b/share/man/man4/blackhole.4 @@ -10,7 +10,7 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" -.Dd September 6, 2015 +.Dd November 3, 2021 .Dt BLACKHOLE 4 .Os .Sh NAME @@ -22,7 +22,9 @@ attempts .Sh SYNOPSIS .Cd sysctl net.inet.sctp.blackhole Ns Op = Ns Brq "0 | 1 | 2" .Cd sysctl net.inet.tcp.blackhole Ns Op = Ns Brq "0 | 1 | 2" +.Cd sysctl net.inet.tcp.blackhole_local Ns Op = Ns Brq "0 | 1" .Cd sysctl net.inet.udp.blackhole Ns Op = Ns Brq "0 | 1" +.Cd sysctl net.inet.udp.blackhole_local Ns Op = Ns Brq "0 | 1" .Sh DESCRIPTION The .Nm @@ -33,6 +35,14 @@ are received on SCTP, TCP, or UDP ports where there is no socket listening. The blackhole behaviour is useful to slow down an attacker who is port-scanning a system in an attempt to detect vulnerable services. It might also slow down an attempted denial of service attack. +.Pp +The blackhole behaviour is disabled by default. +If enabled, the locally originated packets would still be responded to, +unless also +.Va net.inet.tcp.blackhole_local +(for TCP) and/or +.Va net.inet.udp.blackhole_local +(for UDP) are enforced. .Ss SCTP Setting the SCTP blackhole MIB to a numeric value of one will prevent sending an ABORT packet in response to an incoming INIT. diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b57c4e667371..d3145881ecf9 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -142,6 +142,12 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, blackhole, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(blackhole), 0, "Do not send RST on segments to closed ports"); +VNET_DEFINE(bool, blackhole_local) = false; +#define V_blackhole_local VNET(blackhole_local) +SYSCTL_BOOL(_net_inet_tcp, OID_AUTO, blackhole_local, CTLFLAG_VNET | + CTLFLAG_RW, &VNET_NAME(blackhole_local), false, + "Enforce net.inet.tcp.blackhole for locally originated packets"); + VNET_DEFINE(int, tcp_delack_enabled) = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, delayed_ack, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_delack_enabled), 0, @@ -949,8 +955,17 @@ findpcb: * When blackholing do not respond with a RST but * completely ignore the segment and drop it. */ - if ((V_blackhole == 1 && (thflags & TH_SYN)) || - V_blackhole == 2) + if (((V_blackhole == 1 && (thflags & TH_SYN)) || + V_blackhole == 2) && (V_blackhole_local || ( +#ifdef INET6 + isipv6 ? !in6_localaddr(&ip6->ip6_src) : +#endif +#ifdef INET + !in_localip(ip->ip_src) +#else + true +#endif + ))) goto dropunlock; rstreason = BANDLIM_RST_CLOSEDPORT; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 9ec671f9fbdd..a476b0d8251a 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -125,6 +125,10 @@ VNET_DEFINE(int, udp_blackhole) = 0; SYSCTL_INT(_net_inet_udp, OID_AUTO, blackhole, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(udp_blackhole), 0, "Do not send port unreachables for refused connects"); +VNET_DEFINE(bool, udp_blackhole_local) = false; +SYSCTL_BOOL(_net_inet_udp, OID_AUTO, blackhole_local, CTLFLAG_VNET | + CTLFLAG_RW, &VNET_NAME(udp_blackhole_local), false, + "Enforce net.inet.udp.blackhole for locally originated packets"); u_long udp_sendspace = 9216; /* really max datagram size */ SYSCTL_ULONG(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram, CTLFLAG_RW, @@ -708,7 +712,8 @@ udp_input(struct mbuf **mp, int *offp, int proto) UDPSTAT_INC(udps_noportbcast); goto badunlocked; } - if (V_udp_blackhole) + if (V_udp_blackhole && (V_udp_blackhole_local || + !in_localip(ip->ip_src))) goto badunlocked; if (badport_bandlim(BANDLIM_ICMP_UNREACH) < 0) goto badunlocked; diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 39f39c3d77ee..99388acbc3b7 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -148,9 +148,11 @@ extern u_long udp_sendspace; extern u_long udp_recvspace; VNET_DECLARE(int, udp_cksum); VNET_DECLARE(int, udp_blackhole); +VNET_DECLARE(bool, udp_blackhole_local); VNET_DECLARE(int, udp_log_in_vain); #define V_udp_cksum VNET(udp_cksum) #define V_udp_blackhole VNET(udp_blackhole) +#define V_udp_blackhole_local VNET(udp_blackhole_local) #define V_udp_log_in_vain VNET(udp_log_in_vain) VNET_DECLARE(int, zero_checksum_port); diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 4c5651f10a58..726c79c97de6 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -509,7 +509,8 @@ skip_checksum: UDPSTAT_INC(udps_noportmcast); goto badunlocked; } - if (V_udp_blackhole) + if (V_udp_blackhole && (V_udp_blackhole_local || + !in6_localaddr(&ip6->ip6_src))) goto badunlocked; icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); *mp = NULL; From nobody Thu Sep 14 11:54:45 2023 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 4RmbN56gp7z4t09s; Thu, 14 Sep 2023 11:54:45 +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 4RmbN55wQDz3PZZ; Thu, 14 Sep 2023 11:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694692485; 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=GE1vX8nQDA+Omw3yccRTQBEy0vGuC5OqHxqae63mPbQ=; b=I+A1Ns6VL3FfJcLH3kRj198RZIn9C19FvUQF1Ckn8T0vJ6NsqHwfevdUYyGtDIhZKaXkVO XCuLzStkMe+VtYyyrCseGE/b1TCXJzH+zqtKJEI/nkY+Xu3MPxVLypta460MB7ZcmS7J0e AHF+bE1KtC2PcBMYI3pB/sgFB2OszAdfRDuzKhTPMTWesZMqXLLJ+iraoZy51ue5OF74uU nL15fE1BCAH4BH6nBEMjKV5DTZzK2lZdLvAS4fe87YjojTkIzjQ9OHQRE6yK1Eq11MUcOL WDQnYsJF+NAO5iNayhJFzAOfMjJsji/VQHw2PkWwu8/hAulQRQ5Pf9cEhAGDEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694692485; a=rsa-sha256; cv=none; b=RIfil2Bg4OfPksd0Y16n7yTSfAJ3fHl6qNHxsaPvdbBQzWJSj80zQTGTohtTSmHZED+McS oLfqQ/zmWvcIVajrckieDlqgU/dAIDKwjXzcxvvu7CXXRq3JD6hnDNNpqeAWWpAUUSBXXM riECdqf7laB9f2/AltX/WKhiryNrFYGPrqYpbNC1A0t/PK2Ukdh+dYlm2VlvACcfLlGDm0 GOlzGhwgwMZmMLA5Y0Tt6yPcWAcf4dvgJmKcmYwbSpfZVnsjHvW3VHLmWuVDiwTmfgY9gL LRS/AR2gvx/NonTotKWKMLXAx7I/afcTEbNarVwLodzbIeWuMsKDb6tu4mSfvQ== 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=1694692485; 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=GE1vX8nQDA+Omw3yccRTQBEy0vGuC5OqHxqae63mPbQ=; b=q8GGq9Fms9nbM07adltSTKgplW+Wnz+PPeDzb+VvnfUh15sS9m5/b/mSSwxumLYxxWViu6 z/KXzOlhaQqgt/2ZbeXnTgNgBv5KGVX0Fjy/frdEO1RzlO1LWqRDCdn5+iBTmBdCtP29kL MmoVIXdGL3S/dLxqXe43sYDSSN+jG19xs4OaAbcYm5j/9f5EOPPCikkJjan80zlmNoCkOH K9I/vCyT37t97/5FyKe7N0VmaZKi/wtnmI/ilPjejgx1o5lbRP902HHUoeK1yctGm1UIYW bCZJm3r+x1wT2jrtU/xj8WYX1YcFEpEZFr88Zge09+xk+Dx8IPhcscTesyhmhw== 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 4RmbN54w5tzwFP; Thu, 14 Sep 2023 11:54:45 +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 38EBsjAP078066; Thu, 14 Sep 2023 11:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EBsjVt078063; Thu, 14 Sep 2023 11:54:45 GMT (envelope-from git) Date: Thu, 14 Sep 2023 11:54:45 GMT Message-Id: <202309141154.38EBsjVt078063@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: 361edbdc89bf - stable/14 - MFC: unbreak BEGEMOT-LM75-MIB.txt 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: 361edbdc89bf031955c901ca5b317eeefbc0f633 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=361edbdc89bf031955c901ca5b317eeefbc0f633 commit 361edbdc89bf031955c901ca5b317eeefbc0f633 Author: Eugene Grosbein AuthorDate: 2023-08-31 02:47:57 +0000 Commit: Eugene Grosbein CommitDate: 2023-09-14 11:53:35 +0000 MFC: unbreak BEGEMOT-LM75-MIB.txt The MIB has several bugs making it unusable. Fix it. Reported-by: Eugene M. Zheganin (cherry picked from commit 872e89405684eac984e9004bdfeeb540e818ed74) --- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index c4cf536e5043..7966f6535f15 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -35,7 +35,7 @@ IMPORTS begemot FROM BEGEMOT-MIB; -begemotLoos MODULE-IDENTITY +begemotLm75 MODULE-IDENTITY LAST-UPDATED "201402240000Z" ORGANIZATION "FreeBSD" CONTACT-INFO @@ -59,7 +59,7 @@ begemotLm75Objects OBJECT IDENTIFIER ::= { begemotLm75 1 } -- Configuration parameters -- ---------------------------------------------------------- -- -lm75Sensor OBJECT IDENTIFIER ::= { begemotlm75Objects 1 } +lm75Sensor OBJECT IDENTIFIER ::= { begemotLm75Objects 1 } lm75Sensors OBJECT-TYPE SYNTAX Integer32 @@ -67,7 +67,7 @@ lm75Sensors OBJECT-TYPE STATUS current DESCRIPTION "Number of LM75 sensors in the system." - ::= { lm75Sensors 1 } + ::= { lm75Sensor 1 } -- ---------------------------------------------------------- -- -- TempSensor Table @@ -80,7 +80,7 @@ lm75SensorTable OBJECT-TYPE "A table containing information about all temperature sensors." ::= { begemotLm75Objects 2 } -loosTempSensorEntry OBJECT-TYPE +lm75SensorEntry OBJECT-TYPE SYNTAX Lm75SensorEntry MAX-ACCESS not-accessible STATUS current From nobody Thu Sep 14 11:58:27 2023 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 4RmbSN0n8zz4t10K; Thu, 14 Sep 2023 11:58: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 4RmbSN0KwCz3QZ2; Thu, 14 Sep 2023 11:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694692708; 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=o3AneFQR16p7gPrfk5iiOcJEad2qEYE0t/nPtBHhFjQ=; b=Vdfr3bJ4JnX4KEGNqOABEx9GoQkmDsXlmag79rYJ7apiLhQl9pTgP1+bV8WV3I5VBa/DUc nEJTa/WivsOtxdFdQmt+zAzgYUXLyzVGu7gLPggWbHisDxieXRB3al+PP0hH9qJKn9YAFM gbwk0W4WAe8L6Tc92GWW4YZl9kiuhjQZD7NIvfs4zO6AiE+OyuAmVNFPGasjfeAwn6/2/m NgwtDs/UAFl4ZVjlwoCkV4dBhTnOEQi+K23GKfcmXO0R+QbdYEUTn3wZba2VX9D8G0+IIv v6UgD4KA0Xg0g8ZE059jXC1zEKGrbhjeoHEuLjw+yvxEFCFHSnd7dvvGK/4g3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694692708; a=rsa-sha256; cv=none; b=pKT6qnNGyWuus2znRKu14CAIKs93qC/UAZRtaiRBYbVVFU+YQm4rLvtb5q2w1Nec4Y2pt0 rmLGvxXRv0jSlNhwG6bBwwCwDFIiZfb629gM0e92oyuNY/yA+L/nnLmsfg1iTaMtRDgT1h J0XLqcmb8frja4N6EgJSc2sBYrVNJUhRmI3cYmonNRoN/yLJoM2ZKLxoDW7fvyzGvPrQQa uewFckfCe+y2Yq+BoAdzkIplXTvqV1J0k3FjirbczXjTFgSW9M7fyf8IJ05m+iLduq7HEf i0PRyzP8zj8m6IYx41OJJGFLTcaqqzxfVNXCmYBHUxqVB6XnE7Ct7puIdj+GHw== 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=1694692708; 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=o3AneFQR16p7gPrfk5iiOcJEad2qEYE0t/nPtBHhFjQ=; b=i2pjHiRy1Ug/y1LcU5eioJA7lBBw9yC58uBBu72DK3bDxlYXZmAkXWK/B4arOSmu8X0vG6 9C910K+Vnak1rDqeVhMU61KH1L4jXq4ZwhbtNwxjsHQHCmRETd56yWVsWkdo8ArVn3RvK8 g52FjUhWSWz0njdsv7UVlgQo6KyXXvr/fON3JrC7Aeq0FDNUvVmKSoyueK0bZOvj5h14Mv dXKKo/Wk4Kph/qcjBWwdyZwP9denlRTRAVqtfGHfs4xaLUVHKwKrp3WdqRRaWCpmJNfyKt IcWTeOrK5ZexnQwbBqin27bNgDHZHAfqGEpKOZzxYdCcjBq4KR8WFxO5DkkqAA== 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 4RmbSM6Wfkzw3P; Thu, 14 Sep 2023 11:58: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 38EBwR1D078688; Thu, 14 Sep 2023 11:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EBwRCu078685; Thu, 14 Sep 2023 11:58:27 GMT (envelope-from git) Date: Thu, 14 Sep 2023 11:58:27 GMT Message-Id: <202309141158.38EBwRCu078685@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: 4cc4afd6660e - stable/13 - MFC: unbreak BEGEMOT-LM75-MIB.txt 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: 4cc4afd6660e8680716ed54d13086e26833c4dd3 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=4cc4afd6660e8680716ed54d13086e26833c4dd3 commit 4cc4afd6660e8680716ed54d13086e26833c4dd3 Author: Eugene Grosbein AuthorDate: 2023-08-31 02:47:57 +0000 Commit: Eugene Grosbein CommitDate: 2023-09-14 11:58:23 +0000 MFC: unbreak BEGEMOT-LM75-MIB.txt The MIB has several bugs making it unusable. Fix it. Reported-by: Eugene M. Zheganin (cherry picked from commit 872e89405684eac984e9004bdfeeb540e818ed74) --- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index c4cf536e5043..7966f6535f15 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -35,7 +35,7 @@ IMPORTS begemot FROM BEGEMOT-MIB; -begemotLoos MODULE-IDENTITY +begemotLm75 MODULE-IDENTITY LAST-UPDATED "201402240000Z" ORGANIZATION "FreeBSD" CONTACT-INFO @@ -59,7 +59,7 @@ begemotLm75Objects OBJECT IDENTIFIER ::= { begemotLm75 1 } -- Configuration parameters -- ---------------------------------------------------------- -- -lm75Sensor OBJECT IDENTIFIER ::= { begemotlm75Objects 1 } +lm75Sensor OBJECT IDENTIFIER ::= { begemotLm75Objects 1 } lm75Sensors OBJECT-TYPE SYNTAX Integer32 @@ -67,7 +67,7 @@ lm75Sensors OBJECT-TYPE STATUS current DESCRIPTION "Number of LM75 sensors in the system." - ::= { lm75Sensors 1 } + ::= { lm75Sensor 1 } -- ---------------------------------------------------------- -- -- TempSensor Table @@ -80,7 +80,7 @@ lm75SensorTable OBJECT-TYPE "A table containing information about all temperature sensors." ::= { begemotLm75Objects 2 } -loosTempSensorEntry OBJECT-TYPE +lm75SensorEntry OBJECT-TYPE SYNTAX Lm75SensorEntry MAX-ACCESS not-accessible STATUS current From nobody Thu Sep 14 12:26:48 2023 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 4Rmc5448T7z4t8ZV; Thu, 14 Sep 2023 12:26:48 +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 4Rmc543kF2z3VNH; Thu, 14 Sep 2023 12:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694694408; 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=cHg+uw6REb5QTSya9Vdkx9gBKEORmMiXPV5ZD5iXqIo=; b=tWVqb2Mw1lnrr5DB7JHtB4RXBJff0GHcPmyLrFhTnLm5qVKW5fs4h4+5hW3Vwzsx1+k0S0 8Blod/6RImOb1/JtcbEl2Co+wKFz9WG2cqCvToeRuNYw2arWY3XZF5zrK99Ic6cVhvdBlJ qRvaZan6YqgSe++ftJbTZpN4Klpmw44rdgsM0ZteNihXRrg1WR2ecGx/1M2fBQaH6klkF8 sFSGEy7WLzLy9lh/L3r7Mz0M4meaa3JJ2FoC7O4HbEi+PPcTQbqm7Or9c0TL/8Umnk7fZM GOBr8al/HtmaymmpBAf8Qg+8D40p6JLxVScF9OkzWWVp8XMao02LjzPWIFgIhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694694408; a=rsa-sha256; cv=none; b=ji6uX+fj2guu31YXCzW6keWc5Vi1/MgLcwvyuD/q4qFRL6BAqZUViIQCtG96WsE2Ya9hrC ouJq4rX5GinhDjUV3aNjwcNAeJ2CRxQI3m9NkeNfxHJ5CvZdn9OMsUj61IMlcgno7J2Dps mjY9XwMx91SFuTtQoHthniyCYNu/Ri1ONDujJaQhzg3gae/og2FyHAW1hvN6Mx9TU3g7cX mp6WUKGxor4HBu7BqrfGiLBznapJpL8RfAxvtAvwCyUHbDJA059hlhXRMCuAERbW3hdY+C /96GUgvhZsoRo+fGyGsOe4ku0bD9HdSdsB9lWdxSzlUMaXyn/+ajZmJTNG1IMA== 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=1694694408; 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=cHg+uw6REb5QTSya9Vdkx9gBKEORmMiXPV5ZD5iXqIo=; b=qV6GupQDdnglG9m/COUbPKx2x5RY6GALaCSbLwWCszsfkxQHuZHe/CA++uCX4zXehco08v AlfbE3PNntqrM9NjQqhF0fBcEUCJp+IFHeTy5m9Vl+JsBgY43LkkIuW5zwID9xbCnMWrHX JFE+zk+2vyJWhogGQsR0/poLHqKqO5i+EPhEdYwAqtsw+Vu/3r3jHOSkt3FVljgFgjA6lc O0XmcKYSUlnIO1JYI0H9XvkXz6qRSIJjlQyMZJxoEOyVWy9eD2L77Dx+/dJ38ekahppj+t aMYjW2JwRRCm2PdmHucYUOIowjgTDJW3vDIVSNoeCbBSJ/n/Al3Fq+q/MpuE9g== 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 4Rmc542StczwsP; Thu, 14 Sep 2023 12:26:48 +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 38ECQm1h029042; Thu, 14 Sep 2023 12:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ECQmso029039; Thu, 14 Sep 2023 12:26:48 GMT (envelope-from git) Date: Thu, 14 Sep 2023 12:26:48 GMT Message-Id: <202309141226.38ECQmso029039@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: e21f1fa8fa98 - stable/12 - MFC: unbreak BEGEMOT-LM75-MIB.txt 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/12 X-Git-Reftype: branch X-Git-Commit: e21f1fa8fa98506b1bfb195b02132a84549e89a2 Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=e21f1fa8fa98506b1bfb195b02132a84549e89a2 commit e21f1fa8fa98506b1bfb195b02132a84549e89a2 Author: Eugene Grosbein AuthorDate: 2023-08-31 02:47:57 +0000 Commit: Eugene Grosbein CommitDate: 2023-09-14 12:24:51 +0000 MFC: unbreak BEGEMOT-LM75-MIB.txt The MIB has several bugs making it unusable. Fix it. Reported-by: Eugene M. Zheganin (cherry picked from commit 872e89405684eac984e9004bdfeeb540e818ed74) --- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index f8f52a639be0..861df8192fc0 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -37,7 +37,7 @@ IMPORTS begemot FROM BEGEMOT-MIB; -begemotLoos MODULE-IDENTITY +begemotLm75 MODULE-IDENTITY LAST-UPDATED "201402240000Z" ORGANIZATION "FreeBSD" CONTACT-INFO @@ -61,7 +61,7 @@ begemotLm75Objects OBJECT IDENTIFIER ::= { begemotLm75 1 } -- Configuration parameters -- ---------------------------------------------------------- -- -lm75Sensor OBJECT IDENTIFIER ::= { begemotlm75Objects 1 } +lm75Sensor OBJECT IDENTIFIER ::= { begemotLm75Objects 1 } lm75Sensors OBJECT-TYPE SYNTAX Integer32 @@ -69,7 +69,7 @@ lm75Sensors OBJECT-TYPE STATUS current DESCRIPTION "Number of LM75 sensors in the system." - ::= { lm75Sensors 1 } + ::= { lm75Sensor 1 } -- ---------------------------------------------------------- -- -- TempSensor Table @@ -82,7 +82,7 @@ lm75SensorTable OBJECT-TYPE "A table containing information about all temperature sensors." ::= { begemotLm75Objects 2 } -loosTempSensorEntry OBJECT-TYPE +lm75SensorEntry OBJECT-TYPE SYNTAX Lm75SensorEntry MAX-ACCESS not-accessible STATUS current From nobody Thu Sep 14 15:00:19 2023 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 4RmgVC3bHdz4sb5w; Thu, 14 Sep 2023 15:00: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 4RmgVC2qkfz4VMC; Thu, 14 Sep 2023 15:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703619; 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=kwoA2BKDRqQGn+bparrBjwjDOd3fOWPE3o0bnjaY6wQ=; b=sSNLCBut8TtKkrlvD+K++sivg9/unr5XN9YmWtG9W+l+k8KXyWK2OYgq3R9PttMtLqfVrG xRP6h0+GVT2YcB6EO4Ca38D6sR3pO/tHmQ7PDrXYYuZhV+ms2dxaKJWd/EnIkLwYyqmN0X 8RGgJ/P7/1mVZQLq3HTDihCv98wjw8lXOgaKkNgHCf17OEJpRsis+WZh8QXqIbmIa5iK5v sgf0TmYf/qMgbrDb0PdRbwJvTGxqsrUJH3bo60j+NuIBwnStOpLL2fUvDmll3NWuVMZzHE 6m+z4ijwv9cAU+gedMxOXPYrFXATA6P6EXPl7zvEW2Pl3SEw14C+OyaXEDGxFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703619; a=rsa-sha256; cv=none; b=pk8FNgjdDm0JWtw8V5G5v4M3F/hq4Q4oMzjNTmlJEe021OkRPaOfcfP6yZPLGRlBPs83Jt F91fW4X+nPEFH1Tk6k3cE8U3VWDU60TkrsKKIN0Kg9oqq2Qgy35zBstv4EWl7CKJ9NbEHy TfLsXFzqTuACrBoYttIzRy3slW94ZJVy0i847P7Ny+FicmThlht6dYxyCYRjw/6m0bfL2q hYHO30Qg0kT+zUMGEetp65wuGVuAeH92VR494fev+g5MrgXbTs1qnyVBBGouKSH0l7c5Di RIB7KxlLAa+S3TsAWdNg+YpNpdLBsqQMV6dcUGwkRr5kITyR26584VTLbcLyBQ== 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=1694703619; 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=kwoA2BKDRqQGn+bparrBjwjDOd3fOWPE3o0bnjaY6wQ=; b=n2/JWGFPLcrwaFe2zfypYrXo9vTlpd4UECbwmkesug9njmWbBeF94ZLZI7nOvmEbXbN3oI l3opZnRhkbFWXU5hlWLCKtKXXwkX0VKFw8L1viwgjVDD479KEZC+E5Ageyoqkla9z+/nl+ CkTcevLEljoGsbV6naKiO+LSxydChLyNvwwrCKCJoCmZPGe0Tar7WAJrIVmoUGQH7jZX+b twXmBTRZ6BXFDl0Sh5U8htUwJPHgnCqs619KvNyCwztSaPDaB/35l72nDnRy8ije78cJnx x1nS6eZz10d91iowcy7pvJ8Y9lpiVP2srj3gJ0DFQEdC97KBkG4wBbR/v3YZIQ== 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 4RmgVC1vmPz11t9; Thu, 14 Sep 2023 15:00: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 38EF0JoG088938; Thu, 14 Sep 2023 15:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0JgH088935; Thu, 14 Sep 2023 15:00:19 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:19 GMT Message-Id: <202309141500.38EF0JgH088935@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: 15de7baddcb4 - releng/14.0 - grep: Suppress EISDIR when reading. 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 15de7baddcb43398c209860d463757852bd04331 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=15de7baddcb43398c209860d463757852bd04331 commit 15de7baddcb43398c209860d463757852bd04331 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:59:38 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans Approved by: re (delphij) (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) (cherry picked from commit 24b741db5fc907d35e51c97f8ef8ad595474e6b9) --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index cd2764811776..3349b72842ca 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1); From nobody Thu Sep 14 15:00:20 2023 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 4RmgVD4T2Mz4sZyt; Thu, 14 Sep 2023 15:00: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 4RmgVD3v1yz4VMG; Thu, 14 Sep 2023 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703620; 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=iOOMyuj1yp5VLIWXvqoo0tre2TB72Pw8btw7K1anpAo=; b=CvnbViUwuNPS5m9k1I3VwPX/gKoq6lrXflt2vsMZuvIG259NDuO/jHbfMUezJmezprSHg8 3ZrFTM+JiOYP6iEiair7sfV9QRxaOGrg75OgupvxkehwVw7x2bCcuwyCnqaKpCEuyn2XaP jVN8rxhVTeEqT1WHsmsVNYBepkWwyNJhYGl/0bca/jYZy/TP8/Z7+KCpbQAlhgL5I+T4X4 Er/S1IcuAW57SklIlOTsICDMkgIV1SitR3AB9WzXSikYH+37Z0MxvdL6tyeHDjUBX+M6Kq GJUow1lv7jipCtnm6sevORiCsacJ/0XkOsBP1/qTbWdOX6YOOHWiezksvskBAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703620; a=rsa-sha256; cv=none; b=q2tFehuLjtKp54qhKuS6P7JTs28dTiPtQdQ97JmrGsfU0CLIQCW6JZS6kHwUpgOYGVrIsY zhNvw+HXqDrGpewuFCSrpUy7Z78PmoU0N+akINbrEwzf6n98QA/HgIy2A8Y3QpuNqkDYUQ h13PFwAig9PRt824rUWk9LbXvDva2BdZQ4tAMTd2x1qnuHPgnTVxuUof9GXYyf41oScKdJ HdZA94ZVN7l4TfEj3w/O0TfjUyy/iXq8CFc8zwGpgo2htRZ5v3QkQE4v9u88i7GHfiLy/c NC459amTzi050UiK/7qoHeNpdQje7ixkI9nlzsLvE2llKxp8uqmCmnUccbEzfQ== 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=1694703620; 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=iOOMyuj1yp5VLIWXvqoo0tre2TB72Pw8btw7K1anpAo=; b=lcR64YgfKdWMOffH8fjnQ24x4OiedySwTIImP513SV45J/XcSQ9EqAYXWlH5WLKy/8dBto wjE/y72FP+6kFnUwTon3coc7ZVMSTtobB7sWdR/Sx5ZqFMSKaTgFiikQXjWQS3gBhc8p2A tysltpqNoGMBU3HMwkxdg+krjze+XifJf8kct3HIBvGsN2rP69zjNc3NM3iPkzltcTzsPb u//Z4p7/Cz87naay1CplMdeJm/XD0Mkwn7SUB21nxMBERXajmzd0mjVevrUydCPOnyIvIT t8Juegbs0YwDkuRColgEU4p7P59RJmA6/2qIcMHX+DZoO45fz1PA/hYMyWLFuw== 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 4RmgVD2vfsz11Yv; Thu, 14 Sep 2023 15:00: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 38EF0KnB088992; Thu, 14 Sep 2023 15:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0KGP088989; Thu, 14 Sep 2023 15:00:20 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:20 GMT Message-Id: <202309141500.38EF0KGP088989@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: 89872424863c - releng/14.0 - mkfile: getopt() returns an int, not a char. 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 89872424863c412f506e5df4adc30c96323fd432 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=89872424863c412f506e5df4adc30c96323fd432 commit 89872424863c412f506e5df4adc30c96323fd432 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-10 18:33:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:59:50 +0000 mkfile: getopt() returns an int, not a char. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41804 Approved by: re (delphij) (cherry picked from commit ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62) (cherry picked from commit 6bd2be4c4971f58c51509ce8856bd5331f979e85) --- tests/sys/cddl/zfs/bin/mkfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/bin/mkfile.c b/tests/sys/cddl/zfs/bin/mkfile.c index b1034b9ca500..c1afdbd61196 100644 --- a/tests/sys/cddl/zfs/bin/mkfile.c +++ b/tests/sys/cddl/zfs/bin/mkfile.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { unsigned long long fsize; - char ch; + int ch; /* We have at least 2 arguments. */ if (argc < 3) { From nobody Thu Sep 14 15:00:21 2023 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 4RmgVF6GLjz4sb60; Thu, 14 Sep 2023 15:00: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 4RmgVF5J1Qz4VW2; Thu, 14 Sep 2023 15:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703621; 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=Grs90m7wxFoBZIFP5s4yiJzSHNlX+6aH3PZ6sch/Sko=; b=dmGRUKHVanoETJMECM8szKue0YIu/BEeCQPSqDyvvKMiR6LuI/MIpk3i2OmRyIRiQxuNKC qtbDlBlcoqjN0EaHsBLZws8zSkUHr1Tvh499hcI5QEmNWTP3GriQ4tUbt1DqSs/RujEJ7i 6HvnhCTTxvWRrSdfwauAJME7MLapmXuIuqhsv7NdvZptrVdIeuwvnRLDzEHRbPst7epdh+ p66xj4IeeBZj9QN5fxRIf4EFss5Tl5ENlIO2kqYaUhA3Y+SL+KmY0padDcn79SqIQn6Agb mRFTAA2yU7KFiiGG4UZUP8Z9PvvYKs2ibf3Ky6waDCKKvFEHDMOmJTGQkvfGqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703621; a=rsa-sha256; cv=none; b=lmm7HE9J4lc4b03zvfIt2wNLABPYWbNK1889MzRn1BvXEuKeQk/lj95EWKeHj8JiVfDg8s NXAiyhnCN3hI2ibxJeIYtLhlPZgUHA8uccLZ7/qvy8f5xng8g49X7lr/dnkMNdJz1M2biP FxAF62CWPV7ZC+m5KXDqmsjGyo253G99lbcxIL0Pa7lt/ZbxAM3hMqwuxBKz//dk9jtnVN o5FRAfWc9zkgfPJ57DzMV17C6Wtln/x3QoBfxjy9Fnxs/cDJi5rFOQ7fISYxkL/9iz7SPz F4s+qfUGGS5zLKdB04j+Ekfeqc/+V7dMm2blHv2QelNtf4CnAGOnjFGrcoUnug== 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=1694703621; 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=Grs90m7wxFoBZIFP5s4yiJzSHNlX+6aH3PZ6sch/Sko=; b=QMhJ88e807ohFOPD+Kg//OWHIf9tDwYb6eEqZUjCJIkz8BdqWXIVlJm0XPMg9lb/eibFMa WuKhvYmrEpqAYaXcbB2dMOkXIWIeWoCa6kenvQlFqumtexGUzlcTYzkg+g5kO/PsLU6hW4 Ko7p1gNfYCTST7GCRlZxKr1MD07Zk9DGXZn6zbSrpv/Qg8leFmN+5YCd+WoxFqFc03G+/W R3r57jqnVka779uBxjv2TUdSV5fLZrdFW15Ubk44PvJhym9axLhPB6XCay+r8DoNK26grl eYJqR4TYAIoDEeCgM3/3wRz+vVnaGSJYlO5UDqKV1udzW6g/5V9rUreYRAln7g== 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 4RmgVF3vM7z11c3; Thu, 14 Sep 2023 15:00: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 38EF0LQN089037; Thu, 14 Sep 2023 15:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0L9t089034; Thu, 14 Sep 2023 15:00:21 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:21 GMT Message-Id: <202309141500.38EF0L9t089034@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: 108e85aa5d5c - releng/14.0 - libc: Don't assume signed char. 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 108e85aa5d5c347db8127fc5f50aa2efd3e266d4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=108e85aa5d5c347db8127fc5f50aa2efd3e266d4 commit 108e85aa5d5c347db8127fc5f50aa2efd3e266d4 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-11 13:18:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:59:59 +0000 libc: Don't assume signed char. MFC after: 3 days Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D41814 Approved by: re (delphij) (cherry picked from commit 88a9b6e1ed82b562f52bae26b3de257495cd1983) (cherry picked from commit c1335a776b0ff33a715bdaa2be59412006cb4053) --- lib/libc/tests/stdio/snprintf_test.c | 4 ++-- lib/libc/tests/stdio/swprintf_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 323356b37a7d..29b908b65120 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -131,8 +131,8 @@ ATF_TC_WITHOUT_HEAD(snprintf_wN); ATF_TC_BODY(snprintf_wN, tc) { SNPRINTF_TEST("0", "%w8d", (int8_t)0); - SNPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SNPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SNPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SNPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SNPRINTF_TEST("0", "%w8u", (uint8_t)0); SNPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index f5dde349412b..f00ecc7f1c1d 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -132,8 +132,8 @@ ATF_TC_WITHOUT_HEAD(swprintf_wN); ATF_TC_BODY(swprintf_wN, tc) { SWPRINTF_TEST("0", "%w8d", (int8_t)0); - SWPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); - SWPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SWPRINTF_TEST("-128", "%w8d", (int8_t)SCHAR_MIN); + SWPRINTF_TEST("127", "%w8d", (int8_t)SCHAR_MAX); SWPRINTF_TEST("0", "%w8u", (uint8_t)0); SWPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); From nobody Thu Sep 14 15:00:22 2023 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 4RmgVG6HRZz4sZXw; Thu, 14 Sep 2023 15:00: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 4RmgVG5nrpz4VSw; Thu, 14 Sep 2023 15:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703622; 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=nQp+zuQkxSqhPK6zwkU9oXIOHeCUXjGNu/s73fvarAU=; b=cVlYpaK7kBZIsb8zr6qu1x1vGuvqdmiBB9uc6vhzy+vxsGkaRTv5so3RMS9NTmzjRVRCxH rA5GUBoywHTjtuzzmFqro28RLjV69ZNHQF5gkhERdLQWt4wTGK6SmzaIXGLEyy3JRrz4Py uCvy8zU7HGflZeHTlsYLOzmWkv+qBR5N15aJeh6EM/4DBi2AqM5R85vwJgWEUEz6ekEYr8 ULTKe6viiesYEQ3ZYusqLx0NZD5qLYxOtWud+BOnjEKEMYYkwW4Ci4qe6GPpLk+94/Vu+L 6bGv9e0+lxI3CaeIcM32/RVTYTLwcn/46ctDJMcDHWvAdiW8HCoyFzBSLADbFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703622; a=rsa-sha256; cv=none; b=pydfiXJvULnLBwy+t/e29LH+tnb9m+hDq9XfHFmIx0qot7aN3VuFalPTxxgxWWkz6wnvMP KZeYQDmdF363GZwj9EIZf8soJMIjYfrTDuXdDNpECgrRzBt7gBx7fF/iTwqKTbrn4q9h32 bRP41pfv/iL561pDueZp27YlW3KYm0j5lP8phhjY2IgmlzkKKS+AXX7CQw4q/OAIR0JGOM /W/zfgO180yREWwtGeuUfZgHBVjFk8lBkXEIJwfsMULn7bbx70yQ2kVKTEXPL/5Zlg0sUo 3WklJLNTIUbYSuIEUU5z7sIgc6IsXh394A1z12KU6t0WVUXTTazrK9LIBA+IGg== 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=1694703622; 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=nQp+zuQkxSqhPK6zwkU9oXIOHeCUXjGNu/s73fvarAU=; b=NrIMkNFVnWojZwJPKPM4q8FKqNS8LuDcIm5K9AcKNVeTK6rSrb8juzGkHLrP11rCCMRVEN pKDeRHdBtob2uH0z6JaalpHl7U6Nz6PerQEB31jyLHGDX/v7e8bXIA4toPFTIEl4oMy5V/ xBLhRD7OZLQcsK8ykk4xTNoD/YLHQmCiScVWesw6sMLY0SrNrUowPEifPaJV894ixo5Ygi +gGYYJ1iYulQUh3CIZCRRTxGAC+8e/ZTrx4eYHXKAgaJSpATK7utj1luvfCwOVSa0a9xpY zP8t20rxy+12/zivITM46DQXcaC7AgyeXRSGVAQXTLGsn/CJwQa23J/+ya+sXw== 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 4RmgVG4vfmz11c4; Thu, 14 Sep 2023 15:00: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 38EF0Mbp089091; Thu, 14 Sep 2023 15:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0MQi089088; Thu, 14 Sep 2023 15:00:22 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:22 GMT Message-Id: <202309141500.38EF0MQi089088@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: 3d16651a8941 - releng/14.0 - Belatedly document OPIE removal in RELNOTES and UPDATING. 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3d16651a8941588997910c7e026a793f70c5a166 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3d16651a8941588997910c7e026a793f70c5a166 commit 3d16651a8941588997910c7e026a793f70c5a166 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 11:43:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 09:00:05 +0000 Belatedly document OPIE removal in RELNOTES and UPDATING. MFC after: 3 days Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41822 Approved by: re (delphij) (cherry picked from commit d2c839eee0d5410095f5984d2126f41f4cf62a00) (cherry picked from commit 2e38377fcda2eebb2f76f7f82352643a050d736e) --- RELNOTES | 7 +++++++ UPDATING | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/RELNOTES b/RELNOTES index 0ff123618e14..f3d717525929 100644 --- a/RELNOTES +++ b/RELNOTES @@ -148,6 +148,13 @@ f0bc4ed144fc: instructions may be probed instead of logical entry and return instructions. The provider is currently amd64-only. +0aa2700123e2: + OPIE has been removed from the base system. If you still wish + to use it, install the security/opie port. Otherwise, make + sure to remove or comment out any mention of pam_opie and + pam_opieaccess from your PAM policies (etcupdate will normally + take care of this for the stock policies). + 0eea46fb1f83: Removed telnetd. diff --git a/UPDATING b/UPDATING index ee096e9a6fa6..fe80f259cb12 100644 --- a/UPDATING +++ b/UPDATING @@ -182,6 +182,12 @@ and/or ports. after upgrading to restore all the component that were previously installed. +20221002: + OPIE has been removed from the base system. If needed, it can + be installed from ports (security/opie) or packages (opie). + Otherwise, make sure that your PAM policies do not reference + pam_opie or pam_opieaccess. + 20220610: LinuxKPI pm.h changes require an update to the latest drm-kmod version before re-compiling to avoid errors. From nobody Thu Sep 14 15:00:23 2023 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 4RmgVH6szhz4sb07; Thu, 14 Sep 2023 15:00: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 4RmgVH6JHYz4VRH; Thu, 14 Sep 2023 15:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703623; 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=kA8OTivQnWsvGnMU9VQ2n8zFvI3TAcpm1P2AWvJLyL8=; b=CjKSlU1b1xTREelhjBfnC2PLUQNZciu9pEs5/JIt3bJhXQhfuQWIjlEIiH/4QJinBcie1o eQ8araIDKAHI2iCyWjvnpLHHic+x+9iZihT8OxAamT8K0khytLM3hRl5I1OQNIfldpv/tB BoC/TFywosqMU5lURguukBmyW914DvHxWv85q45e2awvmWNKoZF1JUf+oHLW/YDgKfNqdY 3AwqBsezOgYgWjYQoFNWR3BJqxAPmHkfBedzIzW7jWbsLQ5pVhRmdoLcDjm0KM07wTVs7h Khu5GHxRsmd0ldDr6oK9+Qrs4+6+I2NGRa3WdS8x/A9/AZ6zC2fLlR+ZTX3MfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703623; a=rsa-sha256; cv=none; b=EgvCbVBN75Pa3gBzO0N0RowX6TvEmMar8BAgI9g6ugFOOGGQnLkXzYQoNVRr88GYSRSm8k 9OHlgtNcA1yBXFjIkWBfJ9vzK4xpqQi0KmnFZ7JGPQWYThnIbVRjZE5ONYdtBMxwPbT/CF tFTcrnaXANZIUwM6IejBwibn4uufNjGtVMdzpx2z0uL3gs4nYAVhv2hxuXTXSphzjJBgd5 L3E6I41KrcjShzfOUS8OnwNvoLIHaxExAdDmQyJNSPmFRAyCAWnkPtGpgYXUGnlsiAMMdH zvN+woyLsJ73FXA8cJ4T2xy3pdSsD2lraCcHXMvts8AbgK7OQuZHGZKX0sCCqg== 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=1694703623; 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=kA8OTivQnWsvGnMU9VQ2n8zFvI3TAcpm1P2AWvJLyL8=; b=An7XQcsTS//VyDcNqveHI7LfLkaCdEVmt6z6hRcrEN3k5kAOCeZ69j7ieZiwHE9srGLdw1 DQHywee1AlJcffjzs9EeGYBpW0d5GsXWL7iZbldH2Pb7b8o30WoXiIvamjIxem1LaNDolR y/sK4ikPxSpwQfoHhF++196IAcpbaRpix4CjS6StFUcnaax32mnAQAS9GkB/KD7ooJUNHf 20vvK68SnhaNKfWELWGaACo1tj6zlJVJWMq71yXnxnjh1YlOqt23/CPj4SFZhnL3DFfJks yrpSz7QcABjGKoIs0HGZxrRiOEL49To3fsNCiJkXhjAeQTi/n/+Bho1WOJcvsA== 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 4RmgVH5P07z11qn; Thu, 14 Sep 2023 15:00: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 38EF0Nhe089145; Thu, 14 Sep 2023 15:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0Nu9089142; Thu, 14 Sep 2023 15:00:23 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:23 GMT Message-Id: <202309141500.38EF0Nu9089142@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: 525c3ef318f8 - releng/14.0 - newvers.sh: Avoid picking up stray envars. 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 525c3ef318f8898e4bc61e815daa8f0a9ce3b948 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=525c3ef318f8898e4bc61e815daa8f0a9ce3b948 commit 525c3ef318f8898e4bc61e815daa8f0a9ce3b948 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 09:00:16 +0000 newvers.sh: Avoid picking up stray envars. 89f361f742ae added a mechanism to allow arbitrary overrides from the command line. Unfortunately, it also had the (likely unintended) effect of allowing RELEASE and VERSION to be passed in from the environment, and Makefile.inc1 happens to define VERSION for the benefit of pkgbase. To restore the status quo, unset RELEASE and VERSION at the top of the script. Fixes: 89f361f742ae MFC after: 3 days Reviewed by: gallatin, sjg, emaste Differential Revision: https://reviews.freebsd.org/D41845 Approved by: re (gjb) (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3) (cherry picked from commit f92a598782c2f671559a919f353b1505f6fe09ca) --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 81c35d40f6a3..9c894c4587da 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/.. From nobody Thu Sep 14 15:00:28 2023 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 4RmgVP13Gcz4sZx1; Thu, 14 Sep 2023 15: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 4RmgVP0Cz1z4VvY; Thu, 14 Sep 2023 15: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=1694703629; 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=TDhsN36bHaSlBzwbTSQGGGJDNhLKH7pXSQ3yMifCWlw=; b=dPbc1k21JBzNMyfKIf/mQrnJGV8JjHfho19Gs2HyXe2RiBlXzOWzgE0LcW/KNH0fbIL4f5 CycE9mWkZ0yH677i8LLIP1EQgpTiVwzI3ygWtWsI9nj6QxocXQxH5Q5pXnSkBOAoAsrTGw wp/xQZ+HnTr1ddGGLpzt1hlNPofCZOhlKGP3j9yRrh9pLM8FL3eNYS59qngF4pmmH0iuVq yLeehMOIfCab2msg4gtJxCD/QIdvrPuyFdirb/p1S65guv1mMK9x6w/+yKze38kdozd53N u4YJENh20REmei8bMueoQWJ9Sfg8ZZ2DEKestkFMS4HrxPJpzeCZ9scnOYByAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703629; a=rsa-sha256; cv=none; b=HT3h7OUVi5zK2B+eEdtLqO9gHjfXS3LEL6XXVQjQKUKpRgdzVRTdOqurygmFyFGlhL2sNu x7rwyEN9OIhPJ2yDCPPwd1K2ALK5xBRHcKZWhHP6LnjuWmSOiwM7OvMHu/p4JL08djUfsp JK0gyUO2CZ2mBBE3MdNYjJPsicYTxltDCOu3Li7VGyiLNPySIDiGTdPKjL2WCONZx5hIWr xp0XMGmd/U/LEJtpRKEILtsNe3mEKWPzRJV8xKKAqLLpF2t24VXrEZQw7yrTcKOrJdn/fk 5hc70/oH9Q8NEO6I6G8dgWr2DBvnkWEhKQjbhK+qceOtJfxHRnI+fEd7bdXCdg== 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=1694703629; 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=TDhsN36bHaSlBzwbTSQGGGJDNhLKH7pXSQ3yMifCWlw=; b=ckHLvsGfNFKNh6xvpHDZzLPncwaASejO1U8VBzGGi3Li7ZS2gwQIi5u1iPGA2+Vc0l0ZEQ o7Em19xpFEH13MYw+h5McHezlfshtbPiKPStSPcXNpw24e5OzkKZr3amDfqSAhbbdrc7B+ max5HsJmCtD64IeKriTG4eQdKChHXCR7bGS7ZSOqpkG7XbIfIR2A8UZaLXhSw0vlIIHDJM Xee+i00B6Qzp1r3fVIAH+KsFOSyXMCIMu2bRjWKIxYY9VPX3BTUcAsT64cJMRZ3KYbyDHe 8HTA/iSgSN1iJIDmP8WK1c2+dQZEsBi/4r65WanNwrdTGTn3e65xxgvSdFWAKA== 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 4RmgVN6GXNz11tB; Thu, 14 Sep 2023 15:00: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 38EF0Sow089335; Thu, 14 Sep 2023 15: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 38EF0S8V089332; Thu, 14 Sep 2023 15:00:28 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:28 GMT Message-Id: <202309141500.38EF0S8V089332@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: f01e4edfc85f - stable/13 - libipf: fix parser error message. 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: f01e4edfc85f0d147a3462247f053aefcbb6552c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f01e4edfc85f0d147a3462247f053aefcbb6552c commit f01e4edfc85f0d147a3462247f053aefcbb6552c Author: Dag-Erling Smørgrav AuthorDate: 2023-08-31 20:15:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 libipf: fix parser error message. MFC after: 1 week Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41652 (cherry picked from commit 4cd9d804ae8b955d47dfa0bba06e7c254d760cb1) --- sbin/ipf/libipf/parseipfexpr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sbin/ipf/libipf/parseipfexpr.c b/sbin/ipf/libipf/parseipfexpr.c index 215e43b2978d..880258e5dd66 100644 --- a/sbin/ipf/libipf/parseipfexpr.c +++ b/sbin/ipf/libipf/parseipfexpr.c @@ -93,11 +93,7 @@ parseipfexpr(char *line, char **errorptr) break; } if (e->ipoe_word == NULL) { - error = malloc(32); - if (error != NULL) { - snprintf(error, sizeof(error), "keyword (%.10s) not found", - ops); - } + asprintf(&error, "keyword (%.10s) not found", ops); goto parseerror; } From nobody Thu Sep 14 15:00:29 2023 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 4RmgVQ2rJmz4sb9R; Thu, 14 Sep 2023 15:00: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 4RmgVQ0pdBz4Vxw; Thu, 14 Sep 2023 15:00:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703630; 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=DgTZEhl4I+QZnCJ9duzxtXgnIItAuhS5nU3ntlia5lk=; b=Y9x4a5/bV5xQ4VqnSCUNpu8moRj28TVDAVaT/uXv4FLdZcfZbMyDtjv4x2ItvVUujmmcOC xw/+e6Sm6pmhq+rflW3rOrF3MSaNgLSoicbptpDMF+oQWXiBDyhx63ZC+DoVRibXRx3dOg 2kK5YQ25kNsvRH/BYSAfsW3YohOqyAJvCV3EGM2tdVdajwRyJ73bNaEpXpMbQn6RCy2aoO /QDvRR3+wjxzGqnJisd2lKN8Skdv2ROtp2E8LSvlOBCr/3SfXYfiiTIzhFatucYJt7Qicb 5FUUFgR1/+XbOSIwsQPpYvloK/bS/klZgGfpMju58/T0qLlfXkYfwTe+UhfpOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703630; a=rsa-sha256; cv=none; b=uSI8Uy5Ui9KkNczWwrlYjN0PQoW3j49JU71BqGOLdF/sKhKKv8VDttsv4e0WJmdFfjT7py V4WF5CGe1AMULEAQYXUKv5OdmCnIxJS0VB3N5jRGk/KHm8GW80KIsW60+0WlgpskEpwxxa 5koX9JTPDbjpsQDdIBe/kSpejALzSN02KH1Nbs+UjND2Eet/m+nqDfisnm1dljvA6hlH6L D0Dnmw8f4b/zI9XoZ8CzE0x34Maru4huZ5SxdsiALMju1Bq2cMYrvUyDmrsTfiFtfi9MYp l21OVuCe7OuRiuNnAgwZlEcLzucZWgcQ6oj1oAiyFQQXPPTfV5LycoL3OSOjPA== 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=1694703630; 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=DgTZEhl4I+QZnCJ9duzxtXgnIItAuhS5nU3ntlia5lk=; b=qRj9miDArqsCBypdh5CqALZuoj3/Wv/f/cRupW7liSPCDMcWuiFXN0ezI7M1NsJynpIduq KrhKJqDaGrKZMkqToTAh8QzJoCEVUMWHcW4gXOz/VKp5SvIcvaQm41uOGBocXRTSh0KFJJ tcOXJ74scRhIJZiiFOr2aNeNCVtXr3wnidX+Az1qcVl5Oyelx6kXk1QDN9I+NmWI03BMYn dZQ7QVBvmRaNEEyb9ornkYkf9/yCrJrK5l5UL7k8DHSxEhgTdFplU8uewiVgiLXmx4Gj3x 3pknO0OaaQp5KmaaP3Ob+DjWu0d6HIY2Ojtamt4u04iTQBVkkXcv3DxTF3ofSg== 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 4RmgVP70NRz11c5; Thu, 14 Sep 2023 15: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 38EF0T0a089387; Thu, 14 Sep 2023 15:00:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0TFA089384; Thu, 14 Sep 2023 15:00:29 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:29 GMT Message-Id: <202309141500.38EF0TFA089384@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: 62d509951cb9 - stable/13 - iostat: getopt() / usage() cleanup. 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: 62d509951cb97265156d232c3f720161d8ccd016 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=62d509951cb97265156d232c3f720161d8ccd016 commit 62d509951cb97265156d232c3f720161d8ccd016 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-29 17:23:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 iostat: getopt() / usage() cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D41636 (cherry picked from commit 09c45b089d2f90ec04153a1b4621dd6bec142959) --- usr.sbin/iostat/iostat.8 | 40 +++++++++++++++++++--------------------- usr.sbin/iostat/iostat.c | 24 ++++++++++++------------ 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index 17b73f0932c7..863f8ab8466c 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -54,7 +54,7 @@ .\" .\" @(#)iostat.8 8.1 (Berkeley) 6/6/93 .\" -.Dd May 22, 2015 +.Dd August 29, 2023 .Dt IOSTAT 8 .Os .Sh NAME @@ -64,7 +64,7 @@ statistics .Sh SYNOPSIS .Nm -.Op Fl CdhIKoTxz?\& +.Op Fl CdhIKoTxz .Op Fl c Ar count .Op Fl M Ar core .Op Fl n Ar devs @@ -90,6 +90,13 @@ averaged over that time. .Pp The options are as follows: .Bl -tag -width flag +.It Fl C +Display CPU statistics. +This is on by default, unless +.Fl d +or +.Fl x +is specified. .It Fl c Repeat the display .Ar count @@ -102,13 +109,6 @@ is specified. With .Fl w the default repeat count is infinity, otherwise it is 1. -.It Fl C -Display CPU statistics. -This is on by default, unless -.Fl d -or -.Fl x -is specified. .It Fl d Display only device statistics. If this flag is turned on, only device statistics will be displayed, unless @@ -136,6 +136,9 @@ then the device native block size. Extract values associated with the name list from the specified core instead of the default .Dq Pa /dev/kmem . +.It Fl N +Extract the name list from the specified system instead of the default +.Dq Pa /boot/kernel/kernel . .It Fl n Display up to .Ar devs @@ -145,9 +148,6 @@ The utility will display fewer devices if there are not .Ar devs devices present. -.It Fl N -Extract the name list from the specified system instead of the default -.Dq Pa /boot/kernel/kernel . .It Fl o Display old-style .Nm @@ -158,6 +158,13 @@ If .Fl I is specified, total blocks/sectors, total transfers, and milliseconds per seek are displayed. +.It Fl T +Display TTY statistics. +This is on by default, unless +.Fl d +or +.Fl x +is specified. .It Fl t Specify which types of devices to display. There are three different categories of devices: @@ -228,13 +235,6 @@ argument will be included in the .Nm output, up to the number of devices that can be displayed in 80 columns, or the maximum number of devices specified by the user. -.It Fl T -Display TTY statistics. -This is on by default, unless -.Fl d -or -.Fl x -is specified. .It Fl w Pause .Ar wait @@ -267,8 +267,6 @@ is also specified to enable the display of CPU or TTY statistics. If .Fl x is specified, omit lines for devices with no activity. -.It Fl ?\& -Display a usage statement and exit. .El .Pp The diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index 6a6adb3d6090..98dd901886e6 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -168,7 +168,7 @@ usage(void) * This isn't mentioned in the man page, or the usage statement, * but it is supported. */ - fprintf(stderr, "usage: iostat [-CdhIKoTxz?] [-c count] [-M core]" + fprintf(stderr, "usage: iostat [-CdhIKoTxz] [-c count] [-M core]" " [-n devs] [-N system]\n" "\t [-t type,if,pass] [-w wait] [drives]\n"); } @@ -197,17 +197,17 @@ main(int argc, char **argv) matches = NULL; maxshowdevs = 3; - while ((c = getopt(argc, argv, "c:CdhIKM:n:N:ot:Tw:xz?")) != -1) { - switch(c) { + while ((c = getopt(argc, argv, "Cc:dhIKM:N:n:oTt:w:xz")) != -1) { + switch (c) { + case 'C': + Cflag++; + break; case 'c': cflag++; count = atoi(optarg); if (count < 1) errx(1, "count %d is < 1", count); break; - case 'C': - Cflag++; - break; case 'd': dflag++; break; @@ -223,6 +223,9 @@ main(int argc, char **argv) case 'M': memf = optarg; break; + case 'N': + nlistf = optarg; + break; case 'n': nflag++; maxshowdevs = atoi(optarg); @@ -230,21 +233,18 @@ main(int argc, char **argv) errx(1, "number of devices %d is < 0", maxshowdevs); break; - case 'N': - nlistf = optarg; - break; case 'o': oflag++; break; + case 'T': + Tflag++; + break; case 't': tflag++; if (devstat_buildmatch(optarg, &matches, &num_matches) != 0) errx(1, "%s", devstat_errbuf); break; - case 'T': - Tflag++; - break; case 'w': wflag++; f = atof(optarg); From nobody Thu Sep 14 15:00:31 2023 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 4RmgVR2Tmnz4sZxF; Thu, 14 Sep 2023 15:00:31 +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 4RmgVR1yZRz4VwM; Thu, 14 Sep 2023 15:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703631; 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=16bYmNIfmsyYJ0lEgsR9szTb9ryMYRuxQWpYgPxuHdg=; b=ctr1+Rgh8vv0uP4a2Mfz877LEIeR66S3jk4q75gvhjOb5WSsSFTWo4uHJLBBgU+Pj+wkeR TOgQzpFmlfZrATwOibygI47g5eCQobVTx0r2PcmVDfZastEnNp6noijj7SBqolJrj1iGrI dgbWCfdx5RxRda32OXXvSvtE2lyoJkHRfGrjfpKCUrHwjDVxcUDo4DuYTsceyBVpJDOyNu JvuMCIFXYnU8tZ7i/nd9JRgFsi//9od+5OcXctlQzgbe16TXMED1xHm3+npRrkWzZkdIof 09qsAESmJ05w9zckwYAJeFS5i+EcPMZuYdaB74QLg0iUY4s5DF6Cu/M1Rd7z1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703631; a=rsa-sha256; cv=none; b=wVKuP+GLBFvQzOaMaMDihvLkKdWSDPSaUWdHKeqQpIr+5+7AThGc3m00QAu5SnSvRrPtOo B+Qr2Ps7rxR+1nvhSdkUTxnljpnIIA9lTBGRupGSU0vOLjwQHs8s1ZhehkBV+A3nBTDnc+ Aaz0TAAfhF7A4kkJdVfgxnFSw5hY2OTPGeCYhxVL/hGm4s5kBIAIALTlBKrFBvqIeaGP8q r3bg7Fbzl5VhIs2vw/bAMdscTQDCqg+65dAyMQWBjwOud6FoEoDRXIvhcVbEo9M9NXkNCb rt4Icx/C1sAF2OICbxm6apw/GSPRM+caTW7j18jJ55puP2OgPrX+cPV3QCuH+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=1694703631; 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=16bYmNIfmsyYJ0lEgsR9szTb9ryMYRuxQWpYgPxuHdg=; b=j1ZE31iG6xEbgfYm2QVnkjfrltMVvAzVX0JVz+wIRb6CDMYXJeI/H/lHudt5FZd/4Ir74A ykvjUbbush1zE3iXodzOUIgRd3U54aR9+vtC69qAGNpvMWNvshFYs1NEaWORKaqZSB0KUl X9y0MOZd24s/OAwNNVbv3HVaXLrEarJI0IdTLf/MlaLwnP+x90qUt7bg6chfRGfoNUroVB zuAVaEO0dx8dq+Yw6gwiDll7xxYHEbFlDcsIKNMnPnqws5QfWsqN9FWwIP+olPrIrTqhBa Net+huVc7G1qVLICAbbMgrajx8W+er9EEmZo9KR03ZeIK/5XODHM6lotOLR0DQ== 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 4RmgVR13WNz11wX; Thu, 14 Sep 2023 15:00:31 +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 38EF0VTX089438; Thu, 14 Sep 2023 15:00:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0Vkc089435; Thu, 14 Sep 2023 15:00:31 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:31 GMT Message-Id: <202309141500.38EF0Vkc089435@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: a721afaf8543 - stable/13 - split: Update synopsis and usage; fix examples 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: a721afaf85437708ae45a5b3baaa6915f0f1aba0 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a721afaf85437708ae45a5b3baaa6915f0f1aba0 commit a721afaf85437708ae45a5b3baaa6915f0f1aba0 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-04-14 11:50:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 split: Update synopsis and usage; fix examples - Mark -d as an optional flag - Add a prompt to one of the examples for consistency - Add -d to the usage message Sponsored by: Klara Inc. (cherry picked from commit fb499259997c0bfd724b7b67578035cd977ef60f) --- usr.bin/split/split.1 | 12 ++++++------ usr.bin/split/split.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1 index 55f9e4f65234..6dba7489a83d 100644 --- a/usr.bin/split/split.1 +++ b/usr.bin/split/split.1 @@ -27,7 +27,7 @@ .\" .\" @(#)split.1 8.3 (Berkeley) 4/16/94 .\" -.Dd October 25, 2022 +.Dd April 18, 2023 .Dt SPLIT 1 .Os .Sh NAME @@ -35,12 +35,12 @@ .Nd split a file into pieces .Sh SYNOPSIS .Nm -.Fl d +.Op Fl d .Op Fl l Ar line_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Fl d +.Op Fl d .Fl b Ar byte_count Ns .Oo .Sm off @@ -50,12 +50,12 @@ .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Fl d +.Op Fl d .Fl n Ar chunk_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Fl d +.Op Fl d .Fl p Ar pattern .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix @@ -185,7 +185,7 @@ $ echo -e "This is 22 bytes long" | split -d -b10 .Pp Split input generating 6 files: .Bd -literal -offset indent -echo -e "This is 22 bytes long" | split -n 6 +$ echo -e "This is 22 bytes long" | split -n 6 .Ed .Pp Split input creating a new file every time a line matches the regular expression diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 96cad28cb1e5..29ee0581d071 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -393,9 +393,9 @@ static void usage(void) { (void)fprintf(stderr, -"usage: split [-l line_count] [-a suffix_length] [file [prefix]]\n" -" split -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" -" split -n chunk_count [-a suffix_length] [file [prefix]]\n" -" split -p pattern [-a suffix_length] [file [prefix]]\n"); +"usage: split [-d] [-l line_count] [-a suffix_length] [file [prefix]]\n" +" split [-d] -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" +" split [-d] -n chunk_count [-a suffix_length] [file [prefix]]\n" +" split [-d] -p pattern [-a suffix_length] [file [prefix]]\n"); exit(EX_USAGE); } From nobody Thu Sep 14 15:00:32 2023 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 4RmgVS3Yzxz4sbCV; Thu, 14 Sep 2023 15:00:32 +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 4RmgVS32Kxz4WBk; Thu, 14 Sep 2023 15:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703632; 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=yNhSYxFr9w6dRPCoMuNM985irtgcMiuysVL0H1afS1M=; b=ppp9yxIijrUrCGIVx/nLupE2FtCotwHul3yY9kipuuvKHxPv7JwgDSp1Et+SaPzJ1Lo1F1 Ow04lvh7jxcA5oj96dQDXe6XjOwBRdKSNvDTdmqtJzsFOfMYjvhST65YkGzm61eeSAlNq1 JS1/wYUBJg2B6cMsxds/3s2aTPaE1ODlT90JhQK/gsTleqBuxcAa4em6P0pJ2v2ndTRq26 eUIU2vVBvwaabkrSeTZFvPVFy246uM0nmOZ1AQomnrzLA2OcI6HQZCLONNkQxMnfe/aQzW KhLVzBlmrIWRxWGIw2wmx/OAXNXcqTUfw6HeV9NQSL7Tu8ZS/ujqoe5F7b1x9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703632; a=rsa-sha256; cv=none; b=y0A4GWF4qZtgOsKwj/OchsyaIRLAGRX0EZ679i4D3N6JBLwmIYZVu4r1Khm8YvS3QM5oh/ CDXTGJE5ELgi4BSWPWCJGcgG7vg8tAUfWlrmphnwgcO7PMdyHoEBhKSCVP51QqpMNCoTwD drWz+fQk24L9YA9A409OvreCAxQ9itQaVx+sXgrg4qMt4MdkBuLIMorabvpLjECyv63RzN hhJ19OzXvx6m2kxufb7Su4zZSIq0/ZRseRcfRMvJLsgJ14l6LTF4aNNUHcKd/Rl9Vmi4Bl UjcMT8PDcJAqo0Ww0Y9Uh1ckVJxGqXyDbgk4XQqyKz8Kt/N94BqnBz8hctmMFQ== 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=1694703632; 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=yNhSYxFr9w6dRPCoMuNM985irtgcMiuysVL0H1afS1M=; b=uBaHB6VnoLtl4jiacVtUiU9tcnMDXJOkOrPdo/AG804gu/xbetP7SS0rqWS7shFq87vY3h XTcWbGxz4lL0RQEwjpdWmij4mn4PkbGI2izlm0aUzRD4VGb0o9z67F1uMomoq8BEYjE/OI FJG1mkK+K2dga/a2PGEZfrlVvzo4eTRYJUjUMilSapUt0cgjlkHMJOZj3xu9drSyZ3kslU +dWdw4fnJYV2xv5ntBiCW7/bf/4RSMtWcn+h+IMuIu18Kn5fwjjaxyS45CLNXqAJKxDLqT fhDcwmV2HFI4XQV0FM3Wuvc4CSV/n42mISmZje5kW7aZOvXPzslHMM/1V6cqyw== 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 4RmgVS22x1z11pf; Thu, 14 Sep 2023 15:00:32 +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 38EF0WAX089486; Thu, 14 Sep 2023 15:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0WBX089483; Thu, 14 Sep 2023 15:00:32 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:32 GMT Message-Id: <202309141500.38EF0WBX089483@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: 31ced5c14337 - stable/13 - split(1): auto-extend suffix length if required 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: 31ced5c14337a68a2e6bfde06d6f4cd9a465f218 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=31ced5c14337a68a2e6bfde06d6f4cd9a465f218 commit 31ced5c14337a68a2e6bfde06d6f4cd9a465f218 Author: Jan Schaumann AuthorDate: 2023-05-30 12:55:38 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 split(1): auto-extend suffix length if required If the input cannot be split into the number of files resulting from the default suffix length, automatically extend the suffix length rather than bailing out with 'too many files'. Suffixes are extended such that the resulting files continue to sort lexically and "cat *" would reproduce the input. For example, splitting a 1M lines file into (default) 1000 lines per file would yield files named 'xaa', 'xab', ..., 'xyy', 'xyz', 'xzaaa', 'xzaab', ..., 'xzanl'. If '-a' is specified, the suffix length is not auto-extended. This behavior matches GNU sort(1) since around version 8.16. Reviewed by: christos Approved by: kevans Different Revision: https://reviews.freebsd.org/D38279 (cherry picked from commit c4f7198f47c15eece849d06e8fdd1fb46ed43bba) split(1): add '-c' to continue creating files Currently, split(1) will clobber any existing output files: $ split file; ls xaa xab xac xad $ split second-file; ls xaa xab xac xad xae xaf This patch adds a flag "-c" (mnemonic "create, don't overwrite" or "continue where you left off"): $ split file; ls xaa xab xac xad $ split -c second-file; ls xaa xab xac xad xae xaf xag xah xai xaj Reviewed by: christos Approved by: kevans Different Revision: https://reviews.freebsd.org/D38553 (cherry picked from commit ac17fc816e67a4e5e2e481b5001577a8d589f8b6) --- usr.bin/split/split.1 | 28 ++++++++++++++++++------ usr.bin/split/split.c | 59 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 73 insertions(+), 14 deletions(-) diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1 index 6dba7489a83d..67e3c0cd448b 100644 --- a/usr.bin/split/split.1 +++ b/usr.bin/split/split.1 @@ -27,7 +27,7 @@ .\" .\" @(#)split.1 8.3 (Berkeley) 4/16/94 .\" -.Dd April 18, 2023 +.Dd May 26, 2023 .Dt SPLIT 1 .Os .Sh NAME @@ -35,12 +35,12 @@ .Nd split a file into pieces .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl cd .Op Fl l Ar line_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Op Fl d +.Op Fl cd .Fl b Ar byte_count Ns .Oo .Sm off @@ -50,12 +50,12 @@ .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Op Fl d +.Op Fl cd .Fl n Ar chunk_count .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix .Nm -.Op Fl d +.Op Fl cd .Fl p Ar pattern .Op Fl a Ar suffix_length .Op Ar file Op Ar prefix @@ -111,6 +111,9 @@ or is appended to the number, the file is split into .Ar byte_count gigabyte pieces. +.It Fl c +Continue creating files and do not overwrite existing +output files. .It Fl d Use a numeric suffix instead of a alphabetic suffix. .It Fl l Ar line_count @@ -150,7 +153,11 @@ characters in the range .Dq Li a Ns - Ns Li z . If .Fl a -is not specified, two letters are used as the suffix. +is not specified, two letters are used as the initial suffix. +If the output does not fit into the resulting number of files and the +.Fl d +flag is not specified, then the suffix length is automatically extended as +needed such that all output files continue to sort in lexical order. .Pp If the .Ar prefix @@ -158,6 +165,15 @@ argument is not specified, the file is split into lexically ordered files named with the prefix .Dq Li x and with suffixes as above. +.Pp +By default, +.Nm +will overwrite any existing output files. +If the +.Fl c +flag is specified, +.Nm +will instead create files with names that do not already exist. .Sh ENVIRONMENT The .Ev LANG , LC_ALL , LC_CTYPE diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 29ee0581d071..eeb7d663ecb1 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -65,6 +65,7 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; static off_t bytecnt; /* Byte count to split on. */ static off_t chunks = 0; /* Chunks count to split into. */ +static bool clobber = true; /* Whether to overwrite existing output files. */ static long numlines; /* Line count to split on. */ static int file_open; /* If a file open. */ static int ifd = -1, ofd = -1; /* Input/output file descriptors. */ @@ -73,6 +74,7 @@ static regex_t rgx; static int pflag; static bool dflag; static long sufflen = 2; /* File name suffix length. */ +static int autosfx = 1; /* Whether to auto-extend the suffix length. */ static void newfile(void); static void split1(void); @@ -90,7 +92,7 @@ main(int argc, char **argv) setlocale(LC_ALL, ""); dflag = false; - while ((ch = getopt(argc, argv, "0123456789a:b:dl:n:p:")) != -1) + while ((ch = getopt(argc, argv, "0123456789a:b:cdl:n:p:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -114,6 +116,7 @@ main(int argc, char **argv) if ((sufflen = strtol(optarg, &ep, 10)) <= 0 || *ep) errx(EX_USAGE, "%s: illegal suffix length", optarg); + autosfx = 0; break; case 'b': /* Byte count. */ errno = 0; @@ -121,6 +124,9 @@ main(int argc, char **argv) if (error == -1) errx(EX_USAGE, "%s: offset too large", optarg); break; + case 'c': /* Continue, don't overwrite output files. */ + clobber = false; + break; case 'd': /* Decimal suffix */ dflag = true; break; @@ -343,6 +349,10 @@ newfile(void) static char *fpnt; char beg, end; int pattlen; + int flags = O_WRONLY | O_CREAT | O_TRUNC; + + if (!clobber) + flags |= O_EXCL; if (ofd == -1) { if (fname[0] == '\0') { @@ -351,9 +361,10 @@ newfile(void) } else { fpnt = fname + strlen(fname); } - ofd = fileno(stdout); - } + } else if (close(ofd) != 0) + err(1, "%s", fname); + again: if (dflag) { beg = '0'; end = '9'; @@ -364,6 +375,35 @@ newfile(void) } pattlen = end - beg + 1; + /* + * If '-a' is not specified, then we automatically expand the + * suffix length to accomodate splitting all input. We do this + * by moving the suffix pointer (fpnt) forward and incrementing + * sufflen by one, thereby yielding an additional two characters + * and allowing all output files to sort such that 'cat *' yields + * the input in order. I.e., the order is '... xyy xyz xzaaa + * xzaab ... xzyzy, xzyzz, xzzaaaa, xzzaaab' and so on. + */ + if (!dflag && autosfx && (fpnt[0] == 'y') && + strspn(fpnt+1, "z") == strlen(fpnt+1)) { + fpnt = fname + strlen(fname) - sufflen; + fpnt[sufflen + 2] = '\0'; + fpnt[0] = end; + fpnt[1] = beg; + + /* Basename | Suffix + * before: + * x | yz + * after: + * xz | a.. */ + fpnt++; + sufflen++; + + /* Reset so we start back at all 'a's in our extended suffix. */ + tfnum = 0; + fnum = 0; + } + /* maxfiles = pattlen^sufflen, but don't use libm. */ for (maxfiles = 1, i = 0; i < sufflen; i++) if (LONG_MAX / pattlen < maxfiles) @@ -384,8 +424,11 @@ newfile(void) fpnt[sufflen] = '\0'; ++fnum; - if (!freopen(fname, "w", stdout)) + if ((ofd = open(fname, flags, DEFFILEMODE)) < 0) { + if (!clobber && errno == EEXIST) + goto again; err(EX_IOERR, "%s", fname); + } file_open = 1; } @@ -393,9 +436,9 @@ static void usage(void) { (void)fprintf(stderr, -"usage: split [-d] [-l line_count] [-a suffix_length] [file [prefix]]\n" -" split [-d] -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" -" split [-d] -n chunk_count [-a suffix_length] [file [prefix]]\n" -" split [-d] -p pattern [-a suffix_length] [file [prefix]]\n"); +"usage: split [-cd] [-l line_count] [-a suffix_length] [file [prefix]]\n" +" split [-cd] -b byte_count[K|k|M|m|G|g] [-a suffix_length] [file [prefix]]\n" +" split [-cd] -n chunk_count [-a suffix_length] [file [prefix]]\n" +" split [-cd] -p pattern [-a suffix_length] [file [prefix]]\n"); exit(EX_USAGE); } From nobody Thu Sep 14 15:00:33 2023 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 4RmgVT4tJ6z4sZxP; Thu, 14 Sep 2023 15:00: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 4RmgVT4LmZz4WZ9; Thu, 14 Sep 2023 15:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703633; 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=ndNhmmanG+VUABC5Y8OVoExDpQMKOvHSGIsu8zXqomU=; b=w5mb4Ug+z+cPRVHWRK1eGz+QooLdew2oRFaDWXiEqqM10XPvoz9ELg+brHXgkIdnJBI7Ea V6/DS55ORKHdMzVz3x/EXhCklKm2DRMpDN0kGmNeDXcr+cY1RoyMwvRMTy9qytRav4jxw5 dzA0BL+2TpSLLwbECF4LhgnunRy1sUrEdlVX5QFQmLaiIDq49e9/0ykOAgP1v+IipSPivt g2cVquOGpv7apmtB0/oFnnYSLF5BBXBrxiD4x3ZaP917PEk8FUIpKT5OfyMuUp2c0pL2/Y 14XTiXqA7SBT80pNo7DS5ilXPZBUE/EIbydKagz79T7pIkP7AOk/uEzLdiknPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703633; a=rsa-sha256; cv=none; b=SjXttP3JLfImP+mq1exWoYXKZowem+YPUeI3gmRAjQHN/0fcoXGFgHMTgDoez5VN1JGDbs i3TD/qkIRmm8dKhql4Og5SBOnHEawXljmx/IAN251V+Enwbaa37vKl8VV7Xqg86Izvag9l lQ82taM6jrQ4Tq+4SeJdre8eAt7UWlwALkcmTA/Cu6LnE4ettvCAo78opqiR4ZvH/10qst vEKfuhG2Yg4YVmram0A26BSkGY9cWMWiIuwmvL58SHCkDcOca8BgnXDina/3car2k6hRkK S0jIeXZOqPLgagcfPNuBgre6CtpgNmlc6nI+SaXMOmloyehQwc9qVX7X+v62rg== 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=1694703633; 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=ndNhmmanG+VUABC5Y8OVoExDpQMKOvHSGIsu8zXqomU=; b=ZDoGKokGok69Aipb/S3kVHaCJBjnezZzihzSwee+Rbk3zsD+o+MV+u5igc9O+n11b+hBW7 CyKTHl/g5lpxiCAYDk/hvVyr38X/i1KgmoD7HfFTNSkbJqop1JGXz5BXRxYopEFWu7zQzU lVUQdjvrFEjQQMKW8k25bEg4Jv5X/PXf/OGGy0PlHnUdUM3yEIRn5a/pLzKob6P2tdrGBt q76st862A/YdDP//Qam2NH1xAqLH63qepv7RvECp9VhiIIrvsCJ9CaT5Spk4hGq53DieR+ 1zAlsrwq6Jlzu4tlJlGQmHWMUDvaOSrgiPNvuZ1AWjTxNK9p1ysy3xiDlFXuWw== 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 4RmgVT3CWdz11dk; Thu, 14 Sep 2023 15:00: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 38EF0XvU089552; Thu, 14 Sep 2023 15:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0X01089549; Thu, 14 Sep 2023 15:00:33 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:33 GMT Message-Id: <202309141500.38EF0X01089549@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: 9dcbb9e681d7 - stable/13 - Mark usage function as __dead2 in programs where it does not 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9dcbb9e681d70bbe6bab093ddea60bd8687f2c4c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9dcbb9e681d70bbe6bab093ddea60bd8687f2c4c commit 9dcbb9e681d70bbe6bab093ddea60bd8687f2c4c Author: Alfonso Gregory AuthorDate: 2023-07-07 16:39:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 Mark usage function as __dead2 in programs where it does not return In most cases, usage does not return, so mark them as __dead2. For the cases where they do return, they have not been marked __dead2. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/735 (cherry picked from commit cccdaf507eee8fb34494b4624eb85bb951e323c8) --- usr.bin/script/script.c | 2 +- usr.bin/sed/main.c | 2 +- usr.bin/showmount/showmount.c | 2 +- usr.bin/split/split.c | 2 +- usr.bin/tail/tail.c | 2 +- usr.bin/tee/tee.c | 2 +- usr.bin/time/time.c | 2 +- usr.bin/tr/tr.c | 2 +- usr.bin/tty/tty.c | 2 +- usr.bin/ul/ul.c | 2 +- usr.bin/uname/uname.c | 2 +- usr.bin/unexpand/unexpand.c | 2 +- usr.bin/usbhidctl/usbhid.c | 2 +- usr.bin/wall/wall.c | 2 +- usr.bin/what/what.c | 2 +- usr.bin/whois/whois.c | 2 +- usr.bin/write/write.c | 2 +- usr.bin/xstr/xstr.c | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 7ed54674c03d..b3a1869fcb42 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -101,7 +101,7 @@ static void finish(void); static void record(FILE *, char *, size_t, int); static void consume(FILE *, off_t, char *, int); static void playback(FILE *) __dead2; -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 0b764a7dca21..efa28b5e7239 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -119,7 +119,7 @@ u_long linenum; static void add_compunit(enum e_cut, char *); static void add_file(char *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c index fbd1c9bbbe3c..d2b9f46792ba 100644 --- a/usr.bin/showmount/showmount.c +++ b/usr.bin/showmount/showmount.c @@ -97,7 +97,7 @@ static struct exportslist *exportslist; static int type = 0; void print_dump(struct mountlist *); -static void usage(void); +static void usage(void) __dead2; int xdr_mntdump(XDR *, struct mountlist **); int xdr_exportslist(XDR *, struct exportslist **); int tcp_callrpc(const char *host, int prognum, int versnum, int procnum, diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index eeb7d663ecb1..b5a457ab6ecd 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -80,7 +80,7 @@ static void newfile(void); static void split1(void); static void split2(void); static void split3(void); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index 9e63353f9b40..5babd89135ca 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -65,7 +65,7 @@ int Fflag, fflag, qflag, rflag, rval, no_files; fileargs_t *fa; static void obsolete(char **); -static void usage(void); +static void usage(void) __dead2; static const struct option long_opts[] = { diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c index b55aa84d2f63..63f2ed5ca863 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -65,7 +65,7 @@ typedef struct _list { static LIST *head; static void add(int, const char *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index 9121b1f14408..64063212170d 100644 --- a/usr.bin/time/time.c +++ b/usr.bin/time/time.c @@ -66,7 +66,7 @@ static void humantime(FILE *, long, long); static void showtime(FILE *, struct timespec *, struct timespec *, struct rusage *); static void siginfo(int); -static void usage(void); +static void usage(void) __dead2; static sig_atomic_t siginfo_recvd; static char decimal_point; diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 4bd52fae1a08..75638d6b3bc6 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -64,7 +64,7 @@ static STR s1 = { STRING1, NORMAL, 0, OOBCH, 0, { 0, OOBCH }, NULL, NULL }; static STR s2 = { STRING2, NORMAL, 0, OOBCH, 0, { 0, OOBCH }, NULL, NULL }; static struct cset *setup(char *, STR *, int, int); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c index ac3249d35ff2..945e62cc6f3a 100644 --- a/usr.bin/tty/tty.c +++ b/usr.bin/tty/tty.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93"; #include #include -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c index 14b1d87905d2..07a796ffd55b 100644 --- a/usr.bin/ul/ul.c +++ b/usr.bin/ul/ul.c @@ -89,7 +89,7 @@ static int halfpos; static int upln; static int iflag; -static void usage(void); +static void usage(void) __dead2; static void setnewmode(int); static void initcap(void); static void reverse(void); diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c index 981d08a7a7c0..fc1f34a3e3c6 100644 --- a/usr.bin/uname/uname.c +++ b/usr.bin/uname/uname.c @@ -82,7 +82,7 @@ static void native_uservers(void); static void native_buildid(void); static void print_uname(u_int); static void setup_get(void); -static void usage(void); +static void usage(void) __dead2; static char *buildid, *ident, *platform, *hostname, *arch, *release, *sysname, *version, *kernvers, *uservers; diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c index 116c4e02af4c..6dcfc497d6e8 100644 --- a/usr.bin/unexpand/unexpand.c +++ b/usr.bin/unexpand/unexpand.c @@ -59,7 +59,7 @@ static int nstops; static int tabstops[100]; static void getstops(const char *); -static void usage(void); +static void usage(void) __dead2; static int tabify(const char *); int diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c index 5226958da3eb..dbb05030e908 100644 --- a/usr.bin/usbhidctl/usbhid.c +++ b/usr.bin/usbhidctl/usbhid.c @@ -57,7 +57,7 @@ static int hexdump = 0; static int wflag = 0; static int zflag = 0; -static void usage(void); +static void usage(void) __dead2; static void dumpitem(const char *label, struct hid_item *h); static void dumpitems(report_desc_t r); static void prdata(u_char *buf, struct hid_item *h); diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index 992bc9f77b22..335f83623576 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -67,7 +67,7 @@ static const char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93"; #include "ttymsg.h" static void makemsg(char *); -static void usage(void); +static void usage(void) __dead2; static struct wallgroup { struct wallgroup *next; diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c index 5cd6a85f35bf..1829a6b055b2 100644 --- a/usr.bin/what/what.c +++ b/usr.bin/what/what.c @@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93"; #include #include -static void usage(void); +static void usage(void) __dead2; static bool search(bool, bool, FILE *); int diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index 9af40a6b998c..13b9c7d13aef 100644 --- a/usr.bin/whois/whois.c +++ b/usr.bin/whois/whois.c @@ -157,7 +157,7 @@ static const char *port = DEFAULT_PORT; static const char *choose_server(char *); static struct addrinfo *gethostinfo(const char *, const char *, int); static void s_asprintf(char **ret, const char *format, ...) __printflike(2, 3); -static void usage(void); +static void usage(void) __dead2; static void whois(const char *, const char *, const char *, int); int diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c index c0973c1ca58c..b5f484dcdf27 100644 --- a/usr.bin/write/write.c +++ b/usr.bin/write/write.c @@ -69,7 +69,7 @@ static char sccsid[] = "@(#)write.c 8.1 (Berkeley) 6/6/93"; void done(int); void do_write(int, char *, char *, const char *); -static void usage(void); +static void usage(void) __dead2; int term_chk(int, char *, int *, time_t *, int); void wr_fputs(wchar_t *s); void search_utmp(int, char *, char *, char *, uid_t); diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c index b1a5bf58ae01..880fc1583542 100644 --- a/usr.bin/xstr/xstr.c +++ b/usr.bin/xstr/xstr.c @@ -81,7 +81,7 @@ static int xgetc(FILE *); static off_t hashit(char *, int); static off_t yankstr(char **); -static void usage(void); +static void usage(void) __dead2; static void flushsh(void); static void found(int, off_t, char *); From nobody Thu Sep 14 15:00:34 2023 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 4RmgVV6mMMz4sbCY; Thu, 14 Sep 2023 15:00:34 +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 4RmgVV5LW3z4WTt; Thu, 14 Sep 2023 15:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703634; 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=obhor7Xq6yHVwil8PqMXFrK6QJVSkUj/vw9t39JqAUI=; b=h/PtT7DjKs/hJc2yuxg9IzGOdwubH8xlFMId/wdyeMK/0u/eqDrVGL6dit0z42EmVHD8WV K/0YCP1ptVkheDxm7y08BpGqPnHkA3RS2uSKoslPn7dq5jpTZLPFemaLBhFJ97BCmVN7Xv m6NKdXnMvMNa371qaKITb3zv3xxcOJIVCrbGvOdHTrsKzp/xk2DpA9aiaJ9jwbYK48M+zR i3tG9LC1Bz4qjPCtZwokhgzhFcF3I4s/P6hcU4o4wIBU7Zdv9Vhx+JUZwDuexw7L/+TGfy Q0CvBgHufyv9qXP2cLnRglS3o3s63NmMBJ35G2IplkDSRVNu3FWilpfCxiNcRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703634; a=rsa-sha256; cv=none; b=YAggUVf/j/pRqHaBkMZJCVd+vLWNR+uKUvaeOc+A09tojbGwNXPSiGNboJaCqkcre2lxo1 zYjdI8FwkV0+Km+wQ3Eg1poiovvuQ1LtvBX15SS0Icp5/wpTt1vHYW/j6zRiBeXA2nXoM+ ccgnwjenGlmYR1ynJqW4T6ncVTvn/twTH/mBtm8e23obHt+8zy0DMTdny7TMvMCr8snPy1 d56LMNMFdQ+oTkE8UW6RsasEaN6HvoD0Dzw4zbWr3cMcWnpZjncqvUgM4MIkwcCGw7kH1p UlyUhN7XhcIR8zQB9HeAeag+9mjmjMvMVhBaJuAkkGE4A/wR9ViN95MZdrOdhw== 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=1694703634; 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=obhor7Xq6yHVwil8PqMXFrK6QJVSkUj/vw9t39JqAUI=; b=ZkOw3WClWTm/YNdf6Lw90OOdvKN4OdkEQ/WqnBknG5UyX9ofYLIsmULTdi38/UPENaIwzL m3o59bZtvA29m27agHFinotNWGv5VtivbUU4/Ymg0WCDI/gQf+w0JKUryKtaf4kNLaBj0m qmbPMJlUdliHk34WX1wFi0u+D6OZmKvlWBYlr/jcQgG2k4FrFJ7s0K9y36OGyDG9e/wo+6 TITUYvj7ElTfhODYyFV/ikGfmRjFOJWXMDWIkKF9pyLYHUKDF0VxYbMOWmiH27yhq9rkM5 RHeFbFVy3JLdiXenKQ2b7p9L/CNjcGZTuUD4oOXjcAvv/aasKMkhy40vf2JCFg== 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 4RmgVV4RqGz11c6; Thu, 14 Sep 2023 15:00:34 +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 38EF0YaG089597; Thu, 14 Sep 2023 15:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0YBU089594; Thu, 14 Sep 2023 15:00:34 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:34 GMT Message-Id: <202309141500.38EF0YBU089594@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: e035e58097ae - stable/13 - split: Add missing test cases. 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: e035e58097ae6e7fbdf4934c65752baf3f6ab7d3 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e035e58097ae6e7fbdf4934c65752baf3f6ab7d3 commit e035e58097ae6e7fbdf4934c65752baf3f6ab7d3 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 03:28:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 split: Add missing test cases. This adds test cases for c4f7198f47c1 and ac17fc816e67. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41755 (cherry picked from commit cbea5eddb1b6ae2a101beacf00bf165517f4f2b1) split: Code cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41756 (cherry picked from commit 851bf856d1a7ad5427ea9c22639ab6f6c4a3f503) split: Fix linecount parsing. The “undocumented kludge” which unfortunately can't be dropped for backward compatibility reasons was prone to segfaulting and would improperly allow a new linecount when one was already set. Fix these issues and add regression tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41757 (cherry picked from commit 117c54a78ccd214c236806721f21da750e512d3e) --- usr.bin/split/split.c | 45 ++++++++++++++++++++------------------- usr.bin/split/tests/split_test.sh | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index b5a457ab6ecd..af1ed69c9482 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -41,7 +41,6 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; #endif #include -#include #include #include @@ -85,14 +84,14 @@ static void usage(void) __dead2; int main(int argc, char **argv) { - int ch; - int error; - char *ep, *p; + const char *p; + char *ep; + int ch, error; setlocale(LC_ALL, ""); dflag = false; - while ((ch = getopt(argc, argv, "0123456789a:b:cdl:n:p:")) != -1) + while ((ch = getopt(argc, argv, "0::1::2::3::4::5::6::7::8::9::a:b:cdl:n:p:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -100,17 +99,15 @@ main(int argc, char **argv) * Undocumented kludge: split was originally designed * to take a number after a dash. */ - if (numlines == 0) { - p = argv[optind - 1]; - if (p[0] == '-' && p[1] == ch && !p[2]) - numlines = strtol(++p, &ep, 10); - else - numlines = - strtol(argv[optind] + 1, &ep, 10); - if (numlines <= 0 || *ep) - errx(EX_USAGE, - "%s: illegal line count", optarg); - } + if (numlines != 0) + usage(); + numlines = ch - '0'; + p = optarg ? optarg : ""; + while (numlines >= 0 && *p >= '0' && *p <= '9') + numlines = numlines * 10 + *p++ - '0'; + if (numlines <= 0 || *p != '\0') + errx(EX_USAGE, "%c%s: illegal line count", ch, + optarg ? optarg : ""); break; case 'a': /* Suffix length */ if ((sufflen = strtol(optarg, &ep, 10)) <= 0 || *ep) @@ -157,17 +154,22 @@ main(int argc, char **argv) argv += optind; argc -= optind; - if (*argv != NULL) { /* Input file. */ + if (argc > 0) { /* Input file. */ if (strcmp(*argv, "-") == 0) ifd = STDIN_FILENO; else if ((ifd = open(*argv, O_RDONLY, 0)) < 0) err(EX_NOINPUT, "%s", *argv); ++argv; + --argc; + } + if (argc > 0) { /* File name prefix. */ + if (strlcpy(fname, *argv, sizeof(fname)) >= sizeof(fname)) + errx(EX_USAGE, "file name prefix is too long: %s", + *argv); + ++argv; + --argc; } - if (*argv != NULL) /* File name prefix. */ - if (strlcpy(fname, *argv++, sizeof(fname)) >= sizeof(fname)) - errx(EX_USAGE, "file name prefix is too long"); - if (*argv != NULL) + if (argc > 0) usage(); if (strlen(fname) + (unsigned long)sufflen >= sizeof(fname)) @@ -400,7 +402,6 @@ newfile(void) sufflen++; /* Reset so we start back at all 'a's in our extended suffix. */ - tfnum = 0; fnum = 0; } diff --git a/usr.bin/split/tests/split_test.sh b/usr.bin/split/tests/split_test.sh index 899fd028e74b..c9b87c01618c 100755 --- a/usr.bin/split/tests/split_test.sh +++ b/usr.bin/split/tests/split_test.sh @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2022 Klara Systems +# Copyright (c) 2022-2023 Klara Systems # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -200,6 +200,45 @@ EOF atf_check -o file:foo-ab cat split-ab } +atf_test_case autoextend +autoextend_body() +{ + seq $((26*25+1)) >input + atf_check split -l1 input + atf_check -o inline:"$((26*25))\n" cat xyz + atf_check -o inline:"$((26*25+1))\n" cat xzaaa +} + +atf_test_case continue +continue_body() +{ + echo hello >input + atf_check split input + atf_check -o file:input cat xaa + atf_check -s exit:1 -e ignore cat xab + atf_check split -c input + atf_check -o file:input cat xab +} + +atf_test_case undocumented_kludge +undocumented_kludge_body() +{ + seq 5000 >input + atf_check split -1000 input + atf_check -o file:xae seq 4001 5000 + atf_check split -d1000 input + atf_check -o file:x04 seq 4001 5000 +} + +atf_test_case duplicate_linecount +duplicate_linecount_body() +{ + atf_check -s exit:64 -e ignore split -5 -5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -5 /dev/null + atf_check -s exit:64 -e ignore split -5 -l5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -l5 /dev/null +} + atf_init_test_cases() { atf_add_test_case bytes @@ -209,4 +248,8 @@ atf_init_test_cases() atf_add_test_case numeric_suffix atf_add_test_case larger_suffix_length atf_add_test_case pattern + atf_add_test_case autoextend + atf_add_test_case continue + atf_add_test_case undocumented_kludge + atf_add_test_case duplicate_linecount } From nobody Thu Sep 14 15:00:35 2023 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 4RmgVX0s7tz4sb12; Thu, 14 Sep 2023 15:00:36 +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 4RmgVW62ksz4WQ1; Thu, 14 Sep 2023 15:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703635; 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=v38Ne2h2zZDH8Y3Dn4lZwrOqPy0fUaxksuJvt/2xWZo=; b=jdqcNBQeNiNb0jfVRiIkeFbY/5pAqJaSoinH3qulO1MbeqsdpaTqMYxrHLOG3qmSETLpqN m7BNjvc3/QBRI8w4I9oDq56MMyOIuT2/Iva8ax+kyYFbDATWMywIB9V9+f6Ucn7xTc+XMC CxUU3GGHYWl2NhR6hIVFYWNtrY180ts9mXylu8K1dGGv/lut+er6zReJU/th6HYoBCSSIR wE6B7UWEyVDtb58r26lhhiYwGVk8yOb9tBezJniUMgfDa4xD0zhnpuzYyiaOC+GJbE9XTv ZiZiiYR+E8M4LegbLPGuOHRbHMBuEmgrWydFTUXPmtsRt9Lq4LosBD+6y9reUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703635; a=rsa-sha256; cv=none; b=yTogtMgOrrufZGqPlKMWhDSsuYk5HJ8llRxG3OnM3vpX3WHXCllaUuhe7ZDeeBLnwJtEJ3 6mGHLhOSKlK6KNxLYNP+uxivogr/QKt18rKt6HlhhGzPgb3g5b0Q8ZqQkhFyPC43fkBsUP TxhIN6dTVzUjAtBwimSMs1505C6qIsSmad8W5ATCuLpaWOMDCNdD21YHHxKcV7n0DkD5Jt uWtwni2JZ1LlGE65a03/Ab3Y9Sr5QATQvq6rHwb+Wek7GWKzahzZsN3nyG1AjxxTTI51FA xhNAnlnDwIputmZ+MsvFDFO3BnIK9UzwUSEf85E7RhKmKozSUL3UKc3QGkC9tQ== 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=1694703635; 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=v38Ne2h2zZDH8Y3Dn4lZwrOqPy0fUaxksuJvt/2xWZo=; b=VNb+yCKWgoiDDSOClbwrWtxy2zu0K/otOJHqq3OWuz9+4o+RDtR/x5AqPf8e4LQnxT24H7 eGCJZAZ/uLMiPnEabQOqyjhJnYs7Calk7j33Q4g0o0vTZ9qLAkXl+ueF/IPtk2oHPj4qES 7o1LQzv0QtbTgHCPKGqb8Q6sxGfLvnXmGrTmzpihzb5E8cYb+tLg5uqxGQVJ/QBOOno/ch /zA7O5rjroM2+bYz50w50FLoqr1AOefC3dEyHwdiM6/gVMom39Z1zlkI280UTcv+9RgHqx rjquay71H5+kKs96YQHT+9npHoEqbZeS03Qc8ynfDvSOq/yf5WjZdPWndbeOYQ== 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 4RmgVW52gnz1206; Thu, 14 Sep 2023 15:00: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 38EF0ZRR089663; Thu, 14 Sep 2023 15:00:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0ZEh089660; Thu, 14 Sep 2023 15:00:35 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:35 GMT Message-Id: <202309141500.38EF0ZEh089660@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: 8444b3642001 - stable/13 - time.h: Fix visibility check for C11 and C23 features. 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: 8444b3642001a915c1a22ea3cefbaaf0c54b2e85 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8444b3642001a915c1a22ea3cefbaaf0c54b2e85 commit 8444b3642001a915c1a22ea3cefbaaf0c54b2e85 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 01:37:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 time.h: Fix visibility check for C11 and C23 features. __BSD_VISIBLE is always defined; we need to check if it's true. Fixes: d02489d11aed 9b5d724cad10 MFC after: 3 days Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D41733 (cherry picked from commit 8091b82e291642f3034dc3fdc8689a4f4ba027da) --- include/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 0a7877f3c7a1..45d3a253ed61 100644 --- a/include/time.h +++ b/include/time.h @@ -180,7 +180,7 @@ time_t posix2time(time_t t); #include #endif -#if defined(__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2011 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:201x 7.27.2.5 The timespec_get function */ From nobody Thu Sep 14 15:00:36 2023 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 4RmgVY0KyBz4sZxc; Thu, 14 Sep 2023 15:00:37 +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 4RmgVX6pn1z4Wbm; Thu, 14 Sep 2023 15:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703637; 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=hH3tGFqpQMOQ3GyvmMJwySzlOgYY2aTy4esKefrbWKs=; b=hbIrwDG6osFprJtVreWJXlpYGKs6f4HCGTDO7B8+sDoj8YWN7jBLz9TKwNrwq8vNY4gu4g TY7ekjscT6tgRBFIRGuYQCGgunlzeP9tYReii8bazUnmwmzUsmoF/k5kCrDMBT24tfb9RQ 9S2we4seP4HXr/SHdXRbiACzAL91DBPr2ljd1uZR48KMgtyl1g/63ylAd8Jc42qrhzbHO8 HwraaSV1+DsRKd8XGEOQhbMfhA64zWhGKHnNzwcCaTbZMj+gIKGn50J3egEam/E0tFfkLX EiWnJ9OAZ2GLYlxxfuZzaYd7iQEHXM/DLFwqSf3g2rM6yN8cmb/fuZpGDWnYGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703637; a=rsa-sha256; cv=none; b=M7zKe5C90RB13kf3poMlxMjvSFz1L1nv4ZYqRxq4Y0+4malAyPV388ZVDxpXlfNXAqc/Uk fz4bibKTTdQVaW8f9Nq0Hboi2+SViQ7rMI0UDsLVYC66MjKES+wNFRMr6sXfvvmORYNxHg HnZPPyASgKl3TCYrudZ2lDlT8kGRjcEZdlu3AcSyoZzdoHsDNTuyQdU4PNXu0tigD8zi1k PYH5ZZthUJfeSU0ZGv4op8LZKOlbn6OHjIXWqRUokaZVFsvqmo/hYR6WFNMStp3kTJG0x5 0D+JTyy2Sh6sckOEunKfyjbvZUTb8TXzGSCtRU5VppVBR4Li+nfXV0eamSC6vQ== 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=1694703637; 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=hH3tGFqpQMOQ3GyvmMJwySzlOgYY2aTy4esKefrbWKs=; b=VTSRgU5Pod+XbqJSCLXBahAOTlkhykfuCnqYhbVPoXyvIiFTU2zxmN9b7H32xAsGxx6kxk Fb3S43f1jt7gi9GkloWWrJzO+pcPmKLcdME1Xinhb1DvuaI1wTGdXNvCVv4X8gqTWjCXiK NieiD7f1VgSca6te9mdPU7/sw0F0XAc6gsi1Y2mv7sA8JeYLesORMRdV2SJ31g8GAZy88q zbmqwrscwE9Br0KCQIxpz7pApJe4cSy2tcEws1g2FMUIQmeyv2Ac5IWG/JQpH86SswLvTR j+b3LdNgVEcDY/cSbIhJrNd/qfDXhVKxk4I6Y0lL6Iyxvqfs4JzcohTQcHQklg== 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 4RmgVX5vgZz1207; Thu, 14 Sep 2023 15:00:36 +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 38EF0a4Z089710; Thu, 14 Sep 2023 15:00:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0aKW089707; Thu, 14 Sep 2023 15:00:36 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:36 GMT Message-Id: <202309141500.38EF0aKW089707@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: 03f654e953f3 - stable/13 - grep: Suppress EISDIR when reading. 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: 03f654e953f3f1e1e0e7765318a05e36492bd163 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=03f654e953f3f1e1e0e7765318a05e36492bd163 commit 03f654e953f3f1e1e0e7765318a05e36492bd163 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans (cherry picked from commit caf5283fc92edb83173752b1dafbc6d586e78815) --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index 2845f0ec225d..804d75b82484 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1); From nobody Thu Sep 14 15:00:37 2023 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 4RmgVZ1KPxz4sbJC; Thu, 14 Sep 2023 15:00: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 4RmgVZ0bMLz4WsB; Thu, 14 Sep 2023 15:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703638; 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=G9CR5J37o+1Ku1n7PBGjmIe6yRP9zK9dXye8oit4TIA=; b=ewijx7BnhgDEU6h2MSq1w3eHZeBKq81Sm4vIZ6BStNBOI1B5Lm1emfk9LSBk4S2GcIUIJO VnAUi6CwXc6AbvL4uV5JTTVi98XmPEtKqh9OfUzkcxmVLDvBKA4l3QW0pxdKiQqas4as6S ynk0SOCGYbcCFH2642IjY/bPLL88beEsD1+toDe6yePexbpcj2dsX4z43mjHAn31TwEoOs EABDpGYBpepU0qsGeqvUDp7pGmjTXggYVW8MDG25zFpjWurLCh6dNcH9ULgeFFzdzSygIl oD1qOeHPH3/8GukHtQpdYqF4uGxOKEyIpvQ5U7HDBWUuRffUkWNNwAoU5KWlPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703638; a=rsa-sha256; cv=none; b=W4DLmrGafpsHizCt1vZdkgjP8aX/XWQUr9H8oDpnUQDIUYeZnY6mTsB/VsL/6jhSA2sh+D EIPUx/CD7eEnvSjedHaDQcruhqxE0vlooKyVAiP6u2ZNTl6RzPUfiVHiXG/Jpz6MHcqB1W zmYeIW5nLOSmBPw9QBm7TMgF1Uyo7/qT8xWpF/qESiI+zCJqiMiWGfz8r6XUETHbXBsLW8 CqJGgYoxlVyM5uVhGgRqyUPahg32vn6eh3oKXsV0N4hQI/xsBVPe6ie9P6D+6blV8hhFKH KAjDxKvxGJ1LZ+FrBpSFZQZQzIXWn/rao2dhT2g5vzf6brSBJZUjPRMoKoaayw== 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=1694703638; 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=G9CR5J37o+1Ku1n7PBGjmIe6yRP9zK9dXye8oit4TIA=; b=vZ4X1lWl4QI02elOaOxdCg0761Vkf24979tYdh90xN8DckK7BWBSZMhAD0V3MyS30LoRls 3FH2nSL6jtHs5kFhS/XpqNNKrKHhSeSwqkAlpGjOETfx3AuMLOCIElNpVZvSk1S52ezK+m t5B3KUxEgbTtWtW3EO0NJWX4SdpSOkKPIWCfy5DjDHLGRWAIgYI9yC3KGdSbGnQN23Yvvc kjdBST82sRBreNto6eZgtR2e0T4kxkki8G+WB9o4oaDQfm2ssLAu6HD1j+ykNqjIuMgJ8W m1f4Ar225ahf+f2dNVqKcoMQqAKA9dghOl5xnrATXPYlp1NMsb3cXk13k0oVxQ== 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 4RmgVY6mhxz11c7; Thu, 14 Sep 2023 15:00: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 38EF0b8f089764; Thu, 14 Sep 2023 15:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0bFj089761; Thu, 14 Sep 2023 15:00:37 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:37 GMT Message-Id: <202309141500.38EF0bFj089761@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: f7523720d2ec - stable/13 - mkfile: getopt() returns an int, not a char. 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: f7523720d2eca9287a0bddf9d2233366fa37ae99 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f7523720d2eca9287a0bddf9d2233366fa37ae99 commit f7523720d2eca9287a0bddf9d2233366fa37ae99 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-10 18:33:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 14:59:52 +0000 mkfile: getopt() returns an int, not a char. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41804 (cherry picked from commit ef8abddf103d9dfd5660d50d15e6dbfbb2f47f62) --- tests/sys/cddl/zfs/bin/mkfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/bin/mkfile.c b/tests/sys/cddl/zfs/bin/mkfile.c index b1034b9ca500..c1afdbd61196 100644 --- a/tests/sys/cddl/zfs/bin/mkfile.c +++ b/tests/sys/cddl/zfs/bin/mkfile.c @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { unsigned long long fsize; - char ch; + int ch; /* We have at least 2 arguments. */ if (argc < 3) { From nobody Thu Sep 14 17:16:14 2023 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 4RmkW23kwYz4t9bP; Thu, 14 Sep 2023 17:16: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 4RmkW23HxXz3VCR; Thu, 14 Sep 2023 17:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694711774; 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=NDA37kymjokrtJrv9p//9JEWmvPLCJL9i8KjA1lfzy8=; b=x+g3o+K7UL4bR4Mxo1s+eK+KN9ajvEkC4IIUr+GHBXYlb8bWqgri8HfVQm3ta1O3LIiVXr lb0NVHLWwXYsDfzipHGrvs5h6bHWquwyoyFCM1H3gCBCSFE6J1He9e/QXEo9b8v7+EqrwF 5ycUNsvNCb0baENasY1eqUT/7Z1TUqkoJjDROSEiy1M7LdzWpgKnd2jL3VBh2ldrP6gwWP GJaZVnB0MDrYcVf0VV3shj6N912J5DmWoeDJjCNgizMW8238mWRpNMDVkFdmHeIPOQamTC 1Pzk8iz43jZA7idBJIwtAp8Sv91nx4VqOSiBS73Q6G5eic8bak5A7seET02Y8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694711774; a=rsa-sha256; cv=none; b=JY/dR3WdmO30vqGoaXULjxtNIqUBMWjV/8j/Jijdv5y95nGmECjfmDV4PCFtZe30qWqfgt cgjlSqURL2wB5cETTbfLRE5UBDNbKQNRNzDFYP63umwQLTVDGIjfuTa6i534rz/sB67SRh gBClFghxjK88vgUZ0QVfgjxuSOhmUe64xD3wIL37lKnhDlbmbHQDa7VGZjr4Yke01UshQH LB+CkkZ/kzJI2uSTvVDGIJPlHuM5tMXUDbjxWD0m4w7TbYsQef+EESCcU8UjU8gENpxc8n VeusAyreGCZ5c/kTwhXtOc8AHmKv3EYwD+NO3XeBkdaLDufJRx9fEdG5eUKUAw== 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=1694711774; 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=NDA37kymjokrtJrv9p//9JEWmvPLCJL9i8KjA1lfzy8=; b=mFqvn6h9tovujxRlLZPjw57xrftPhajNtQ7cx9hSN/Xd26TzYttrK9bGXLXiiJw4RKCtvi nAfkozj6UZ5crEPmKD1U9yNklpsALcutpvFT4ObIn3ofLY9TT1MgMP887yXO7O0+lRNDLP hDCpkcGlDW6gw7t0ZWw+TFH1qYsJ1vrsYWurcB5Yvu8dpzKTgs0KYwtIrncARxUEDqCjRp 0Sy+AwdsrW9aTVHNFBee8wBqsk/zqrFAPjWilNafoxH1Q+2eMxYsUoberbk7Q1OcNSqezE aArQXqb8HPYnKI945os4Lp/f/ivUVGYjdycw6Sof0sN2WzgfEIoqhbwlALZLHw== 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 4RmkW22Gcbz14j8; Thu, 14 Sep 2023 17:16: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 38EHGE0Z013426; Thu, 14 Sep 2023 17:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EHGEWC013424; Thu, 14 Sep 2023 17:16:14 GMT (envelope-from git) Date: Thu, 14 Sep 2023 17:16:14 GMT Message-Id: <202309141716.38EHGEWC013424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: d737efcc1c25 - releng/14.0 - MFS jail.conf(5): Fix and expand description of ".include". 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d737efcc1c2582c793be202ed337de2589ff5301 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=d737efcc1c2582c793be202ed337de2589ff5301 commit d737efcc1c2582c793be202ed337de2589ff5301 Author: Jamie Gritton AuthorDate: 2023-09-05 20:35:54 +0000 Commit: Jamie Gritton CommitDate: 2023-09-14 17:15:44 +0000 MFS jail.conf(5): Fix and expand description of ".include". Escape a period that caused a line not to be includesd. Also mention that glob(3) patterns may be included, and a consequence of that. Approved by: re (gjb) PR: 273561 Reported by: crest@rlwinm.de Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41723 (cherry picked from commit 165234d5527440b7755b01554ff7633e33c0d285) (cherry picked from commit 402d5960cb82eaccc33177aac821dbad1b42db1c) --- usr.sbin/jail/jail.conf.5 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5 index 33a66c85e7ea..0b82a972020c 100644 --- a/usr.sbin/jail/jail.conf.5 +++ b/usr.sbin/jail/jail.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Jun 3, 2023 +.Dd September 5, 2023 .Dt JAIL.CONF 5 .Os .Sh NAME @@ -164,11 +164,22 @@ and .Ss Includes A line of the form .Bd -literal -offset ident -.include "filename"; +\&.include "filename"; .Ed .Pp -will include another file in the configuration. The filename must be -a literal string, and cannot contain variable expansions. +will include another file (or files) in the configuration. +The filename should be either absolute, or relative to the +configuration file's directory. It cannot contain variable +expansions, but may contain +.Xr glob 3 +patterns. +.Pp +The included file must exist, though a filename glob may match zero or +more files. This allows inclusion of any/all files in a directory, +such as +.Dq /etc/jail.conf.d/*.conf , +or conditional inclusion of a single file, such as +.Dq jail.foo[.]conf . .Ss Comments The configuration file may contain comments in the common C, C++, and shell formats: From nobody Thu Sep 14 22:02:08 2023 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 4Rmrrw5vMrz4scGx; Thu, 14 Sep 2023 22:02: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 4Rmrrw5cnGz3Jrg; Thu, 14 Sep 2023 22:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694728928; 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=zR8DHK+C7CwGX46U3Qe2eSkfBPuK+7HCtpfmwT05VaU=; b=LCYhnwROqlqgchbjzb0aZSNyDxcn3GijiGNHPni8xO1SLAhj/Tzun4t5/n9qHqTDgxA46Q fqTxT6+U8OzdMgIPPSoePZ4IVQo5W2WfJ5h8bFiP1rsp9plI/b2fejchrJvVWv/PpnZ+XR ATpM10VjP6cTdkOYStsK6lpFboAR0tB8+iaZomieqIgS+l8SmFWXB30YhDg+jfuH5kGX7z NPZhv8RqVLtCeL0pBsoRAonnSRd3VGKTdnP7EizocPpT9Fwnb6N8r5uRi7npEn0tzY73GD S3L34EcNV+SPeqO3rl3CNi7gDxe08VtHj4VDq7rRdWp+wOb0LJpZtFhuuxb1Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694728928; a=rsa-sha256; cv=none; b=c/TmhF1XJLKlEoRF2MAtCDmB0345T5Q6h67ftkkKKdxULhF/AQQYWa3cj+A7a50H/5EBOb o4eZFfBEyBeMP0I8BJVqM5alWFj0cGyrw0M/jvmk9UVS9t3z+tYvajFdw/fTdL0ADlGUDt Ak8MNAvpmGQyQqI52Twhb5y8s8IU3f09Dk3pX6BxMP5ZwcHPgN1BMhz66csn43aUnKgf/D bAA/YSkXAW5a4sqIG+K0OxtbZIdEov7CAxXGfluhn8+z8w/W0ShArGI8unvEeU2X5HsAdY odB9ZXxC/ZTbhz3BtPMs0T9ELIBn5+Lckq1Xs0GZkYKuX/2pOZo/OYhR0MTeRQ== 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=1694728928; 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=zR8DHK+C7CwGX46U3Qe2eSkfBPuK+7HCtpfmwT05VaU=; b=rRzgQotWo0oFMKnnDCJzpCqE8ogyxf8EQ1CK9L7sX2TAelch/r3M9VgcNRfnA7Aa/aNxeq BvPwPXd09wwIykfU9zmQRVyJ8pczLiWpOtF+ORd1P1QbgbLo8dnnCGLUXA3oX605mU4xUh mzgP/t4C+M4NCB1EHidcd8VlxpRuPM2XLiJPcLJXOeyN/s4z7DHt+yzz3DC5NOEAwXoofz l2u/SJ8/4yJeUjiOgENBBrHT/gJ/Yav55l7UUesxu/pADGS2zCPhTWBcdCLqx3aMQ6MOir lMyg9PJgmqZxaA0IILWjfhSL9peBbvqEnGBDTPELrqcQ4DfUhjKLiEryNxFb6w== 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 4Rmrrw4bmXz1D5S; Thu, 14 Sep 2023 22:02:08 +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 38EM28rL089422; Thu, 14 Sep 2023 22:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EM28Uc089419; Thu, 14 Sep 2023 22:02:08 GMT (envelope-from git) Date: Thu, 14 Sep 2023 22:02:08 GMT Message-Id: <202309142202.38EM28Uc089419@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: acdad1f1cb47 - stable/14 - MFC: MFV: file 5.45. 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: acdad1f1cb471aacbd7c372af9a79d6b3467ca93 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=acdad1f1cb471aacbd7c372af9a79d6b3467ca93 commit acdad1f1cb471aacbd7c372af9a79d6b3467ca93 Author: Xin LI AuthorDate: 2023-09-10 19:20:33 +0000 Commit: Xin LI CommitDate: 2023-09-14 22:01:08 +0000 MFC: MFV: file 5.45. (cherry picked from commit 898496ee09ed2b7d25f6807edc4515628196ec0a) Disable byteswap.h for now. (cherry picked from commit 90474518912f5e5f49bc5325b7f88e94eba64d6a) --- contrib/file/ChangeLog | 64 ++- contrib/file/README.md | 3 +- contrib/file/acinclude.m4 | 5 +- contrib/file/config.guess | 2 + contrib/file/config.h.in | 21 + contrib/file/config.sub | 1 + contrib/file/configure | 184 ++++++- contrib/file/configure.ac | 40 +- contrib/file/doc/file.man | 21 +- contrib/file/doc/libmagic.man | 26 +- contrib/file/doc/magic.man | 88 ++-- contrib/file/libmagic.pc.in | 1 + contrib/file/magic/Magdir/algol68 | 12 +- contrib/file/magic/Magdir/android | 52 +- contrib/file/magic/Magdir/animation | 25 +- contrib/file/magic/Magdir/apple | 299 +++++++++-- contrib/file/magic/Magdir/archive | 547 ++++++++++++++++++++- contrib/file/magic/Magdir/arm | 11 +- contrib/file/magic/Magdir/asf | 4 +- contrib/file/magic/Magdir/audio | 17 +- contrib/file/magic/Magdir/blender | 15 +- contrib/file/magic/Magdir/bytecode | 13 +- contrib/file/magic/Magdir/c-lang | 8 +- contrib/file/magic/Magdir/c64 | 357 +++++++++++++- contrib/file/magic/Magdir/cad | 40 +- contrib/file/magic/Magdir/coff | 3 +- contrib/file/magic/Magdir/commands | 18 +- contrib/file/magic/Magdir/compress | 88 +++- contrib/file/magic/Magdir/console | 52 +- contrib/file/magic/Magdir/crypto | 46 +- contrib/file/magic/Magdir/database | 62 ++- contrib/file/magic/Magdir/der | 9 +- contrib/file/magic/Magdir/dsf | 25 - contrib/file/magic/Magdir/dwarfs | 45 ++ contrib/file/magic/Magdir/elf | 10 +- contrib/file/magic/Magdir/filesystems | 211 ++++---- contrib/file/magic/Magdir/firmware | 133 +++++ contrib/file/magic/Magdir/games | 198 +++++++- contrib/file/magic/Magdir/gentoo | 9 +- contrib/file/magic/Magdir/geo | 42 +- contrib/file/magic/Magdir/images | 342 +++++++++++-- contrib/file/magic/Magdir/intel | 8 +- contrib/file/magic/Magdir/java | 9 +- contrib/file/magic/Magdir/javascript | 64 ++- contrib/file/magic/Magdir/jpeg | 8 +- contrib/file/magic/Magdir/lif | 9 +- contrib/file/magic/Magdir/linux | 99 +++- contrib/file/magic/Magdir/llvm | 3 +- contrib/file/magic/Magdir/macintosh | 56 ++- contrib/file/magic/Magdir/magic | 65 ++- contrib/file/magic/Magdir/mail.news | 4 +- contrib/file/magic/Magdir/map | 7 +- contrib/file/magic/Magdir/mathematica | 69 ++- contrib/file/magic/Magdir/meteorological | 8 +- contrib/file/magic/Magdir/misctools | 66 ++- contrib/file/magic/Magdir/modem | 12 +- contrib/file/magic/Magdir/msdos | 460 +++++++++++++++-- contrib/file/magic/Magdir/msooxml | 12 +- contrib/file/magic/Magdir/ole2compounddocs | 155 ++++-- contrib/file/magic/Magdir/pdf | 6 +- contrib/file/magic/Magdir/perl | 8 +- contrib/file/magic/Magdir/playdate | 57 +++ contrib/file/magic/Magdir/printer | 144 +++++- contrib/file/magic/Magdir/qt | 13 +- contrib/file/magic/Magdir/rst | 6 +- contrib/file/magic/Magdir/rust | 21 + contrib/file/magic/Magdir/scientific | 43 +- contrib/file/magic/Magdir/sendmail | 4 +- contrib/file/magic/Magdir/sgml | 13 +- contrib/file/magic/Magdir/sniffer | 75 ++- contrib/file/magic/Magdir/softquad | 9 +- contrib/file/magic/Magdir/spectrum | 118 ++++- contrib/file/magic/Magdir/sql | 65 ++- contrib/file/magic/Magdir/ssh | 11 +- contrib/file/magic/Magdir/svf | 5 + contrib/file/magic/Magdir/sysex | 6 +- contrib/file/magic/Magdir/terminfo | 3 +- contrib/file/magic/Magdir/tex | 10 +- contrib/file/magic/Magdir/tplink | 13 +- contrib/file/magic/Magdir/troff | 8 +- contrib/file/magic/Magdir/uterus | 4 +- contrib/file/magic/Magdir/varied.script | 64 +-- contrib/file/magic/Magdir/web | 8 +- contrib/file/magic/Magdir/windows | 532 ++++++++++++++++++-- contrib/file/magic/Magdir/wordprocessors | 72 ++- contrib/file/magic/Magdir/xenix | 18 +- contrib/file/magic/Magdir/xilinx | 20 +- contrib/file/magic/Makefile.am | 8 +- contrib/file/magic/Makefile.in | 8 +- contrib/file/src/Makefile.am | 8 +- contrib/file/src/Makefile.in | 23 +- contrib/file/src/apprentice.c | 275 ++++++----- contrib/file/src/apptype.c | 8 +- contrib/file/src/ascmagic.c | 38 +- contrib/file/src/asctime_r.c | 4 +- contrib/file/src/asprintf.c | 2 +- contrib/file/src/buffer.c | 11 +- contrib/file/src/cdf.c | 2 +- contrib/file/src/cdf_time.c | 6 +- contrib/file/src/compress.c | 389 +++++++++++---- contrib/file/src/ctime_r.c | 4 +- contrib/file/src/der.c | 12 +- contrib/file/src/dprintf.c | 2 +- contrib/file/src/encoding.c | 40 +- contrib/file/src/file.c | 131 ++--- contrib/file/src/file.h | 187 +++---- contrib/file/src/file_opts.h | 4 +- contrib/file/src/fmtcheck.c | 2 +- contrib/file/src/fsmagic.c | 8 +- contrib/file/src/funcs.c | 120 +++-- contrib/file/src/getline.c | 4 +- contrib/file/src/getopt_long.c | 2 +- contrib/file/src/gmtime_r.c | 4 +- contrib/file/src/is_csv.c | 12 +- contrib/file/src/is_json.c | 6 +- contrib/file/src/is_simh.c | 209 ++++++++ contrib/file/src/is_tar.c | 14 +- contrib/file/src/localtime_r.c | 4 +- contrib/file/src/magic.c | 60 ++- contrib/file/src/magic.h.in | 9 +- contrib/file/src/memtest.c | 3 +- contrib/file/src/pread.c | 2 +- contrib/file/src/print.c | 30 +- contrib/file/src/readcdf.c | 26 +- contrib/file/src/readelf.c | 72 +-- contrib/file/src/seccomp.c | 3 +- contrib/file/src/softmagic.c | 252 ++++++---- contrib/file/src/strlcat.c | 2 +- contrib/file/src/strlcpy.c | 2 +- contrib/file/src/tar.h | 4 +- contrib/file/src/vasprintf.c | 7 +- contrib/file/tests/CVE-2014-1943.result | 2 +- contrib/file/tests/HWP2016.hwp.result | 1 + contrib/file/tests/HWP2016.hwp.testfile | Bin 0 -> 9216 bytes contrib/file/tests/HWP2016.hwpx.zip.result | 1 + contrib/file/tests/HWP2016.hwpx.zip.testfile | Bin 0 -> 14377 bytes contrib/file/tests/HWP97.hwp.result | 1 + contrib/file/tests/HWP97.hwp.testfile | Bin 0 -> 8975 bytes contrib/file/tests/JW07022A.mp3.result | 2 +- contrib/file/tests/Makefile.am | 70 ++- contrib/file/tests/Makefile.in | 70 ++- contrib/file/tests/android-vdex-1.result | 2 +- contrib/file/tests/android-vdex-2.result | 2 +- contrib/file/tests/arj.result | 2 +- contrib/file/tests/bcachefs.result | 2 +- contrib/file/tests/bcachefs2.result | 1 + contrib/file/tests/bcachefs2.testfile | Bin 0 -> 8192 bytes contrib/file/tests/cl8m8ocofedso.result | 2 +- contrib/file/tests/cmd1.result | 1 + contrib/file/tests/cmd1.testfile | 1 + contrib/file/tests/cmd2.result | 1 + contrib/file/tests/cmd2.testfile | 1 + contrib/file/tests/cmd3.result | 1 + contrib/file/tests/cmd3.testfile | 2 + contrib/file/tests/cmd4.result | 1 + contrib/file/tests/cmd4.testfile | 2 + contrib/file/tests/dsd64-dff.result | 2 +- contrib/file/tests/dsd64-dsf.result | 2 +- contrib/file/tests/escapevel.result | 2 +- contrib/file/tests/ext4.result | 2 +- contrib/file/tests/fit-map-data.result | 2 +- contrib/file/tests/gedcom.result | 2 +- contrib/file/tests/hddrawcopytool.result | 2 +- contrib/file/tests/hello-racket_rkt.result | 1 + contrib/file/tests/hello-racket_rkt.testfile | Bin 0 -> 1664 bytes contrib/file/tests/issue311docx.result | 2 +- contrib/file/tests/issue359xlsx.result | 2 +- contrib/file/tests/jpeg-text.result | 1 + contrib/file/tests/jpeg-text.testfile | 1 + contrib/file/tests/json1.result | 2 +- contrib/file/tests/json2.result | 2 +- contrib/file/tests/json3.result | 2 +- contrib/file/tests/json4.result | 2 +- contrib/file/tests/json5.result | 2 +- contrib/file/tests/json6.result | 2 +- contrib/file/tests/json7.result | 2 +- contrib/file/tests/json8.result | 2 +- contrib/file/tests/jsonlines1.result | 2 +- contrib/file/tests/matilde.arm.result | 2 +- contrib/file/tests/multiple-A.magic | 2 + contrib/file/tests/multiple-B.magic | 2 + contrib/file/tests/multiple.flags | 1 + contrib/file/tests/multiple.result | 1 + contrib/file/tests/multiple.testfile | 1 + contrib/file/tests/pcjr.result | 2 +- contrib/file/tests/pgp-binary-key-v2-phil.result | 2 +- contrib/file/tests/pgp-binary-key-v3-lutz.result | 2 +- contrib/file/tests/pgp-binary-key-v4-dsa.result | 2 +- .../pgp-binary-key-v4-ecc-no-userid-secret.result | 2 +- .../tests/pgp-binary-key-v4-ecc-secret-key.result | 2 +- .../file/tests/pgp-binary-key-v4-rsa-key.result | 2 +- .../pgp-binary-key-v4-rsa-no-userid-secret.result | 2 +- .../tests/pgp-binary-key-v4-rsa-secret-key.result | 2 +- contrib/file/tests/pnm1.result | 1 + contrib/file/tests/pnm1.testfile | 5 + contrib/file/tests/pnm2.result | 1 + contrib/file/tests/pnm2.testfile | Bin 0 -> 15 bytes contrib/file/tests/pnm3.result | 1 + contrib/file/tests/pnm3.testfile | 5 + contrib/file/tests/regex-eol.result | 2 +- contrib/file/tests/registry-pol.result | 1 + contrib/file/tests/registry-pol.testfile | Bin 0 -> 7094 bytes contrib/file/tests/test.c | 70 ++- contrib/file/tests/uf2.result | 2 +- contrib/file/tests/xclbin.result | 1 + contrib/file/tests/xclbin.testfile | Bin 0 -> 512 bytes contrib/file/tests/zstd-3-skippable-frames.result | 2 +- contrib/file/tests/zstd-dictionary-0.result | 2 +- contrib/file/tests/zstd-dictionary-1.result | 2 +- contrib/file/tests/zstd-dictionary-2.result | 2 +- contrib/file/tests/zstd-skippable-frame-0.result | 2 +- contrib/file/tests/zstd-skippable-frame-4.result | 2 +- contrib/file/tests/zstd-skippable-frame-8.result | 2 +- contrib/file/tests/zstd-skippable-frame-C.result | 2 +- contrib/file/tests/zstd-v0.2-FF.result | 2 +- contrib/file/tests/zstd-v0.3-FF.result | 2 +- contrib/file/tests/zstd-v0.4-FF.result | 2 +- contrib/file/tests/zstd-v0.5-FF.result | 2 +- contrib/file/tests/zstd-v0.6-FF.result | 2 +- contrib/file/tests/zstd-v0.7-00.result | 2 +- contrib/file/tests/zstd-v0.7-21.result | 2 +- contrib/file/tests/zstd-v0.7-22.result | 2 +- contrib/file/tests/zstd-v0.8-00.result | 2 +- contrib/file/tests/zstd-v0.8-01.result | 2 +- contrib/file/tests/zstd-v0.8-02.result | 2 +- contrib/file/tests/zstd-v0.8-03.result | 2 +- contrib/file/tests/zstd-v0.8-16.result | 2 +- contrib/file/tests/zstd-v0.8-20.result | 2 +- contrib/file/tests/zstd-v0.8-21.result | 2 +- contrib/file/tests/zstd-v0.8-22.result | 2 +- contrib/file/tests/zstd-v0.8-23.result | 2 +- contrib/file/tests/zstd-v0.8-F4.result | 2 +- contrib/file/tests/zstd-v0.8-FF.result | 2 +- lib/libmagic/Makefile | 1 + lib/libmagic/config.h | 27 +- 235 files changed, 6484 insertions(+), 1559 deletions(-) diff --git a/contrib/file/ChangeLog b/contrib/file/ChangeLog index dd95543fe649..fdf1cff6e2d3 100644 --- a/contrib/file/ChangeLog +++ b/contrib/file/ChangeLog @@ -1,3 +1,63 @@ +2023-07-27 15:45 Christos Zoulas + + * release 5.45 + +2023-07-17 11:53 Christos Zoulas + + * PR/465: psrok1: Avoid muslc asctime_r crash + +2023-05-21 13:05 Christos Zoulas + + * add SIMH tape format support + +2023-02-09 12:50 Christos Zoulas + + * bump the max size of the elf section notes to be read to 128K + and make it configurable + +2023-01-08 1:08 Christos Zoulas + + * PR/415: Fix decompression with program returning empty + +2022-12-26 1:47 Christos Zoulas + + * PR/408: fix -p with seccomp + * PR/412: fix MinGW compilation + +2022-12-26 12:26 Christos Zoulas + + * release 5.44 + +2022-12-14 9:24 Christos Zoulas + + * Handle nan's so that we don't get internal floating point exceptions + when they are enabled (Vincent Mihalkovic) + +2022-10-23 10:21 Christos Zoulas + + * PR/397: Restore the ability to process files from stdin immediately. + +2022-09-20 17:12 Christos Zoulas + + * fixed various clustefuzz issues + +2022-09-19 15:54 Christos Zoulas + + * Fix error detection for decompression code (Vincent Mihalkovic) + +2022-09-15 13:50 Christos Zoulas + + * Add MAGIC_NO_COMPRESS_FORK and use it to produce a more + meaningful error message if we are sandboxing. + +2022-09-15 10:45 Christos Zoulas + + * Add built-in lzip decompression support (Michal Gorny) + +2022-09-14 10:35 Christos Zoulas + + * Add built-in zstd decompression support (Martin Rodriguez Reboredo) + 2022-09-13 14:55 Christos Zoulas * release 5.43 @@ -229,7 +289,7 @@ 2019-12-15 22:13 Christos Zoulas Document changes since the previous release: - Always accept -S (no sandbox) even if we don't support sandboxing - - More syscalls elided for sandboxiing + - More syscalls elided for sandboxing - For ELF dynamic means having an interpreter not just PT_DYNAMIC - Check for large ELF session header offset - When saving and restoring a locale, keep the locale name in our @@ -1759,7 +1819,7 @@ * Magic format checks (Dr. Werner Fink) - * Magic format function improvent (Karl Chen) + * Magic format function improvement (Karl Chen) 2006-05-03 11:11 Christos Zoulas diff --git a/contrib/file/README.md b/contrib/file/README.md index 37a3b17856c6..26e38045812c 100644 --- a/contrib/file/README.md +++ b/contrib/file/README.md @@ -1,6 +1,6 @@ ## README for file(1) Command and the libmagic(3) library ## - @(#) $File: README.md,v 1.4 2021/10/21 01:51:31 christos Exp $ + @(#) $File: README.md,v 1.5 2023/05/28 13:59:47 christos Exp $ - Bug Tracker: - Build Status: @@ -91,6 +91,7 @@ COPYING - read this first. * `src/gmtime_r.c` - replacement for OS's that don't have it. * `src/is_csv.c` - knows about Comma Separated Value file format (RFC 4180). * `src/is_json.c` - knows about JavaScript Object Notation format (RFC 8259). +* `src/is_simh.c` - knows about SIMH tape file format. * `src/is_tar.c, tar.h` - knows about Tape ARchive format (courtesy John Gilmore). * `src/localtime_r.c` - replacement for OS's that don't have it. * `src/magic.h.in` - source file for magic.h diff --git a/contrib/file/acinclude.m4 b/contrib/file/acinclude.m4 index e0811dd899aa..30242712bad3 100644 --- a/contrib/file/acinclude.m4 +++ b/contrib/file/acinclude.m4 @@ -39,11 +39,12 @@ AC_CHECK_DECLS([daylight], , , [#include #include ]) AC_CACHE_CHECK(for daylight, ac_cv_var_daylight, [AC_LINK_IFELSE( -[AC_LANG_PROGRAM([#include ], +[AC_LANG_PROGRAM([#include +#include ], [#if !HAVE_DECL_DAYLIGHT extern int daylight; #endif -atoi(daylight);])], ac_cv_var_daylight=yes, ac_cv_var_daylight=no)]) +daylight = atoi("1");])], ac_cv_var_daylight=yes, ac_cv_var_daylight=no)]) if test $ac_cv_var_daylight = yes; then AC_DEFINE(HAVE_DAYLIGHT,1,[HAVE_DAYLIGHT]) fi diff --git a/contrib/file/config.guess b/contrib/file/config.guess index 5d222e2ed594..cd4dbf7293fa 100755 --- a/contrib/file/config.guess +++ b/contrib/file/config.guess @@ -210,6 +210,8 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; + mipsn64eb) machine=mips64-unknown ;; + mipsn64el) machine=mips64el-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; diff --git a/contrib/file/config.h.in b/contrib/file/config.h.in index 8bf5e7ce6610..5ae30c61edd1 100644 --- a/contrib/file/config.h.in +++ b/contrib/file/config.h.in @@ -89,6 +89,9 @@ /* Define to 1 if you have the `gnurx' library (-lgnurx). */ #undef HAVE_LIBGNURX +/* Define to 1 if you have the `lz' library (-llz). */ +#undef HAVE_LIBLZ + /* Define to 1 if you have the `lzma' library (-llzma). */ #undef HAVE_LIBLZMA @@ -98,9 +101,15 @@ /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ +/* Define to 1 if you have the `zstd' library (-lzstd). */ +#undef HAVE_LIBZSTD + /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R +/* Define to 1 if you have the header file. */ +#undef HAVE_LZLIB_H + /* Define to 1 if you have the header file. */ #undef HAVE_LZMA_H @@ -276,9 +285,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ZLIB_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ZSTD_ERRORS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ZSTD_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR +/* Enable lzlib compression support */ +#undef LZLIBSUPPORT + /* Define to 1 if `major', `minor', and `makedev' are declared in . */ #undef MAJOR_IN_MKDEV @@ -425,6 +443,9 @@ /* Enable zlib compression support */ #undef ZLIBSUPPORT +/* Enable zstdlib compression support */ +#undef ZSTDLIBSUPPORT + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/contrib/file/config.sub b/contrib/file/config.sub index d74fb6deac94..f6564f2885d4 100755 --- a/contrib/file/config.sub +++ b/contrib/file/config.sub @@ -1219,6 +1219,7 @@ case $cpu-$vendor in | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mips64vr5900 | mips64vr5900el \ + | mipsn64eb | mipsn64el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa32r3 | mipsisa32r3el \ diff --git a/contrib/file/configure b/contrib/file/configure index 143ccc5bbacb..8043072f56f7 100755 --- a/contrib/file/configure +++ b/contrib/file/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for file 5.43. +# Generated by GNU Autoconf 2.71 for file 5.45. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='file' PACKAGE_TARNAME='file' -PACKAGE_VERSION='5.43' -PACKAGE_STRING='file 5.43' +PACKAGE_VERSION='5.45' +PACKAGE_STRING='file 5.45' PACKAGE_BUGREPORT='christos@astron.com' PACKAGE_URL='' @@ -800,6 +800,8 @@ enable_elf_core enable_zlib enable_bzlib enable_xzlib +enable_zstdlib +enable_lzlib enable_libseccomp enable_fsect_man5 enable_dependency_tracking @@ -1371,7 +1373,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 file 5.43 to adapt to many kinds of systems. +\`configure' configures file 5.45 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,7 +1444,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file 5.43:";; + short | recursive ) echo "Configuration of file 5.45:";; esac cat <<\_ACEOF @@ -1458,6 +1460,9 @@ Optional Features: --disable-bzlib disable bz2lib compression support [default=auto] --disable-xzlib disable liblzma/xz compression support [default=auto] + --disable-zstdlib disable zstdlib compression support [default=auto] + --disable-lzlib disable liblz (lzip) compression support + [default=auto] --disable-libseccomp disable libseccomp sandboxing [default=auto] --enable-fsect-man5 enable file formats in man section 5 --enable-dependency-tracking @@ -1562,7 +1567,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file configure 5.43 +file configure 5.45 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2129,7 +2134,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 file $as_me 5.43, which was +It was created by file $as_me 5.45, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3405,7 +3410,7 @@ fi # Define the identity of the package. PACKAGE='file' - VERSION='5.43' + VERSION='5.45' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3641,6 +3646,28 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_xzlib" >&5 printf "%s\n" "$enable_xzlib" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zstdlib support" >&5 +printf %s "checking for zstdlib support... " >&6; } +# Check whether --enable-zstdlib was given. +if test ${enable_zstdlib+y} +then : + enableval=$enable_zstdlib; +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_zstdlib" >&5 +printf "%s\n" "$enable_zstdlib" >&6; } + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lzlib support" >&5 +printf %s "checking for lzlib support... " >&6; } +# Check whether --enable-lzlib was given. +if test ${enable_lzlib+y} +then : + enableval=$enable_lzlib; +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_lzlib" >&5 +printf "%s\n" "$enable_lzlib" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libseccomp support" >&5 printf %s "checking for libseccomp support... " >&6; } # Check whether --enable-libseccomp was given. @@ -13665,6 +13692,30 @@ then : fi +fi +if test "$enable_zstdlib" != "no"; then + ac_fn_c_check_header_compile "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default" +if test "x$ac_cv_header_zstd_h" = xyes +then : + printf "%s\n" "#define HAVE_ZSTD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "zstd_errors.h" "ac_cv_header_zstd_errors_h" "$ac_includes_default" +if test "x$ac_cv_header_zstd_errors_h" = xyes +then : + printf "%s\n" "#define HAVE_ZSTD_ERRORS_H 1" >>confdefs.h + +fi + +fi +if test "$enable_lzlib" != "no"; then + ac_fn_c_check_header_compile "$LINENO" "lzlib.h" "ac_cv_header_lzlib_h" "$ac_includes_default" +if test "x$ac_cv_header_lzlib_h" = xyes +then : + printf "%s\n" "#define HAVE_LZLIB_H 1" >>confdefs.h + +fi + fi ac_fn_c_check_type "$LINENO" "sig_t" "ac_cv_type_sig_t" "#include " @@ -14037,13 +14088,14 @@ else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +#include int main (void) { #if !HAVE_DECL_DAYLIGHT extern int daylight; #endif -atoi(daylight); +daylight = atoi("1"); ; return 0; } @@ -15459,6 +15511,96 @@ then : fi +fi +if test "$enable_zstdlib" != "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZSTD_createDStream in -lzstd" >&5 +printf %s "checking for ZSTD_createDStream in -lzstd... " >&6; } +if test ${ac_cv_lib_zstd_ZSTD_createDStream+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lzstd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char ZSTD_createDStream (); +int +main (void) +{ +return ZSTD_createDStream (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_zstd_ZSTD_createDStream=yes +else $as_nop + ac_cv_lib_zstd_ZSTD_createDStream=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zstd_ZSTD_createDStream" >&5 +printf "%s\n" "$ac_cv_lib_zstd_ZSTD_createDStream" >&6; } +if test "x$ac_cv_lib_zstd_ZSTD_createDStream" = xyes +then : + printf "%s\n" "#define HAVE_LIBZSTD 1" >>confdefs.h + + LIBS="-lzstd $LIBS" + +fi + +fi +if test "$enable_lzlib" != "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LZ_decompress_open in -llz" >&5 +printf %s "checking for LZ_decompress_open in -llz... " >&6; } +if test ${ac_cv_lib_lz_LZ_decompress_open+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-llz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char LZ_decompress_open (); +int +main (void) +{ +return LZ_decompress_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_lz_LZ_decompress_open=yes +else $as_nop + ac_cv_lib_lz_LZ_decompress_open=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lz_LZ_decompress_open" >&5 +printf "%s\n" "$ac_cv_lib_lz_LZ_decompress_open" >&6; } +if test "x$ac_cv_lib_lz_LZ_decompress_open" = xyes +then : + printf "%s\n" "#define HAVE_LIBLZ 1" >>confdefs.h + + LIBS="-llz $LIBS" + +fi + fi if test "$enable_libseccomp" != "no"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5 @@ -15591,6 +15733,26 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t printf "%s\n" "#define XZLIBSUPPORT 1" >>confdefs.h +fi +if test "$enable_zstdlib" = "yes"; then + if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" != "yesyes"; then + as_fn_error $? "zstdlib support requested but not found" "$LINENO" 5 + fi +fi +if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" = "yesyes"; then + +printf "%s\n" "#define ZSTDLIBSUPPORT 1" >>confdefs.h + +fi +if test "$enable_lzlib" = "yes"; then + if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" != "yesyes"; then + as_fn_error $? "lzlib support requested but not found" "$LINENO" 5 + fi +fi +if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" = "yesyes"; then + +printf "%s\n" "#define LZLIBSUPPORT 1" >>confdefs.h + fi ac_config_files="$ac_config_files Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc" @@ -16131,7 +16293,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 file $as_me 5.43, which was +This file was extended by file $as_me 5.45, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16199,7 +16361,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="\\ -file config.status 5.43 +file config.status 5.45 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/file/configure.ac b/contrib/file/configure.ac index 6629300fd021..aa728badb1b7 100644 --- a/contrib/file/configure.ac +++ b/contrib/file/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([file],[5.43],[christos@astron.com]) +AC_INIT([file],[5.45],[christos@astron.com]) AM_INIT_AUTOMAKE([subdir-objects foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -49,6 +49,16 @@ AC_ARG_ENABLE([xzlib], [AS_HELP_STRING([--disable-xzlib], [disable liblzma/xz compression support @<:@default=auto@:>@])]) AC_MSG_RESULT($enable_xzlib) +AC_MSG_CHECKING(for zstdlib support) +AC_ARG_ENABLE([zstdlib], +[AS_HELP_STRING([--disable-zstdlib], [disable zstdlib compression support @<:@default=auto@:>@])]) +AC_MSG_RESULT($enable_zstdlib) + +AC_MSG_CHECKING(for lzlib support) +AC_ARG_ENABLE([lzlib], +[AS_HELP_STRING([--disable-lzlib], [disable liblz (lzip) compression support @<:@default=auto@:>@])]) +AC_MSG_RESULT($enable_lzlib) + AC_MSG_CHECKING(for libseccomp support) AC_ARG_ENABLE([libseccomp], [AS_HELP_STRING([--disable-libseccomp], [disable libseccomp sandboxing @<:@default=auto@:>@])]) @@ -112,6 +122,12 @@ fi if test "$enable_xzlib" != "no"; then AC_CHECK_HEADERS(lzma.h) fi +if test "$enable_zstdlib" != "no"; then + AC_CHECK_HEADERS(zstd.h zstd_errors.h) +fi +if test "$enable_lzlib" != "no"; then + AC_CHECK_HEADERS(lzlib.h) +fi AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_SIG_T],1,[Have sig_t type])],,[#include ]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -180,6 +196,12 @@ fi if test "$enable_xzlib" != "no"; then AC_CHECK_LIB(lzma, lzma_stream_decoder) fi +if test "$enable_zstdlib" != "no"; then + AC_CHECK_LIB(zstd, ZSTD_createDStream) +fi +if test "$enable_lzlib" != "no"; then + AC_CHECK_LIB(lz, LZ_decompress_open) +fi if test "$enable_libseccomp" != "no"; then AC_CHECK_LIB(seccomp, seccomp_init) fi @@ -215,6 +237,22 @@ fi if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; then AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) fi +if test "$enable_zstdlib" = "yes"; then + if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" != "yesyes"; then + AC_MSG_ERROR([zstdlib support requested but not found]) + fi +fi +if test "$ac_cv_header_zstd_h$ac_cv_lib_zstd_ZSTD_createDStream" = "yesyes"; then + AC_DEFINE([ZSTDLIBSUPPORT], 1, [Enable zstdlib compression support]) +fi +if test "$enable_lzlib" = "yes"; then + if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" != "yesyes"; then + AC_MSG_ERROR([lzlib support requested but not found]) + fi +fi +if test "$ac_cv_header_lzlib_h$ac_cv_lib_lz_LZ_decompress_open" = "yesyes"; then + AC_DEFINE([LZLIBSUPPORT], 1, [Enable lzlib compression support]) +fi AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) AC_OUTPUT diff --git a/contrib/file/doc/file.man b/contrib/file/doc/file.man index 91470b8e199d..b9580a970dc1 100644 --- a/contrib/file/doc/file.man +++ b/contrib/file/doc/file.man @@ -1,5 +1,5 @@ -.\" $File: file.man,v 1.146 2022/10/26 16:56:14 christos Exp $ -.Dd October 26, 2022 +.\" $File: file.man,v 1.150 2023/05/21 17:08:34 christos Exp $ +.Dd May 21, 2023 .Dt FILE __CSECTION__ .Os .Sh NAME @@ -224,6 +224,8 @@ elf magic is found. Examines JSON (RFC-7159) files by parsing them for compliance. .It soft Consults magic files. +.It simh +Examines SIMH tape files. .It tar Examines tar files by verifying the checksum of the 512 byte tar header. Excluding this test can provide more detailed content description by using @@ -337,16 +339,17 @@ attempt to preserve the access time of files analyzed, to pretend that never read them. .It Fl P , Fl Fl parameter Ar name=value Set various parameter limits. -.Bl -column "elf_phnum" "Default" "XXXXXXXXXXXXXXXXXXXXXXXXXXX" -offset indent +.Bl -column "elf_phnum" "Default" "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" .It Sy "Name" Ta Sy "Default" Ta Sy "Explanation" -.It Li bytes Ta 1048576 Ta max number of bytes to read from file +.It Li bytes Ta 1M Ta max number of bytes to read from file .It Li elf_notes Ta 256 Ta max ELF notes processed -.It Li elf_phnum Ta 2048 Ta max ELF program sections processed -.It Li elf_shnum Ta 32768 Ta max ELF sections processed -.It Li encoding Ta 65536 Ta max number of bytes to scan for encoding evaluation +.It Li elf_phnum Ta 2K Ta max ELF program sections processed +.It Li elf_shnum Ta 32K Ta max ELF sections processed +.It Li elf_shsize Ta 128MB Ta max ELF section size processed +.It Li encoding Ta 65K Ta max number of bytes to determine encoding .It Li indir Ta 50 Ta recursion limit for indirect magic .It Li name Ta 50 Ta use count limit for name/use magic -.It Li regex Ta 8192 Ta length limit for regex searches +.It Li regex Ta 8K Ta length limit for regex searches .El .It Fl r , Fl Fl raw Don't translate unprintable characters to \eooo. @@ -728,7 +731,7 @@ variable in file.h), then we don't seek to that offset, but we give up. It would be better if buffer managements was done when the file descriptor is available so we can seek around the file. One must be careful though because this has performance and thus security -considerations, because one can slow down things by repeateadly seeking. +considerations, because one can slow down things by repeatedly seeking. .Pp There is support now for keeping separate buffers and having offsets from the end of the file, but the internal buffer management still needs an diff --git a/contrib/file/doc/libmagic.man b/contrib/file/doc/libmagic.man index b0cf0339f19d..e89c6ee0bfac 100644 --- a/contrib/file/doc/libmagic.man +++ b/contrib/file/doc/libmagic.man @@ -1,6 +1,6 @@ -.\" $File: libmagic.man,v 1.45 2019/06/08 22:16:24 christos Exp $ +.\" $File: libmagic.man,v 1.49 2023/07/20 14:32:07 christos Exp $ .\" -.\" Copyright (c) Christos Zoulas 2003, 2018. +.\" Copyright (c) Christos Zoulas 2003, 2018, 2022 .\" All Rights Reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 8, 2019 +.Dd June 16, 2023 .Dt LIBMAGIC 3 .Os .Sh NAME @@ -84,6 +84,8 @@ .Fn magic_setparam "magic_t cookie" "int param" "const void *value" .Ft int .Fn magic_version "void" +.Ft const char * +.Fn magic_getpath "const char *magicfile" "int action" .Sh DESCRIPTION These functions operate on the magic database file @@ -143,6 +145,8 @@ Don't report on compression, only report about the uncompressed data. Don't check for .Dv EMX application type (only on EMX). +.It Dv MAGIC_NO_COMPRESS_FORK +Don't allow decompressors that use fork. .It Dv MAGIC_NO_CHECK_CDF Don't get extra information on MS Composite Document Files. .It Dv MAGIC_NO_CHECK_COMPRESS @@ -163,6 +167,8 @@ Don't look for known tokens inside ascii files. Don't examine JSON files. .It Dv MAGIC_NO_CHECK_CSV Don't examine CSV files. +.It Dv MAGIC_NO_CHECK_SIMH +Don't examine SIMH tape files. .El .Pp The @@ -343,6 +349,20 @@ from .In magic.h . This can be used by client programs to verify that the version they compile against is the same as the version that they run against. +.Pp +The +.Fn magic_getpath +command returns the colon separated list of magic database locations. +If the +.Fa filename +is non-NULL, then it is returned. +Otherwise, if the +.Dv MAGIC +environment variable is defined, then it is returned. +Otherwise, if +.Fa action +is 0 (meaning "file load"), then any user-specific magic database file is included. +Otherwise, only the system default magic database path is included. .Sh RETURN VALUES The function .Fn magic_open diff --git a/contrib/file/doc/magic.man b/contrib/file/doc/magic.man index d38b0e0b4019..af4bfa89c6bd 100644 --- a/contrib/file/doc/magic.man +++ b/contrib/file/doc/magic.man @@ -1,5 +1,5 @@ -.\" $File: magic.man,v 1.100 2022/09/10 13:19:26 christos Exp $ -.Dd September 10, 2022 +.\" $File: magic.man,v 1.103 2023/07/20 14:32:07 christos Exp $ +.Dd Arpil 18, 2023 .Dt MAGIC __FSECTION__ .Os .\" install as magic.4 on USG, magic.5 on V7, Berkeley and Linux systems. @@ -68,54 +68,52 @@ A 32-bit single precision IEEE floating point number in this machine's native by A 64-bit double precision IEEE floating point number in this machine's native byte order. .It Dv string A string of bytes. -The string type specification can be optionally followed *** 14628 LINES SKIPPED *** From nobody Fri Sep 15 00:00:47 2023 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 4RmvTq3n1Jz4t75F; Fri, 15 Sep 2023 00:00:47 +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 4RmvTq33NYz3fKC; Fri, 15 Sep 2023 00:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694736047; 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=XVUlZaWtSOP/kKeHldTRvqGPI8BGu5X3S0b4jvol/so=; b=PIuMed072zie05xRMB4ffHLjZdx6o+fjPgO7VHYn23pyh9ryQ0v8K1oHROpzzGspwiASJP um9B7qbqYOt3ByCEFVdGglR5dATX4MPv5WVvp47BDUxCoMHJZYKhUEca9VCf/eLY8fRZ5P U9/56FzwqTof4lOLUyzQnQfhvuke+KKEccWfSjncheXtXYgtTjkV1HgxOBmtg8E9f2edOV A7w+32Pz/phhtsNqNaRAZ1fRCKv4YQhJrd1uqcGqkGomIjhMmPH+ayN8CEwo3WV8vH5Hjh uJeJY6QSCyD2zLeJu+zazSx1VZiMBIDz65AfTC17rQIU5xsrSbjRvfDixb9YIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694736047; a=rsa-sha256; cv=none; b=HVQprKVyAmol0ubVzgAUAGdO2sYu/Nz+qu773/H5odWrpptI34+pEoCTE1e1gMabYLhpbO pBEBbw9QJbivr35Lf8Sh94V3WPep2ZN9oc4KyflgxwFIA7uWSVKYUjvEmxz1okskwgO7vH S70dVqF8Qt/fisaAlwarqo8ltxB+0etiKtBUsi9x9pFr3Z57VsloRCNvR17QCif/Y4M+zS QGLB4k1bRrE0I53/7IvJR7mhqUu+3/5JrjQcsHMI+euVxCA0qxkng0WajA6VyUaU9+fhJs 6V4tnVSe+J2d5fPOoWIIJic0Ad5Fxp2QPJzi2NEUAksmF30EMBvjKPLJm/YzRA== 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=1694736047; 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=XVUlZaWtSOP/kKeHldTRvqGPI8BGu5X3S0b4jvol/so=; b=rrCStcyxcOFhCVLQaVrDDrmI1AnfCRfJwNov1cvZ5Tin/r2v1ulqbeSqtsY7VmJICDL78h KdajJDk+1naswVdzf+T2Q567PH1NqCEqqbaJDqq1ZpWvaraCN1pzBSnik1a03AzYaP8LWk StTQIKnmUQOHOK1H/C8N7+Mb+PrLm4c1YDl5WYKgfOA2U5PBwZK2TPAem5XBC6O2mGB6m9 BGvf2gK1PnMlPGPf4bpb/T9eVutZbu5LUzlSZQRZiptS9BFC4tQRSG7I4OomBlhxgP5Mzs mJycZ9tkK95QDhot5shkBlXUZ0aBtWyv4R1M7Jb66+2lT3e0VBfdqoeeDE1v2w== 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 4RmvTq23Hfz1Gq8; Fri, 15 Sep 2023 00:00:47 +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 38F00lY9087693; Fri, 15 Sep 2023 00:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F00lOh087691; Fri, 15 Sep 2023 00:00:47 GMT (envelope-from git) Date: Fri, 15 Sep 2023 00:00:47 GMT Message-Id: <202309150000.38F00lOh087691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: dfd44f2f0143 - releng/14.0 - release: update to BETA2 as part of the 14.0-RELEASE cycle 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: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: dfd44f2f0143e8f0e1c20392dcae776bb0a7962d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd44f2f0143e8f0e1c20392dcae776bb0a7962d commit dfd44f2f0143e8f0e1c20392dcae776bb0a7962d Author: Glen Barber AuthorDate: 2023-09-15 00:00:23 +0000 Commit: Glen Barber CommitDate: 2023-09-15 00:00:23 +0000 release: update to BETA2 as part of the 14.0-RELEASE cycle Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 9c894c4587da..3dd497412d17 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Sep 15 08:49:02 2023 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 4Rn7CL5Ymhz4tKm7; Fri, 15 Sep 2023 08:49: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 4Rn7CL56Hvz4TQP; Fri, 15 Sep 2023 08:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694767742; 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=WkC+uuS//wiaY9vnmkBGD6aj8bovAVPSZZdwCz7F7hU=; b=snoPzB9T0xOizWSUmpw49sKepg33QNzvMhAE5iNDaAzlgojLnlOmoo7PLfkE54cEBX7ZYa 7aV4KMyt70SDM9OVDeQPfZBgPfKxICTSoIqSFhWzoMh8ZDAcYF7peo73Pk++xxEgg551Aa QzBikXjbiLj7dIbJbCJG5AM1bE1ZbId2KkDhxCMPiA0JnesREGs3NPH50XL3p5sQIts7Gm k0UziMKwGiPy3i2RMQnuO7dEyJrxJvQi6a9vZEM3PHdHBjDKfn8F8Z3o68NAjK1MfszXl6 xMdp1Nl1ONG+CrwsWhqr1JaY2SL2EFxtPVzcoIyJ/YGkgb7xyGxMRzfQxa5OLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694767742; a=rsa-sha256; cv=none; b=mDVovEhRLA9y4pmZK6j4Ssi0Z9poPyfVfRKTPQ5CWr1k7Y16buDPYjD01k2X77K2dArcdN eBMhBRVJzcBkHbrYoJNvFEj1IT9WA+PpzVH/HWpn2iQRzocVTrf7asZ8i7RTS3kY5y9wgq jnJZWt4ah+LqKVmS9p0J/Jyf+SzcghCnIZnrrvoF/CJtMdPyIf8i5w0CGCFhTJC9TuqBdA /GVno8MdewfVT+hGwiyvnAz3E/k6eL9MRmYtTduuKZH2mYscx5HrLq6hkeWCGTeoSwYdot meaDkF/QcTkPAxBGpZkNOB3E0u96x/VaTOKp2w+iU81PK0L4NyKk0IxyJTxayw== 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=1694767742; 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=WkC+uuS//wiaY9vnmkBGD6aj8bovAVPSZZdwCz7F7hU=; b=Qu6vauFw5iolZjFneDKdpaoLbPBU7BLtyuk0aElSZTTWJ0ND05gGO9hTw5dl2Sq+Qh+hi/ mBx7yjHRzvLimJ0ry5Z0nJhJPsM6zvpvRIdL+3Ua0Ufj4G95Tg5Xu9GVqJHem0tNc6Xf2Z LCb25qyB/mbprNkQmRI0D8iWfbxeq/Fmi+zwm/URAuARfT3crE2B9JICFHZG4kTns+/Y1F UuvHqqgIcEyxd4UvCMk7v4irUYjDuJFsezBhGOB29gLHyigXf4vL7BPd+rVXCww+lnE/I1 zcLuX17W0vhO+qU0IavbYkxpTGq6uffDoo/Bonw6q4Vy5K/ojBr4WTjz6ABb4g== 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 4Rn7CL45pPz28K; Fri, 15 Sep 2023 08:49: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 38F8n2I5057902; Fri, 15 Sep 2023 08:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F8n29m057899; Fri, 15 Sep 2023 08:49:02 GMT (envelope-from git) Date: Fri, 15 Sep 2023 08:49:02 GMT Message-Id: <202309150849.38F8n29m057899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f799833f4fce - releng/14.0 - gve: Make LRO work for jumbo packets 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f799833f4fce5f7f1f472bdcce86c792f6d3c9f3 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f799833f4fce5f7f1f472bdcce86c792f6d3c9f3 commit f799833f4fce5f7f1f472bdcce86c792f6d3c9f3 Author: Shailend Chand AuthorDate: 2023-09-07 13:28:26 +0000 Commit: Mark Johnston CommitDate: 2023-09-15 08:48:33 +0000 gve: Make LRO work for jumbo packets Each Rx descriptor points to a packet buffer of size 2K, which means that MTUs greater than 2K see multi-descriptor packets. The TCP-hood of such packets was being incorrectly determined by looking for a flag on the last descriptor instead of the first descriptor. Also fixed and progressed the version number. Approved by: re (gjb) Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41754 (cherry picked from commit 5f62584a9adb7887bae33af617cfa4f43017abf8) (cherry picked from commit 04ada3cc2b530a5c170ebefa8c28c5625009d37a) --- sys/dev/gve/gve.h | 1 + sys/dev/gve/gve_main.c | 8 ++++---- sys/dev/gve/gve_rx.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 61781cddee94..c446199dff2d 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -164,6 +164,7 @@ struct gve_rx_ctx { struct mbuf *mbuf_tail; uint32_t total_size; uint8_t frag_cnt; + bool is_tcp; bool drop_pkt; }; diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index c3ee6d5c3433..cd7849778bce 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -31,10 +31,10 @@ #include "gve.h" #include "gve_adminq.h" -#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.0\n" -#define GVE_VERSION_MAJOR 0 -#define GVE_VERSION_MINOR 9 -#define GVE_VERSION_SUB 0 +#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.1\n" +#define GVE_VERSION_MAJOR 1 +#define GVE_VERSION_MINOR 0 +#define GVE_VERSION_SUB 1 #define GVE_DEFAULT_RX_COPYBREAK 256 diff --git a/sys/dev/gve/gve_rx.c b/sys/dev/gve/gve_rx.c index f5d8fd7a7b75..9be96cf1ee3a 100644 --- a/sys/dev/gve/gve_rx.c +++ b/sys/dev/gve/gve_rx.c @@ -546,6 +546,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, if (is_first_frag) { mbuf->m_pkthdr.rcvif = priv->ifp; + ctx->is_tcp = desc->flags_seq & GVE_RXF_TCP; if (gve_needs_rss(desc->flags_seq)) { gve_set_rss_type(desc->flags_seq, mbuf); @@ -567,7 +568,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, do_if_input = true; if (((if_getcapenable(priv->ifp) & IFCAP_LRO) != 0) && /* LRO is enabled */ - (desc->flags_seq & GVE_RXF_TCP) && /* pkt is a TCP pkt */ + (ctx->is_tcp) && /* pkt is a TCP pkt */ ((mbuf->m_pkthdr.csum_flags & CSUM_DATA_VALID) != 0) && /* NIC verified csum */ (rx->lro.lro_cnt != 0) && /* LRO resources exist */ (tcp_lro_rx(&rx->lro, mbuf, 0) == 0)) From nobody Fri Sep 15 09:21:05 2023 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 4Rn7wK5VqVz4tSW9; Fri, 15 Sep 2023 09:21:05 +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 4Rn7wK53Kzz4ZLC; Fri, 15 Sep 2023 09:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694769665; 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=P8VFlfNh1DeBWIQ0g3Hm0eb2YE4iKgppzhhAXYvo3cQ=; b=Z1vorlauQLKrEIAxv/s6tjeQKW4iVjJ0TPly4qg99SvEfEcr8Kj+NrEMCf/mh/O2XxfL4A 4WkVmtH76gaA1/7vq9XRSGp9qPLCFStzbAos5lsx3SgoGal8BBYtGGfY7ggTk0Q6M6wo+U pgb2hk9uimuJGE82W4FPX5BvbO9iU1GAygaRl5Y4wFhWz+25tfOzVXiieeFRMa5utNeiQ3 RhHUqcn+4+6e5lMUFT3RW5NyQfROBcL5mPYt54SXZApnZY4yANBlGiO3UYw5oFe3M5Q2P6 RU0QuUMAWvrj6zC+WVAKkxYG1AWB5xELw5I83r6ITkSwRX8fl7yzQ6T+v5RxgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694769665; a=rsa-sha256; cv=none; b=ntEu6yO2cCmnjwo8NVsCOE9ojlfAMgQhBiDF/dAy1msihtveZ1sm/9VA6c4rcrdqLhYoSY /m1dIEhRWYf4y7o+xx202PaLlSsvtShF1Zrgn6Bu7vfa01qz95B3RQsl53zL+Yga6+bp/P TV/6YVMcqPreaqKClhGpVeicoYwUNXzZatOp2wKLlDJ2JYvi0/2OGXXFfriYAsq4A2CN0D 09LXBaGMTZWnNjOGScpEJOz/EkfHqvs3XeLauUjEe8j53xgLRWUfEYJM7HcDh47bCpQVPZ 7oHxcDiM78xL/AgrhUwPJpi3V4ZXcPIvU8LBh9VdZz2tL/QxhKc6IXYfrjGEcg== 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=1694769665; 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=P8VFlfNh1DeBWIQ0g3Hm0eb2YE4iKgppzhhAXYvo3cQ=; b=NGsaljWOplD/Syf55IRlBb9CZ1D67I2UpnMXf5QB3NA/lqcCakvd+zcKrUjceY7Pxe3ldm tTqHDkJos3fy396Jsc0WKaKwASllPLewk6tS8ExKC7VMJVqpAFwBBqS5hAfym7HsrrVEUP 1i5EhYj+qu7zIo9yvCdZ2HRyCwGUTHZnF6QnKk7+7Z2JncpHXSAwWtq4O0+optTI5jrtx1 gPc4lMzQh9KEa1vpxpsczqXGOsL5NPQsfmLZdwF9FKcKeo3QmnNHD46AoSmKbN6oJepPao RSzPSEyvYuK3sVE1VUnMs74vPgjJnqgY4dYhryfa4aQ+438DYqhbmubNEuWy6A== 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 4Rn7wK475Sz3G4; Fri, 15 Sep 2023 09:21: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 38F9L5ED018545; Fri, 15 Sep 2023 09:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F9L5Ia018542; Fri, 15 Sep 2023 09:21:05 GMT (envelope-from git) Date: Fri, 15 Sep 2023 09:21:05 GMT Message-Id: <202309150921.38F9L5Ia018542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 2a95efe756c6 - releng/14.0 - Hyper-V: hn: use VF's capabilities when it is attached 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 2a95efe756c65d459cacad89acdf7f90fe080cf6 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=2a95efe756c65d459cacad89acdf7f90fe080cf6 commit 2a95efe756c65d459cacad89acdf7f90fe080cf6 Author: Wei Hu AuthorDate: 2023-09-04 10:15:06 +0000 Commit: Wei Hu CommitDate: 2023-09-15 09:20:37 +0000 Hyper-V: hn: use VF's capabilities when it is attached Current code in hn/netvsc tries to merge (logical AND) VF and its own capability bits when a VF is attached. This results in losing some key VF features, especially in tx path. For example, the VF's txcsum, rxcsum or tso bits could be lost if any of these are not in hn/netvsc's own capablility field. Actually when VF is attached, hn just needs to use VF's caps as all the tx packets would be forwarded to the VF interface. Fix this problem by doing so. Approved by: re (gjb) Reported by: whu Tested by: whu Sponsored by: Microsoft (cherry picked from commit 289ba6b870f79d8dbd9e8022c4fa23469be11a73) (cherry picked from commit c9b4782ec336c122d8ede81be0823969e0748332) --- sys/dev/hyperv/netvsc/if_hn.c | 63 +++++++--------------------------------- sys/dev/hyperv/netvsc/if_hnvar.h | 2 ++ 2 files changed, 13 insertions(+), 52 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 206a35f7bac8..7d8e1914163e 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -1261,60 +1261,21 @@ hn_ifaddr_event(void *arg, if_t ifp) } static int -hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr) +hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr __unused) { if_t ifp, vf_ifp; - uint64_t tmp; - int error; HN_LOCK_ASSERT(sc); ifp = sc->hn_ifp; vf_ifp = sc->hn_vf_ifp; /* - * Fix up requested capabilities w/ supported capabilities, - * since the supported capabilities could have been changed. - */ - ifr->ifr_reqcap &= if_getcapabilities(ifp); - /* Pass SIOCSIFCAP to VF. */ - error = ifhwioctl(SIOCSIFCAP, vf_ifp, (caddr_t)ifr, curthread); - - /* - * NOTE: - * The error will be propagated to the callers, however, it - * is _not_ useful here. - */ - - /* - * Merge VF's enabled capabilities. + * Just sync up with VF's enabled capabilities. */ - if_setcapenable(ifp, if_getcapenable(vf_ifp) & if_getcapabilities(ifp)); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP6_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); + if_setcapenable(ifp, if_getcapenable(vf_ifp)); + if_sethwassist(ifp, if_gethwassist(vf_ifp)); - tmp = if_gethwassist(vf_ifp) & CSUM_IP_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO4) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & CSUM_IP6_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - return (error); + return (0); } static int @@ -1698,6 +1659,8 @@ hn_xpnt_vf_setready(struct hn_softc *sc) sc->hn_saved_tsomax = if_gethwtsomax(ifp); sc->hn_saved_tsosegcnt = if_gethwtsomaxsegcount(ifp); sc->hn_saved_tsosegsz = if_gethwtsomaxsegsize(ifp); + sc->hn_saved_capenable = if_getcapenable(ifp); + sc->hn_saved_hwassist = if_gethwassist(ifp); /* * Intersect supported/enabled capabilities. @@ -2017,18 +1980,14 @@ hn_ifnet_detevent(void *xsc, if_t ifp) * The VF was ready; restore some settings. */ if_setcapabilities(ifp, sc->hn_saved_caps); - /* - * NOTE: - * There is _no_ need to fixup if_capenable and - * if_hwassist, since the if_capabilities before - * restoration was an intersection of the VF's - * if_capabilites and the synthetic device's - * if_capabilites. - */ + if_sethwtsomax(ifp, sc->hn_saved_tsomax); if_sethwtsomaxsegcount(sc->hn_ifp, sc->hn_saved_tsosegcnt); if_sethwtsomaxsegsize(ifp, sc->hn_saved_tsosegsz); + + if_setcapenable(ifp, sc->hn_saved_capenable); + if_sethwassist(ifp, sc->hn_saved_hwassist); } if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) { diff --git a/sys/dev/hyperv/netvsc/if_hnvar.h b/sys/dev/hyperv/netvsc/if_hnvar.h index 0d8ed6bdef19..f46adcbf9245 100644 --- a/sys/dev/hyperv/netvsc/if_hnvar.h +++ b/sys/dev/hyperv/netvsc/if_hnvar.h @@ -277,6 +277,8 @@ struct hn_softc { u_int hn_saved_tsomax; u_int hn_saved_tsosegcnt; u_int hn_saved_tsosegsz; + u_int hn_saved_capenable; + u_int hn_saved_hwassist; /* * RSC switch, default off From nobody Fri Sep 15 09:21:06 2023 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 4Rn7wL6X41z4tSQg; Fri, 15 Sep 2023 09:21: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 4Rn7wL65zPz4ZNl; Fri, 15 Sep 2023 09:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694769666; 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=YdVjw+y/zOUbNI4MOJaUKvZP3apcXQkfUCjZ3U/9S3A=; b=ngrJtOTU/lyGagKoFYT4Z9wxFsp99IO/7Y8D9GYwpTqdJW5R3YuehXnXO+VyLl0/UJKBAs Bw3bPeUOopQgLrG88Blk59/rB3RrkTq342c5HZY3tTk9xhz8FRSnvekxZ56N071LTXTlpi oKJ3+eWJPduylcg8RfjrAT4QMQVLW7DnYmxSeNlbBDT0pdTGpEWOnIhiqhmUw9D1GmSNxZ RMT5MJpUqwP8srFbAGq1AfJZMn2PvlzupjPR5ggDJXfErFigMPWArH9jma3unYMOa1qtGp ajigP04ErayfLiigP7/eFBT31VvQBanW1HJqm9zW3IsLTIVTcX5u8fZLQGTCTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694769666; a=rsa-sha256; cv=none; b=STTRY8ZF0dhWDq3XEJvVQ8bRQS7QIuLseOwCV4YY8RwhKdKHjV9AmXCjGK0toqOR7fFAaR xcj0DaGoTuIJDJD76EMt1U8mFNCSmXuLAzQWcF4U2MjrbMA2XcSTkgOLA/ygXKKXFehsTs ovYLm9N6nEfS/vMxKO62k4pt1nojZmc0Yu3nk6Tj8jCN8ldIxLDst6Iu+E+LNTgcVln8pZ vE1vM5gStnENIAGDDG4aQJAlDbiBFYLUBkkRDN5OTd4FC+Mm0j3jmDrJ3wPAX9kvxJwHFL rOFDOwK1JL49Tfqyv3Euixsf6iqAxs7JSxXRdkUmOomdiu0YZV4BjQyYzbFrsw== 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=1694769666; 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=YdVjw+y/zOUbNI4MOJaUKvZP3apcXQkfUCjZ3U/9S3A=; b=NFqUOkbFxuAhBno7u0thpKtjO3betaQI/bA1jxN/n4JCTK0nsojm0V+eUN12sFzk/nCN1C dP9fHH2F/OH4Uk7BWBrki+z3IQxKZEtwuoSVn8PCRBqLmsfUYe/xCB478j0qqHUnbghK/e 5vqeVdvRYBxuGgGB83oB8/FCmhs04495qsNbmc+N6AefJQXz8FI3QddFabPzE1MOwoYJy1 zWz4cr48qaKw5PZ1JB2Q5H7YT+6+w0AeI60C3ajcvLeDLUj1VQzO113T9yfRkme7XuW6EX zoJTFmp/od9DR1xAUzy2a6VVt5NqUViE4D9LHxGgNgyZRv7ZdUXd9Ix68IXC6A== 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 4Rn7wL57Rdz3gj; Fri, 15 Sep 2023 09:21: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 38F9L6MD018598; Fri, 15 Sep 2023 09:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F9L6tx018595; Fri, 15 Sep 2023 09:21:06 GMT (envelope-from git) Date: Fri, 15 Sep 2023 09:21:06 GMT Message-Id: <202309150921.38F9L6tx018595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 8d60ede293eb - releng/14.0 - mana: fix tso parameters and set hwassist bits 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8d60ede293eb4b7e64a67bc11bf1465e6b63ef89 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=8d60ede293eb4b7e64a67bc11bf1465e6b63ef89 commit 8d60ede293eb4b7e64a67bc11bf1465e6b63ef89 Author: Wei Hu AuthorDate: 2023-09-04 14:53:10 +0000 Commit: Wei Hu CommitDate: 2023-09-15 09:20:37 +0000 mana: fix tso parameters and set hwassist bits The parameters for tso on mana were not set correctly. Also the hwassist bits were not set. These two cause tso on mana not work. Fixed the issues and make tso working on mana. Approved by: re (gjb) Tested by: whu Sponsored by: Microsoft (cherry picked from commit 643fd7b4bc57de87ddfeb75a8f0bdb27dbb8c3ce) (cherry picked from commit 4b22565f8598f2890d41e179fd36a0845f781262) --- sys/dev/mana/mana.h | 1 + sys/dev/mana/mana_en.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index df527df10296..9a22ea87baa3 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -186,6 +186,7 @@ struct mana_txq { */ #define MAX_MBUF_FRAGS 30 #define MANA_TSO_MAXSEG_SZ PAGE_SIZE +#define MANA_TSO_MAX_SZ IP_MAXPACKET /* mbuf data and frags dma mappings */ struct mana_mbuf_head { diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index fa49e06e4862..56fa4e51ba26 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -798,8 +798,7 @@ mana_init_port_context(struct mana_port_context *apc) uint32_t tso_maxsize; int err; - tso_maxsize = MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); + tso_maxsize = MANA_TSO_MAX_SZ; /* Create DMA tag for tx bufs */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ @@ -2712,6 +2711,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, { struct gdma_context *gc = ac->gdma_dev->gdma_context; struct mana_port_context *apc; + uint32_t hwassist; if_t ndev; int err; @@ -2774,11 +2774,21 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setcapenable(ndev, if_getcapabilities(ndev)); /* TSO parameters */ - if_sethwtsomax(ndev, MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - + if_sethwtsomax(ndev, MANA_TSO_MAX_SZ - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN)); if_sethwtsomaxsegcount(ndev, MAX_MBUF_FRAGS); if_sethwtsomaxsegsize(ndev, PAGE_SIZE); + hwassist = 0; + if (if_getcapenable(ndev) & (IFCAP_TSO4 | IFCAP_TSO6)) + hwassist |= CSUM_TSO; + if (if_getcapenable(ndev) & IFCAP_TXCSUM) + hwassist |= (CSUM_TCP | CSUM_UDP | CSUM_IP); + if (if_getcapenable(ndev) & IFCAP_TXCSUM_IPV6) + hwassist |= (CSUM_UDP_IPV6 | CSUM_TCP_IPV6); + mana_dbg(NULL, "set hwassist 0x%x\n", hwassist); + if_sethwassist(ndev, hwassist); + ifmedia_init(&apc->media, IFM_IMASK, mana_ifmedia_change, mana_ifmedia_status); ifmedia_add(&apc->media, IFM_ETHER | IFM_AUTO, 0, NULL); From nobody Fri Sep 15 17:33:06 2023 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 4RnLr30243z4tNr9; Fri, 15 Sep 2023 17:33: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 4RnLr26jCSz3GlH; Fri, 15 Sep 2023 17:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799186; 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=4qfQcOGUeMBZgkU3NsycHwPcZ/UpPr6pehn5bid+0D8=; b=nrQyLccIY8RyqZZCmneVp5B0jgiobVOLIY1dhPnrQ7L+XBBCAAoTWsRacNHpgIPrdAMg4j iTDG1XhZhMPeEovyeedkcU9Qn7O6kTj/oAlZiaK9JF58/VkhJJELKGkecAERiLKbTITiRg vhh0A4rj1X4RhJevNYOIzaI6zUknOIMal56H2aFMQbGANqEsvtg+S1je9vUEoMRELEiUWs K1LMYJJ1IC+wpRncan2uveDHpzEAQOWglBpLZTxDNhNXuuZrO5hpvMJ/dIDro/x+95Y6TY V7O6caNVhKA2/CO9OfSxL1pTPIbK3JkztdjH1sUNSWPkpu5gp6HMOwd4XBhJ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799186; a=rsa-sha256; cv=none; b=j/YZPpqgXDa8EoEgV1wYFbwJO+BteUxOZuDtnAV5LGILWntgSQY+3mTxa3Fu+62pVl4YJE ag4aLS5EEHIJ9smoojuPTTOPTFKX1Ygggo9HZoORyokBKz43Gi8O5TDwtz/H6M2O7f2WBh sZzJHSG1Stx4BKgQC68XEx4S74mG61xdtisAjdS7ATKHVsm8/lKgMKWSePz9pFL12jxK2x CGtb8BKRzNqb5IWGqTnDcg03A4y+aDNlFfaHnWjdbSRXYrC6PjuvxrFEDivDwtUFLuYRbY qt3Dy1YPY2Rb6tBNx9+gnOuWW9aVUMwowWMVbfTyuilgKDWnsQYyeEl62zpeUQ== 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=1694799186; 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=4qfQcOGUeMBZgkU3NsycHwPcZ/UpPr6pehn5bid+0D8=; b=Pk+lzcoCxHqGGQMt9DeQnD/cQhO8e+QDOXXAyHuR55Ro2PcO5kYtCQg8ZtKAIJ+U7FTxOx 11FxNnx+WmKVbUMPsHpTriv2gYWEEzszqkpHo+p2mFpcKEU6aTBtJfeXAHMkhi78h2Sz5I NYT3MNztSnpmmTqzHaWj+OBfJuIPY1IT3Zh+FsjOMbdLCg5n2vmSKusQnzIjdDCdNvEbEL JCteAcS8QMSjpBtA8CZiYE1vTl0EFsZqZ7DMrkt2hl4xXDtLllHg0gZoLQ6pQbM7lQVWS/ mYGWK8a1UE4LYKgUM0XSHHyBS2kDYKgnb95ZqnUN1SUCWyjrpH9joAkqa9JPbA== 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 4RnLr25mGWzY8X; Fri, 15 Sep 2023 17:33: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 38FHX619038847; Fri, 15 Sep 2023 17:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHX6tq038844; Fri, 15 Sep 2023 17:33:06 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:33:06 GMT Message-Id: <202309151733.38FHX6tq038844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 351792d4cfd1 - stable/14 - sctp: cleanup 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 351792d4cfd1a7f7337472870f207004789db2a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=351792d4cfd1a7f7337472870f207004789db2a4 commit 351792d4cfd1a7f7337472870f207004789db2a4 Author: Michael Tuexen AuthorDate: 2023-08-25 15:23:34 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:30:51 +0000 sctp: cleanup No functional change intended. Just asserting the conditions when being called. --- sys/netinet/sctp_timer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index ef5eb8b89a5d..d0f3f936b34d 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -87,7 +87,10 @@ static int sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net, uint16_t threshold) { - if (net) { + KASSERT(stcb != NULL, ("stcb is NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + if (net != NULL) { net->error_count++; SCTPDBG(SCTP_DEBUG_TIMER4, "Error count for %p now %d thresh:%d\n", (void *)net, net->error_count, @@ -114,11 +117,6 @@ sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb, sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net); } } - } - if (stcb == NULL) - return (0); - - if (net) { if ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) { if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) { sctp_misc_ints(SCTP_THRESHOLD_INCR, From nobody Fri Sep 15 17:35:31 2023 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 4RnLtq5TLrz4tPnV; Fri, 15 Sep 2023 17:35:31 +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 4RnLtq50wHz3GyB; Fri, 15 Sep 2023 17:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799331; 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=Lnh7b7JM3Hk56K0sxWgT16S+4q8iuZMMTzvdJ0Nh0ZA=; b=Re5ivi2q2TnnJlRBoaKLG4J685s3FR4hsIyQXHbUqsFiKSJciaZa7qmL/hzaXa3E4DfQcR h5uyuG7U3LQS3z+bvAnMgJfbK99mjaODNd2aft6ByRBkGbsHrkrwIj9OxiI8a5r/X+3cIL 319Oq10N3p3hf7ohiLWFMjVWJ3UdsP5Yhd2fhhyw2hIF6bbPX1pT9AuxeRv+FFucvZ65sL vwLi0ZN4wNheqLogpF191HPzzqX+56sIPkOujBVPUISsB12hYN+VzEZVGh9k+wBv9faS5s /NxTqYY3LexDRB/QwHcFd0+E2rdjoTOqEjEj/wo+5glrByGLf7V5aCHumYTx+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799331; a=rsa-sha256; cv=none; b=MSQH5nkU/uqHkIRcF8fgYfjwvAOKxcUHbr2wsX+Xx+Q6AAyQAVE3Kl1AvJX51aU0naWZgH TvXjrDShgjvD0ErMa2LMGbxOshZVHuwLW3H4Zg36KaKsfyxf/wa//d/L9+Mf1Iiu7HSSmY YuLqKnZ5pCdYfPCNqGe5bf6OdXDHJssLTRMCC+HiT5H1XS+tjTSL7tMkOrgyN/YKPs+K5o qIx2Bwgffw0j2oC3Sb8cVRSt8kVlLU3C8PFl6npCWT+3ZzP3D+d1CYGlOWFIR1SxEhixFr sMtpz54iFVexLv+NABtXy+DNcw2iCDa0dvkS7LCywydq8HcerbrbXyTiG+4iZg== 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=1694799331; 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=Lnh7b7JM3Hk56K0sxWgT16S+4q8iuZMMTzvdJ0Nh0ZA=; b=mdqBQrKkmGsLrdt/HcvpYo9XYNNDMoqQAFdEKUb0T38NEMw6ej0YQovOdcT6GUrGEJ+z3O xsVijEs5vu/nTmfPn0S3Gmehu5nyxIkT2qSC+ICK6DstVREejr0/C5Cu9FlMfZmxfzD3Cm yB1hrUkp5bBDYNP8wrIqlx9Fv/4XpwEfm/lTZ9+8QZ2MEfMm+rtOGoudY+s5xOq/2Fkfiv NeQ0eid3rMVn4yysx/lKVcGgPDQW1jzAv9fMS4qCvFiRojM0+Nni5b7nMdGNHKqFfViIuq kQ0Tzz74xVvuAb6BxeecDGwhIBvk5TIf8gbpkJF7tRQwEQnDiS/CP+bcjkUKRQ== 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 4RnLtq466SzYlg; Fri, 15 Sep 2023 17:35:31 +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 38FHZVuQ039313; Fri, 15 Sep 2023 17:35:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHZVC7039311; Fri, 15 Sep 2023 17:35:31 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:35:31 GMT Message-Id: <202309151735.38FHZVC7039311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6cf1d4a323d7 - stable/14 - sctp: cleanup 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6cf1d4a323d7cd5d224950dcf494a0a13d453884 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6cf1d4a323d7cd5d224950dcf494a0a13d453884 commit 6cf1d4a323d7cd5d224950dcf494a0a13d453884 Author: Michael Tuexen AuthorDate: 2023-08-25 15:31:19 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:33:35 +0000 sctp: cleanup In particular, don't use a socket level flag, use the inp level one. After adding appropriate locking, this will close a race condition. --- sys/netinet/sctputil.c | 60 +++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 2f021c22165e..381f67f40b99 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4054,14 +4054,14 @@ void sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, uint32_t error, void *data, int so_locked) { - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here */ - return; - } - if (stcb->sctp_socket->so_rcv.sb_state & SBS_CANTRCVMORE) { + struct sctp_inpcb *inp; + struct sctp_nets *net; + + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + + inp = stcb->sctp_ep; + if (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) { return; } if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) || @@ -4073,6 +4073,12 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, return; } } + if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ)) { + return; + } + switch (notification) { case SCTP_NOTIFY_ASSOC_UP: if (stcb->asoc.assoc_up_sent == 0) { @@ -4091,32 +4097,20 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_assoc_change(SCTP_SHUTDOWN_COMP, stcb, error, NULL, false, false, so_locked); break; case SCTP_NOTIFY_INTERFACE_DOWN: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_UNREACHABLE, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_UNREACHABLE, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_INTERFACE_UP: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_AVAILABLE, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_AVAILABLE, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_INTERFACE_CONFIRMED: - { - struct sctp_nets *net; - - net = (struct sctp_nets *)data; - sctp_notify_peer_addr_change(stcb, SCTP_ADDR_CONFIRMED, - (struct sockaddr *)&net->ro._l_addr, error, so_locked); - break; - } + net = (struct sctp_nets *)data; + sctp_notify_peer_addr_change(stcb, SCTP_ADDR_CONFIRMED, + &net->ro._l_addr.sa, error, so_locked); + break; case SCTP_NOTIFY_SPECIAL_SP_FAIL: sctp_notify_send_failed2(stcb, error, (struct sctp_stream_queue_pending *)data, so_locked); @@ -4227,7 +4221,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, SCTPDBG(SCTP_DEBUG_UTIL1, "%s: unknown notification %xh (%u)\n", __func__, notification, notification); break; - } /* end switch */ + } } void From nobody Fri Sep 15 17:37:58 2023 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 4RnLxf6bSqz4tQBZ; Fri, 15 Sep 2023 17:37: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 4RnLxf63QSz3HV8; Fri, 15 Sep 2023 17:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799478; 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=b/peXpAsRdXDF6X4TxdjwzJ2Pfb0NKa74Zo7edKN0gE=; b=pDFXsoQf9gr3DCNyjeKqbdE9FH+8sDMpb8nw59Gg+kcPrS3x9knr4nSTj1R2omOry0oDlq R1genDjfVrLa4FQM9AUrn19vEjHBLOVfs2M0WpiPFNqePav8d+gKxhD6AZLxJK5tT8DAOd qwIL4SwU5xPMvUC6+HQFerOdHkZtvhDYpsRIInU3kDicL8MTKwTHsgh4xMek2OZ3+Ubgdd p0MkAxPR1NkIBHmgzEuKjoM9SWa7N1xMTtLvOJOROy2BhHX4SfGL7mOhB1K+/h27UPxHRX 6XBQP8P1ToCwDEYK9RzxO8PDeC2rSEtxY7d57mHH/KG01s6FWxbp9FqKUwYInA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799478; a=rsa-sha256; cv=none; b=Pl+bqZPX6O+jvk6WEhcZ7c4h3Qy5nCIk4ADR0L0ka7+FQxMiG3ZJSwaMR9J+MHF7+WP4Ve g3zDOjbaBm+4vDPiagUiJwrnnRjH8HCWVTS8ziLOLmZ4MhQAMTuX3ymE2kusT8o/MrEUtX Ks9V8oc2FIuu9SgliJosoXWF/ojd4q61F2qXCbs1oZJXO0d0+0NDtDocsQZcHf8V62JyDL xAZqOXlR08dzLmwPsLrXLVvi3wKvyTKid1Ol2HrdiSv2U6yCprzUdyojZUNSsUJaWMkvzW AJqj+xRax+BFK+PP8L18/svKIde3Rp3NCSReNxIcXqjQAQFPHR1b0MM8p5fjMw== 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=1694799478; 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=b/peXpAsRdXDF6X4TxdjwzJ2Pfb0NKa74Zo7edKN0gE=; b=l0hh38OR3LxNf/vTnJZfSf1H+CkhsBVxKB7k1nD+TV7bC9XMIIizXeHoWJqoXIeavXsqp6 7DrXkO+n6i35uoihv8v94gZQgN3v5gOShkKWl8lsczg6l/ISDaAvwZK7wYb85Y9UukXEKu 0HSSmim4aGprUjJQWPubrTm/FjtDqJLOjgj/O1GQMpY7NdY9nziuVt1yu2lNwtvxQbkvq+ AYIcyvJDZ+ROD4eEHA6sj9WIVAOZYnVLBqPXDs8+6M4q11N/gy4/G16zhqEnyFQcVVFrCC 0D28MZE5G49NH0aRnHPjX0ZRWqywANhHt8ml6Vy/n8D9UpwS/3nZNp6AXmtWMA== 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 4RnLxf4pZyzYTv; Fri, 15 Sep 2023 17:37: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 38FHbwCt039734; Fri, 15 Sep 2023 17:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHbwuN039732; Fri, 15 Sep 2023 17:37:58 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:37:58 GMT Message-Id: <202309151737.38FHbwuN039732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 073055503957 - stable/14 - sctp: cleanup SCTP AUTH related notification 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 073055503957a78daae0fdbd688a803f56e778a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=073055503957a78daae0fdbd688a803f56e778a6 commit 073055503957a78daae0fdbd688a803f56e778a6 Author: Michael Tuexen AuthorDate: 2023-09-08 11:13:43 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:35:57 +0000 sctp: cleanup SCTP AUTH related notification This makes consistent use of the parameters and ensures that all SCTP AUTH related notifications are using sctp_ulp_notify(). No functional change intended. --- sys/netinet/sctp_auth.c | 32 ++++++++++++++++---------------- sys/netinet/sctp_auth.h | 2 +- sys/netinet/sctputil.c | 15 ++++++--------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index 67f0d26fa0d5..3c1962233347 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -575,7 +575,7 @@ sctp_auth_key_release(struct sctp_tcb *stcb, uint16_t key_id, int so_locked) if ((skey->refcount <= 2) && (skey->deactivated)) { /* notify ULP that key is no longer used */ sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, - key_id, 0, so_locked); + 0, &key_id, so_locked); SCTPDBG(SCTP_DEBUG_AUTH2, "%s: stcb %p key %u no longer used, %d\n", __func__, (void *)stcb, key_id, skey->refcount); @@ -1312,7 +1312,7 @@ sctp_deact_sharedkey(struct sctp_tcb *stcb, uint16_t keyid) /* are there other refcount holders on the key? */ if (skey->refcount == 1) { /* no other users, send a notification for this key */ - sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, keyid, 0, + sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, 0, &keyid, SCTP_SO_LOCKED); } @@ -1654,15 +1654,10 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *auth, return (-1); } /* generate a notification if this is a new key id */ - if (stcb->asoc.authinfo.recv_keyid != shared_key_id) - /* - * sctp_ulp_notify(SCTP_NOTIFY_AUTH_NEW_KEY, stcb, - * shared_key_id, (void - * *)stcb->asoc.authinfo.recv_keyid); - */ - sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, - shared_key_id, stcb->asoc.authinfo.recv_keyid, - SCTP_SO_NOT_LOCKED); + if (stcb->asoc.authinfo.recv_keyid != shared_key_id) { + sctp_ulp_notify(SCTP_NOTIFY_AUTH_NEW_KEY, stcb, 0, + &shared_key_id, SCTP_SO_NOT_LOCKED); + } /* compute a new recv assoc key and cache it */ if (stcb->asoc.authinfo.recv_key != NULL) sctp_free_key(stcb->asoc.authinfo.recv_key); @@ -1705,7 +1700,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *auth, */ void sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, - uint16_t keyid, uint16_t alt_keyid, int so_locked) + uint16_t keyid, int so_locked) { struct mbuf *m_notify; struct sctp_authkey_event *auth; @@ -1714,8 +1709,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, if ((stcb == NULL) || (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) - ) { + (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { /* If the socket is gone we are out of here */ return; } @@ -1737,7 +1731,12 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, auth->auth_flags = 0; auth->auth_length = sizeof(*auth); auth->auth_keynumber = keyid; - auth->auth_altkeynumber = alt_keyid; + /* XXXMT: The following is BSD specific. */ + if (indication == SCTP_AUTH_NEW_KEY) { + auth->auth_altkeynumber = stcb->asoc.authinfo.recv_keyid; + } else { + auth->auth_altkeynumber = 0; + } auth->auth_indication = indication; auth->auth_assoc_id = sctp_get_associd(stcb); @@ -1757,7 +1756,8 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, /* not that we need this */ control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } /*- diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h index 8bfdbaa6d4f6..279ecb6831cd 100644 --- a/sys/netinet/sctp_auth.h +++ b/sys/netinet/sctp_auth.h @@ -212,7 +212,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *ch, struct mbuf *m, uint32_t offset); extern void sctp_notify_authentication(struct sctp_tcb *stcb, - uint32_t indication, uint16_t keyid, uint16_t alt_keyid, int so_locked); + uint32_t indication, uint16_t keyid, int so_locked); extern int sctp_validate_init_auth_params(struct mbuf *m, int offset, int limit); diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 381f67f40b99..ea960a3e6376 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4197,19 +4197,16 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_shutdown_event(stcb); break; case SCTP_NOTIFY_AUTH_NEW_KEY: - sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, + *(uint16_t *)data, so_locked); break; case SCTP_NOTIFY_AUTH_FREE_KEY: - sctp_notify_authentication(stcb, SCTP_AUTH_FREE_KEY, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_FREE_KEY, + *(uint16_t *)data, so_locked); break; case SCTP_NOTIFY_NO_PEER_AUTH: - sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, + 0, so_locked); break; case SCTP_NOTIFY_SENDER_DRY: sctp_notify_sender_dry_event(stcb, so_locked); From nobody Fri Sep 15 17:40:44 2023 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 4RnM0r2Cfmz4tQly; Fri, 15 Sep 2023 17:40:44 +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 4RnM0r23n0z3J01; Fri, 15 Sep 2023 17:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799644; 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=sQ6yAP2WHQaEmEUN7NXV7z8B6eCWQFL1lnPSo7i6V1k=; b=hHsAHitJSAA9TpKcZ/z5Iysr88ia7xlUvwYaucPBScYJtLigzKaHYL4uh4FWHACSxPp/Ft toWTGZqKfUjfashizz1O+9/Xi5DhKons97ZySm6Qxq6V1TGtrDkrckDpWEAwID/3CYbRFZ dae5UqonoYls3Rb71khBGX8zKTMWni07WZH+ePeNuAnDm0dg0HhK8XqpNFLR+l/8SaWbHN b9W6/i6GNoYTpYqYbVYB9seA7DBj6hdlhbbM5ez3HMBak0TlbU213p0nARWwOSZylFshP1 lUWzGXcbunrZets5olL2MpUXQb6sFkpy8Isd/2YzTaSLIrjG09U1OI5l65B0qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799644; a=rsa-sha256; cv=none; b=kulYfT09j7/byBnxANnZfczV7pou8ephyxHuDY5LajyXPMcz5EQqgG1cFzilo+GcjeGiew i8nIHP8l5QxvxUb6NKvX/cOPnwDToUrI90t6vY8M6wP1B5Gdi64WECoLIN12JsgYQNytuM Bpf4WHETq2LgUkD97z5BAgBr3gZuUi6xLhqeWQ5iwsL0cDo4OcHWHozT/Gx66I2qyweDPC uyUPARu/norKVe9WhMyweXBKHFPLWZwEBuwyGTcfFepwEj79Uk9eGwcP9V12B4qF0zyuMA 8c58FvA+faHayVD4g61EjJkCdEjFVtU29iOZStlyY+XkUuM9DlfYHFf+6fx10A== 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=1694799644; 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=sQ6yAP2WHQaEmEUN7NXV7z8B6eCWQFL1lnPSo7i6V1k=; b=EIJx2jdzhXDD8jrGWVuNCClQ4K1yDoJMi7znHQf6DCKTm7H7zS+h8IdEneq/lt0RRmyGpf mKSaUKvixvTLYvhK+I4q+uMpnCBGSMS9dfo7Vtz/v1Fw4qMsc2Y/fluEQxyvi1ICoMRFTp y1zcgq0mnjw3pYgUarcKvkBK2duKgV32tRSmwNm0PwFgDNG7N40DAd5AkyxHrSXKbpHKNR jZE8n92Tb+kqQ0mwVwftqeYNXnSRWr3GY38abB8oj0/NJc8TAyImb9a+ls8V0zpWj1WDkU bqS3eRpjZr50X5IAJMYc9zxlD/uXAmztE7g1po8FVn7LHiZsZiHBJj6Ah5D3lQ== 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 4RnM0r15SLzYTx; Fri, 15 Sep 2023 17:40:44 +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 38FHeidR048734; Fri, 15 Sep 2023 17:40:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHeiTO048731; Fri, 15 Sep 2023 17:40:44 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:40:44 GMT Message-Id: <202309151740.38FHeiTO048731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8d7d28e8c807 - stable/14 - sctp: make sure all SCTP RESET notifications use sctp_ulp_notify() 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d7d28e8c8072b9fd8be8e79d854dca175cce4a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8d7d28e8c8072b9fd8be8e79d854dca175cce4a9 commit 8d7d28e8c8072b9fd8be8e79d854dca175cce4a9 Author: Michael Tuexen AuthorDate: 2023-09-08 12:19:56 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:38:29 +0000 sctp: make sure all SCTP RESET notifications use sctp_ulp_notify() While there, improve consistency of the notification related code. No functional change intended. --- sys/netinet/sctp_constants.h | 14 +++-- sys/netinet/sctp_input.c | 26 ++++----- sys/netinet/sctputil.c | 135 ++++++++++++++++++++++--------------------- sys/netinet/sctputil.h | 6 -- 4 files changed, 86 insertions(+), 95 deletions(-) diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h index 881db9dd87cc..2054849fd5e9 100644 --- a/sys/netinet/sctp_constants.h +++ b/sys/netinet/sctp_constants.h @@ -706,12 +706,14 @@ #define SCTP_NOTIFY_STR_RESET_FAILED_IN 20 #define SCTP_NOTIFY_STR_RESET_DENIED_OUT 21 #define SCTP_NOTIFY_STR_RESET_DENIED_IN 22 -#define SCTP_NOTIFY_AUTH_NEW_KEY 23 -#define SCTP_NOTIFY_AUTH_FREE_KEY 24 -#define SCTP_NOTIFY_NO_PEER_AUTH 25 -#define SCTP_NOTIFY_SENDER_DRY 26 -#define SCTP_NOTIFY_REMOTE_ERROR 27 -#define SCTP_NOTIFY_ASSOC_TIMEDOUT 28 +#define SCTP_NOTIFY_STR_RESET_ADD 23 +#define SCTP_NOTIFY_STR_RESET_TSN 24 +#define SCTP_NOTIFY_AUTH_NEW_KEY 25 +#define SCTP_NOTIFY_AUTH_FREE_KEY 26 +#define SCTP_NOTIFY_NO_PEER_AUTH 27 +#define SCTP_NOTIFY_SENDER_DRY 28 +#define SCTP_NOTIFY_REMOTE_ERROR 29 +#define SCTP_NOTIFY_ASSOC_TIMEDOUT 30 /* This is the value for messages that are NOT completely * copied down where we will start to split the message. diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index e6dc41e08909..6937f8a2a43f 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -3510,23 +3510,19 @@ sctp_handle_stream_reset_response(struct sctp_tcb *stcb, asoc->strmout[i].state = SCTP_STREAM_OPEN; } asoc->streamoutcnt += num_stream; - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } else if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_FAILED, NULL, SCTP_SO_NOT_LOCKED); } } else if (type == SCTP_STR_RESET_ADD_IN_STREAMS) { if (asoc->stream_reset_outstanding) asoc->stream_reset_outstanding--; if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else if (action != SCTP_STREAM_RESET_RESULT_PERFORMED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } } else if (type == SCTP_STR_RESET_TSN_REQUEST) { /** @@ -3572,13 +3568,11 @@ sctp_handle_stream_reset_response(struct sctp_tcb *stcb, sctp_reset_out_streams(stcb, 0, (uint16_t *)NULL); sctp_reset_in_stream(stcb, 0, (uint16_t *)NULL); - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } else if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), - SCTP_ASSOC_RESET_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, SCTP_ASSOC_RESET_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else { - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), - SCTP_ASSOC_RESET_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, SCTP_ASSOC_RESET_FAILED, NULL, SCTP_SO_NOT_LOCKED); } } /* get rid of the request and get the request flags */ @@ -3707,7 +3701,7 @@ sctp_handle_str_reset_request_tsn(struct sctp_tcb *stcb, sctp_reset_out_streams(stcb, 0, (uint16_t *)NULL); sctp_reset_in_stream(stcb, 0, (uint16_t *)NULL); asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_PERFORMED; - sctp_notify_stream_reset_tsn(stcb, asoc->sending_seq, (asoc->mapping_array_base_tsn + 1), 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } sctp_add_stream_reset_result_tsn(chk, seq, asoc->last_reset_action[0], asoc->last_sending_seq[0], asoc->last_base_tsnsent[0]); @@ -3872,7 +3866,7 @@ sctp_handle_str_reset_add_strm(struct sctp_tcb *stcb, struct sctp_tmit_chunk *ch /* update the size */ stcb->asoc.streamincnt = num_stream; stcb->asoc.last_reset_action[0] = SCTP_STREAM_RESET_RESULT_PERFORMED; - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } sctp_add_stream_reset_result(chk, seq, asoc->last_reset_action[0]); asoc->str_reset_seq_in++; diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index ea960a3e6376..17a5a098dd90 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3140,9 +3140,10 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, struct mbuf *m_notify; struct sctp_assoc_change *sac; struct sctp_queued_to_read *control; + struct sctp_inpcb *inp; unsigned int notif_len; - uint16_t abort_len; unsigned int i; + uint16_t abort_len; KASSERT(abort == NULL || from_peer, ("sctp_notify_assoc_change: ABORT chunk provided for local termination")); @@ -3151,7 +3152,8 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, if (stcb == NULL) { return; } - if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { + inp = stcb->sctp_ep; + if (sctp_stcb_is_feature_on(inp, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { notif_len = (unsigned int)sizeof(struct sctp_assoc_change); if (abort != NULL) { abort_len = ntohs(abort->ch.chunk_length); @@ -3229,10 +3231,9 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, - so_locked); + sctp_add_to_readq(inp, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -3242,8 +3243,8 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, * comes in. */ set_error: - if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && + if (((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) { SOCK_LOCK(stcb->sctp_socket); if (from_peer) { @@ -3266,8 +3267,8 @@ set_error: SOCK_UNLOCK(stcb->sctp_socket); } /* Wake ANY sleepers */ - if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && + if (((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) { socantrcvmore(stcb->sctp_socket); } @@ -3356,11 +3357,9 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, - so_locked); + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3487,11 +3486,9 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, - so_locked); + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3585,13 +3582,13 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void -sctp_notify_adaptation_layer(struct sctp_tcb *stcb) +sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_adaptation_event *sai; @@ -3632,9 +3629,9 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb) control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3702,7 +3699,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, } static void -sctp_notify_shutdown_event(struct sctp_tcb *stcb) +sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_shutdown_event *sse; @@ -3749,14 +3746,13 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb) control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void -sctp_notify_sender_dry_event(struct sctp_tcb *stcb, - int so_locked) +sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_sender_dry_event *event; @@ -3798,11 +3794,12 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, /* not that we need this */ control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } -void -sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t numberout, int flag) +static void +sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3837,8 +3834,8 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t stradd->strchange_flags = flag; stradd->strchange_length = sizeof(struct sctp_stream_change_event); stradd->strchange_assoc_id = sctp_get_associd(stcb); - stradd->strchange_instrms = numberin; - stradd->strchange_outstrms = numberout; + stradd->strchange_instrms = stcb->asoc.streamincnt; + stradd->strchange_outstrms = stcb->asoc.streamoutcnt; SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_stream_change_event); SCTP_BUF_NEXT(m_notify) = NULL; if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) { @@ -3859,13 +3856,13 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } -void -sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32_t recv_tsn, int flag) +static void +sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3894,8 +3891,8 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32 strasoc->assocreset_flags = flag; strasoc->assocreset_length = sizeof(struct sctp_assoc_reset_event); strasoc->assocreset_assoc_id = sctp_get_associd(stcb); - strasoc->assocreset_local_tsn = sending_tsn; - strasoc->assocreset_remote_tsn = recv_tsn; + strasoc->assocreset_local_tsn = stcb->asoc.sending_seq; + strasoc->assocreset_remote_tsn = stcb->asoc.mapping_array_base_tsn + 1; SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_assoc_reset_event); SCTP_BUF_NEXT(m_notify) = NULL; if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) { @@ -3916,14 +3913,14 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32 control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void sctp_notify_stream_reset(struct sctp_tcb *stcb, - int number_entries, uint16_t *list, int flag) + int number_entries, uint16_t *list, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3980,13 +3977,14 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); } static void -sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_error_chunk *chunk) +sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, + struct sctp_error_chunk *chunk, int so_locked) { struct mbuf *m_notify; struct sctp_remote_error *sre; @@ -4041,10 +4039,9 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_erro control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + SCTP_READ_LOCK_NOT_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -4086,11 +4083,10 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, stcb->asoc.assoc_up_sent = 1; } if (stcb->asoc.adaptation_needed && (stcb->asoc.adaptation_sent == 0)) { - sctp_notify_adaptation_layer(stcb); + sctp_notify_adaptation_layer(stcb, so_locked); } if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, - NULL, so_locked); + sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); } break; case SCTP_NOTIFY_ASSOC_DOWN: @@ -4155,31 +4151,36 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, case SCTP_NOTIFY_ASSOC_RESTART: sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, false, false, so_locked); if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, - NULL, so_locked); + sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); } break; case SCTP_NOTIFY_STR_RESET_SEND: - sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_OUTGOING_SSN); + sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_OUTGOING_SSN, so_locked); break; case SCTP_NOTIFY_STR_RESET_RECV: - sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_INCOMING); + sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_INCOMING, so_locked); break; case SCTP_NOTIFY_STR_RESET_FAILED_OUT: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_FAILED)); + (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_FAILED), so_locked); break; case SCTP_NOTIFY_STR_RESET_DENIED_OUT: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_DENIED)); + (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_DENIED), so_locked); break; case SCTP_NOTIFY_STR_RESET_FAILED_IN: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_FAILED)); + (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_FAILED), so_locked); break; case SCTP_NOTIFY_STR_RESET_DENIED_IN: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_DENIED)); + (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_DENIED), so_locked); + break; + case SCTP_NOTIFY_STR_RESET_ADD: + sctp_notify_stream_reset_add(stcb, error, so_locked); + break; + case SCTP_NOTIFY_STR_RESET_TSN: + sctp_notify_stream_reset_tsn(stcb, error, so_locked); break; case SCTP_NOTIFY_ASCONF_ADD_IP: sctp_notify_peer_addr_change(stcb, SCTP_ADDR_ADDED, data, @@ -4194,7 +4195,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, error, so_locked); break; case SCTP_NOTIFY_PEER_SHUTDOWN: - sctp_notify_shutdown_event(stcb); + sctp_notify_shutdown_event(stcb, so_locked); break; case SCTP_NOTIFY_AUTH_NEW_KEY: sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, @@ -4212,7 +4213,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_sender_dry_event(stcb, so_locked); break; case SCTP_NOTIFY_REMOTE_ERROR: - sctp_notify_remote_error(stcb, error, data); + sctp_notify_remote_error(stcb, error, data, so_locked); break; default: SCTPDBG(SCTP_DEBUG_UTIL1, "%s: unknown notification %xh (%u)\n", diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index c649611d5004..8de98b4608f8 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -80,12 +80,6 @@ int sctp_init_asoc(struct sctp_inpcb *, struct sctp_tcb *, uint32_t, uint32_t, u void sctp_fill_random_store(struct sctp_pcb *); -void -sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, - uint16_t numberout, int flag); -void - sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32_t recv_tsn, int flag); - /* * NOTE: sctp_timer_start() will increment the reference count of any relevant * structure the timer is referencing, in order to prevent a race condition From nobody Fri Sep 15 17:43:01 2023 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 4RnM3V1ZB5z4tRJM; Fri, 15 Sep 2023 17:43: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 4RnM3V1CDXz3JjQ; Fri, 15 Sep 2023 17:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799782; 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=2FPs4mTtzLQw8aNkVzab5WN3L7gJffFE9YZzlbXBcdY=; b=mL7cozydiLUCutqgKJUL66M1plBTy7RjwW2tSEFtSgu74VGU4hjHs6AEa1/nI1JgbK1XAR ojwldTLkbwdENYxwlvn8ia7+y9Yy3etu/BWdCuE6W0g6V0/fG9YxpAurlxxKcn8uCPaHNW /H/RI3X+sSSiG1t/CEDUBiEepbUHJQAp0JqSHjLN3Qo8POc6zeMnf8g9h9YS2t+tCLKgph xGMvOaFQCRbiTk0MvkkZZ7ZH4T8ulnqVx1z+8ChonQTzkpyH6N9uhQUeFgyv9c6wHlc0uS xs2qj7tEHaU9Z2kuFkp7E5G2s4Jzyzc/C9Lvj92sGQq51cOeRHEwHQUf5oJ5cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799782; a=rsa-sha256; cv=none; b=mNE8pZjmzR0AdkY9Io3sHtrk8+DUQBM/fKkn1kLuVHmfmXB1XOVcu2XIDgH1u4KvT5wt9y W5qnz9NXaJW9XSqrm7eHYhLBSkQvpus/+TSKXSZmFQ7eRDE3hdDxH9eZRoOAzPQ222jXmx 6dDmNEAqeXCGWt41hCHkVehLsIrbrvV8JV8BUCVUkxa3RWYleDIBGJP+lH8xxUNWkL6Ixb EhcZPKUKYIgYiu9mJBjoCkuGBXuGaJykjFNlvAetnV1p6XATzuL9onG6UniMFkUUF/Pywn fcPdDtg+1pQNSqP/9k5pVuklZjq9ePFVCkwdHjw0DHTdawZAp37riwgvXFQv4w== 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=1694799782; 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=2FPs4mTtzLQw8aNkVzab5WN3L7gJffFE9YZzlbXBcdY=; b=gKrBRnxrdIeXBTkVLzUtN7k0xQOJiAslZL5zNnHhI3F1MUSfd4lMV0Mt3RIr9iXfz9HSrM hjkAPMQ3dCloMqc6sg2VGR5n/KMPooeZ5K8UcTXgN5j7KTLE8ihuBJOCLC6RDntddUM1jy 8t7KF5NfUXelW4lLBDk1ebeqBQs1PfY/WVUo+7K8pvR9C+fnzzqzRkWAm6LWnhwmazEP/s E+OufF4U7Zks/91Iu804kQdv2najXprDnfb66bVa3oSMs/J4POc4l2Jrud/3VGnrtEno/u 40BEGa2p+JrHJsFv8uvENgohMJFMLFGuNbytTkjIlOIvFImxBhhdqDzUYxLtng== 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 4RnM3V0G5DzYq5; Fri, 15 Sep 2023 17:43: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 38FHh1Gs056065; Fri, 15 Sep 2023 17:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHh1ms056062; Fri, 15 Sep 2023 17:43:01 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:43:01 GMT Message-Id: <202309151743.38FHh1ms056062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2139107d2d44 - stable/14 - sctp: cleanup locking for notifications 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2139107d2d44aed3be7f3a7401003f2879b71789 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2139107d2d44aed3be7f3a7401003f2879b71789 commit 2139107d2d44aed3be7f3a7401003f2879b71789 Author: Michael Tuexen AuthorDate: 2023-09-08 14:20:51 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:41:16 +0000 sctp: cleanup locking for notifications All notifications are now queued via sctp_ulp_notify(). Do the locking of the inp read lock there and validate this in all functions being used. This is one step in avoiding race conditions when closing the read end of an SCTP socket. --- sys/netinet/sctp_auth.c | 12 ++--- sys/netinet/sctputil.c | 132 ++++++++++++++++++++++++++++++------------------ 2 files changed, 87 insertions(+), 57 deletions(-) diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index 3c1962233347..8bcb6d5243db 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -1706,13 +1706,9 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, struct sctp_authkey_event *auth; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_AUTHEVNT)) /* event not enabled */ @@ -1757,7 +1753,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } /*- diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 17a5a098dd90..11469236014e 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3149,10 +3149,11 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, ("sctp_notify_assoc_change: ABORT chunk provided for local termination")); KASSERT(!from_peer || !timedout, ("sctp_notify_assoc_change: timeouts can only be local")); - if (stcb == NULL) { - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); inp = stcb->sctp_ep; + SCTP_INP_READ_LOCK_ASSERT(inp); + if (sctp_stcb_is_feature_on(inp, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { notif_len = (unsigned int)sizeof(struct sctp_assoc_change); if (abort != NULL) { @@ -3233,7 +3234,7 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, control->tail_mbuf = m_notify; sctp_add_to_readq(inp, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -3284,11 +3285,15 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, struct sctp_paddr_change *spc; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPADDREVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPADDREVNT)) { /* event not enabled */ return; } + m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_paddr_change), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) return; @@ -3359,7 +3364,7 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3373,9 +3378,12 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, struct sctp_chunkhdr *chkhdr; int notifhdr_len, chk_len, chkhdr_len, padding_len, payload_len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && + sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { /* event not enabled */ return; } @@ -3488,7 +3496,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3501,12 +3509,16 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, struct sctp_queued_to_read *control; int notifhdr_len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && + sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { /* event not enabled */ return; } + if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { notifhdr_len = sizeof(struct sctp_send_failed_event); } else { @@ -3584,7 +3596,7 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3594,8 +3606,11 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) struct sctp_adaptation_event *sai; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ADAPTATIONEVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ADAPTATIONEVNT)) { /* event not enabled */ return; } @@ -3631,7 +3646,7 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3644,15 +3659,16 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, struct sctp_queued_to_read *control; struct sockbuf *sb; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_PDAPIEVNT)) { + KASSERT(aborted_control != NULL, ("aborted_control is NULL")); + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_PDAPIEVNT)) { /* event not enabled */ return; } - KASSERT(aborted_control != NULL, ("aborted_control is NULL")); - SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); - m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) /* no space left */ @@ -3705,6 +3721,10 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) struct sctp_shutdown_event *sse; struct sctp_queued_to_read *control; + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + /* * For TCP model AND UDP connected sockets we will send an error up * when an SHUTDOWN completes @@ -3714,6 +3734,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) /* mark socket closed for read/write and wakeup! */ socantsendmore(stcb->sctp_socket); } + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSHUTDOWNEVNT)) { /* event not enabled */ return; @@ -3748,7 +3769,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3758,8 +3779,11 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) struct sctp_sender_dry_event *event; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_DRYEVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_DRYEVNT)) { /* event not enabled */ return; } @@ -3795,7 +3819,7 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3805,13 +3829,10 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) struct sctp_queued_to_read *control; struct sctp_stream_change_event *stradd; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here. */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT)) { /* event not enabled */ return; @@ -3858,7 +3879,7 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3868,13 +3889,10 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) struct sctp_queued_to_read *control; struct sctp_assoc_reset_event *strasoc; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here. */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT)) { /* event not enabled */ return; @@ -3915,7 +3933,7 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3927,8 +3945,11 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, struct sctp_stream_reset_event *strreset; int len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_RESETEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_RESETEVNT)) { /* event not enabled */ return; } @@ -3979,7 +4000,7 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3992,10 +4013,14 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, unsigned int notif_len; uint16_t chunk_len; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPEERERR)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPEERERR)) { return; } + if (chunk != NULL) { chunk_len = ntohs(chunk->ch.chunk_length); /* @@ -4041,7 +4066,7 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -4070,9 +4095,15 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, return; } } + if (notification != SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION) { + SCTP_INP_READ_LOCK(inp); + } + SCTP_INP_READ_LOCK_ASSERT(inp); + if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ)) { + SCTP_INP_READ_UNLOCK(inp); return; } @@ -4220,6 +4251,9 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, __func__, notification, notification); break; } + if (notification != SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION) { + SCTP_INP_READ_UNLOCK(inp); + } } void From nobody Fri Sep 15 17:45:17 2023 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 4RnM654Ggjz4tRnL; Fri, 15 Sep 2023 17:45: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 4RnM653nJJz3K4y; Fri, 15 Sep 2023 17:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694799917; 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=DImp89lFD1P48uNi3rgrWUON+MgdSqWIam2evXi935Y=; b=g8KCOG+Lksl2/MN3MGq+tqq/VUOPj2DzL72odHRhA9DI8OveuZrCYeNNgGP4Y6wDx+VMCi Kvwmy5Cv2T7n/i8u67eJZauynHRs9NHTgIMFK62BgJF+VxHjgALKu+Luu48KWWRs5RMa85 nWh4s8z8HWjP0o/PR9kNG6a7QKJcXwcmaSkXpAzJlKi4vtNKlFS7Ic3qX/8CmVvG0xsJmf JtSbc9WqFZIW7FOZKId0BysPCtjOulB+QxG7i0hmB2dK1VrO3FWPk3fXk0+AlHDJPC2+1S PFR+PuFhVmIYDqNag/jFXPtw1oezTjukrLHF//9j0tPSboB+Yy+Oa3z07O4TZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694799917; a=rsa-sha256; cv=none; b=kqY9SnJlgnM5fAUduGyUCk1TL+XUOa3TB78yef2f5woXsQkIpZptK2d180Bz4Po5PqzRtd N5wRw5Y5euazaL0AmjmYkG1G/7Qq0Rl5LipFlMXQfKT+3o49FnW+WVXqXff/9lCW9xVqw7 /nQV32kIW6Uu8o+K5IfJ1arddH/ATD7K2dyY4NIGsYuCnlzz/0Jo9wtehrUi6BEnhb92Xj tAumM6askU1isTQf36KgjjkoOKbdmZDKtIIj5NVASGOA/PAU/DMimKFpCggbN7Syz7T+IH eDFj5i/8vLj3YXt+YTObOtGrUKtjKqJBVpTuWd49Q8AhXAhrhUUw5gw6JfZybA== 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=1694799917; 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=DImp89lFD1P48uNi3rgrWUON+MgdSqWIam2evXi935Y=; b=lcHPe8qBhm7xHJKHU3LkqEriDWPwZRoe/5Gi8OJWGiNjgsM3lBd5hD8PLsUn5+WeoxcQHo U57NgLbDEH9ZrUXyjGe/OJL+sgHar8Efy06kOHrI0Ot9wT8R3dj4qSYpr1i8HmbBcRRCrW EpXbApwFwpomc5DfR76bqmDw36tdbeA55R36GpEQvSiQU9qbywMvDvjbafiu6xYP2N+jlD 0fxh+lUeAxsrWYUveRFsGinnJV9APGZwi/nU2+Mw0RvIWrKKPqPyPWOXaYcRHmRPhY0qhi p/iOv4pzHDgAUjPBKV1jGGVOXERDMIIGK0BM8OrXZthvHTTyHBgn/okStmRUPg== 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 4RnM652rPvzYhm; Fri, 15 Sep 2023 17:45: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 38FHjHYE056539; Fri, 15 Sep 2023 17:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHjHjZ056536; Fri, 15 Sep 2023 17:45:17 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:45:17 GMT Message-Id: <202309151745.38FHjHjZ056536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 78e5017cbe52 - stable/14 - sctp: don't call sctp_ulp_notify() recursively 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 commit 78e5017cbe5228c8bef7a2d3c48a95e565eeefc8 Author: Michael Tuexen AuthorDate: 2023-09-08 19:19:59 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:43:30 +0000 sctp: don't call sctp_ulp_notify() recursively This does not work with the new locking scheme. --- sys/netinet/sctputil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 11469236014e..19180b3cf725 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4117,7 +4117,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_adaptation_layer(stcb, so_locked); } if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_ASSOC_DOWN: @@ -4182,7 +4182,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, case SCTP_NOTIFY_ASSOC_RESTART: sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, false, false, so_locked); if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_STR_RESET_SEND: From nobody Fri Sep 15 17:47:32 2023 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 4RnM8h6qrYz4tSMD; Fri, 15 Sep 2023 17:47:32 +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 4RnM8h6NlSz3KFN; Fri, 15 Sep 2023 17:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694800052; 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=nIsOdxzV5cTHWV+EhqZ09oR6+FVwC1wZuyIqvTt9YCY=; b=fMZaPT+I2TZpm88gXy9FVcJiUK8Ej1NQF1Sbc2oFEeSLk9mXJoMOVp161SQflQFGIQeKft k3ipeXnF+iwMYLEie1Rv17Lz0o1c++QUsUuvFPgXoss+4LlT4K/R/Nl45h2bqYmvCrtmOU 300MvBz/oRXSpuZ5h5orFYujDV8jnKRdEFocbz9IOK2JoPaUeGq4rht+1OadIcy5geKUPT mUIaw3bgQ3sjw9XEGO7ASA855PpP/yGBA68e85C6lUFufw5HmbkovAK9NGfMKbeg7oS53P Lro6TWUz1leQ/jVKPFDwozh1DWJ3z6jwRteaxY1i0y8Hx/zZjubAO8k3evJyHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694800052; a=rsa-sha256; cv=none; b=jV7tl/SKAas+mJDA7OXXz6SiipTSBU5G9+yFrbPtk/mebINh3ethA0mh4j7q/DIZ99d8bb cF5QEIFg3ptqVUj96Cg0tIJZFsWhJGLdf3I9tmwArusHzgS31W+7JHkgdBkQmIXu7weAKX QlDpCFmzsPqUdG7XCsATxphJ8xFOzzryZdI8yMK3LISZ43na4L1T2NyeQQI1wS2kTJwDou VAp92yN/yzVOkXhywC/3dHkULyNRwta1WaqK2PHdKWFb64eVN2HzklWA8o7ymJVA1oI4Z6 aDc2kvHix5rY/6ls5viCJHTWvWDf/niduGvA7GI8TiSTNqh9C8wWLPE5gr17ZA== 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=1694800052; 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=nIsOdxzV5cTHWV+EhqZ09oR6+FVwC1wZuyIqvTt9YCY=; b=Z4kQqUST6ME8H45eZxK32+EB/yHcp9LUReWBYcFMD656gWuIqjxIPfOqAsAaZ3R9AWpdZL bD73OPCz7RMdQ2AcIBWQoH8V0gI8mgD0S/HEYJngRzfPS7vFIydJGVGJS9cHnbueRdaUNz CblCWizcu2uXv2PGHIhbjiH3CUwzN/5EShv0Fu/CYLswIAJbAIZmcYtpp3cm6aWhyBKQ8C +HImsGcAmDUZ/plQwd/oASFnE9zWPYbjOnK8d1M319VmCjvnL20X0+wBTfXimTrI8T5dMo mWeMespDLIj6zI03NfXJs7dBQXrUd/opEgxsVx0bDBZq48NKU64AyotPwntAow== 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 4RnM8h5SRGzZ1B; Fri, 15 Sep 2023 17:47:32 +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 38FHlWB8056943; Fri, 15 Sep 2023 17:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHlWdd056940; Fri, 15 Sep 2023 17:47:32 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:47:32 GMT Message-Id: <202309151747.38FHlWdd056940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c4e047ab6eb1 - stable/14 - sctp: improve shutting down the read side of a socket 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4e047ab6eb15d27f95f46ccf12d55c46d30debd Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e047ab6eb15d27f95f46ccf12d55c46d30debd commit c4e047ab6eb15d27f95f46ccf12d55c46d30debd Author: Michael Tuexen AuthorDate: 2023-09-12 23:33:54 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:45:42 +0000 sctp: improve shutting down the read side of a socket When shutdown(..., SHUT_RD) or shutdown(..., SHUT_RDWR) is called, really clean up the read queue and issue an ungraceful shutdown if user messages are affected. Reported by: syzbot+d4e1d30d578891245f59@syzkaller.appspotmail.com --- sys/netinet/sctp_usrreq.c | 90 ++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 33 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 52b4faf48574..02bb87578528 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -777,52 +777,76 @@ sctp_disconnect(struct socket *so) int sctp_flush(struct socket *so, int how) { - /* - * We will just clear out the values and let subsequent close clear - * out the data, if any. Note if the user did a shutdown(SHUT_RD) - * they will not be able to read the data, the socket will block - * that from happening. - */ + struct epoch_tracker et; + struct sctp_tcb *stcb; + struct sctp_queued_to_read *control, *ncontrol; struct sctp_inpcb *inp; + struct mbuf *m, *op_err; + bool need_to_abort = false; + /* + * For 1-to-1 style sockets, flush the read queue and trigger an + * ungraceful shutdown of the association, if and only if user + * messages are lost. Loosing notifications does not need to be + * signalled to the peer. + */ + if (how == PRU_FLUSH_WR) { + /* This function is only relevant for the read directions. */ + return (0); + } inp = (struct sctp_inpcb *)so->so_pcb; if (inp == NULL) { SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); return (EINVAL); } - SCTP_INP_RLOCK(inp); - /* For the 1 to many model this does nothing */ + SCTP_INP_WLOCK(inp); if (inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) { - SCTP_INP_RUNLOCK(inp); + /* For 1-to-many style sockets this function does nothing. */ + SCTP_INP_WUNLOCK(inp); return (0); } - SCTP_INP_RUNLOCK(inp); - if ((how == PRU_FLUSH_RD) || (how == PRU_FLUSH_RDWR)) { - /* - * First make sure the sb will be happy, we don't use these - * except maybe the count - */ - SCTP_INP_WLOCK(inp); - SCTP_INP_READ_LOCK(inp); - inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; - SCTP_INP_READ_UNLOCK(inp); + stcb = LIST_FIRST(&inp->sctp_asoc_list); + if (stcb == NULL) { SCTP_INP_WUNLOCK(inp); - SOCK_LOCK(so); - KASSERT(!SOLISTENING(so), - ("sctp_flush: called on listening socket %p", so)); - SCTP_SB_CLEAR(so->so_rcv); - SOCK_UNLOCK(so); + return (ENOTCONN); } - if ((how == PRU_FLUSH_WR) || (how == PRU_FLUSH_RDWR)) { - /* - * First make sure the sb will be happy, we don't use these - * except maybe the count - */ - SOCK_LOCK(so); - KASSERT(!SOLISTENING(so), - ("sctp_flush: called on listening socket %p", so)); - SOCK_UNLOCK(so); + SCTP_TCB_LOCK(stcb); + SCTP_INP_READ_LOCK(inp); + inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; + SOCK_LOCK(so); + TAILQ_FOREACH_SAFE(control, &inp->read_queue, next, ncontrol) { + if ((control->spec_flags & M_NOTIFICATION) == 0) { + need_to_abort = true; + } + TAILQ_REMOVE(&inp->read_queue, control, next); + control->on_read_q = 0; + for (m = control->data; m; m = SCTP_BUF_NEXT(m)) { + sctp_sbfree(control, control->stcb, &so->so_rcv, m); + } + if (control->on_strm_q == 0) { + sctp_free_remote_addr(control->whoFrom); + if (control->data) { + sctp_m_freem(control->data); + control->data = NULL; + } + sctp_free_a_readq(stcb, control); + } else { + stcb->asoc.size_on_all_streams += control->length; + } } + SOCK_UNLOCK(so); + SCTP_INP_READ_UNLOCK(inp); + if (need_to_abort) { + inp->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6; + SCTP_INP_WUNLOCK(inp); + op_err = sctp_generate_cause(SCTP_CAUSE_OUT_OF_RESC, ""); + NET_EPOCH_ENTER(et); + sctp_abort_an_association(inp, stcb, op_err, false, SCTP_SO_LOCKED); + NET_EPOCH_EXIT(et); + return (ECONNABORTED); + } + SCTP_TCB_UNLOCK(stcb); + SCTP_INP_WUNLOCK(inp); return (0); } From nobody Fri Sep 15 17:49:52 2023 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 4RnMCN58Kqz4tSYg; Fri, 15 Sep 2023 17:49:52 +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 4RnMCN4dQbz3Kq4; Fri, 15 Sep 2023 17:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694800192; 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=+X9Rs2JF0+T7t4FgIhxc/n2BxXqDHgHbyqxheIvgRoA=; b=tsAfmOjz9Tt+k+iTdOpKL+GpCcgsNcPiKLEHtby+VxHoGa2puimlwJzgmjPhqItzPZbsYz BXQk+Y1QpxL/GmB9ss5ujSgD5Z2AEyY1EC5PdwvxP6MK0pee4HSZL7LppPSEefJ5Ox0r9+ 9+7hJSLxESoGHOS7DAC3IqR0HifBkrS5BdoNQjo6aFRcBjXLfR/TgBiafyCOnBJEQlo+aC n+IXIWqnpJpXoU8bSFg2jNXijIM1LRyjSTItB2XneiuaM5OlPcJy4j3TUNCwYa4HiW3H/7 Gf6Ivvfovx4sf36XvsV74+mupGEbIyXSYS3JmG/h28P7D+VOjdrwAIVpXivd7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694800192; a=rsa-sha256; cv=none; b=MsiWtpHxYfN55YooQd3qNWQGvlDXebBNyCU78RciqEXFElIrYbDOf1H0+rfDSJOzHkvPd7 KAxXyIvAW+BXyi7Nx29T+ia9jDq4wsbq3HNx5Pq12aTtfTF7FOI3RZz9t6Q1LJZBzub/oX HfSQBffoEUkI6iv9uccK8jI3BiYANo+BARCaO9pvHbDYaZ5v10344yoSnNPI4WYobAZqc5 jcxHHabIyqX8uMAr7pSFDPglrShcyxChz/rwiMI1s/skhzOQylpoxlaQ9OuUZv5YSXXsey 9dgVn0Wc8ImFSVCkp0guu2Vqxvj8BsnvV58DwEUDSwJV6u0mlfnehYuJLAIa0g== 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=1694800192; 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=+X9Rs2JF0+T7t4FgIhxc/n2BxXqDHgHbyqxheIvgRoA=; b=CvS4IM95tZ+ss7n1FvHAWJN7V94qyQbw0ORuUuZ3aqfnJMUxdzXHMCt6bwmaBqCDACgCip aqipIrMAo5u/ROH9F1kR9S1oI5HQKu7h9YRXgxpJZA/odebFhjsXrfgJFf1/T7ZDm11uus A4uYaffYyWRRaYg2N0lpROysiXz2m97RFXbovq4nYy7HBK1Tp+wprzy8yWyViLQ8tZYP/m 8DQ6Atft+++EdkJMbUAk3Hia8HjrozQ20uDJDJTWjSPExXHKfZ7tMgMrfTq9xbaQLGu+nw cu2xdhoL+YOnAgqJMapRHRJQMx0hdgNRReFF0ls/2OqPr//Au8GuVmOorknLXw== 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 4RnMCN3gs7zYXT; Fri, 15 Sep 2023 17:49: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 38FHnqov057418; Fri, 15 Sep 2023 17:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FHnqsZ057415; Fri, 15 Sep 2023 17:49:52 GMT (envelope-from git) Date: Fri, 15 Sep 2023 17:49:52 GMT Message-Id: <202309151749.38FHnqsZ057415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 7b21cccf9c69 - stable/14 - sctp: further improve shutting down the read side of a socket 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b21cccf9c69f1303cbd3023d4a92b34ce84cbd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7b21cccf9c69f1303cbd3023d4a92b34ce84cbd1 commit 7b21cccf9c69f1303cbd3023d4a92b34ce84cbd1 Author: Michael Tuexen AuthorDate: 2023-09-13 11:02:51 +0000 Commit: Michael Tuexen CommitDate: 2023-09-15 17:48:02 +0000 sctp: further improve shutting down the read side of a socket Deal with the case that the association is already gone. Reported by: syzbot+e256d42e9b390564530a@syzkaller.appspotmail.com --- sys/netinet/sctp_usrreq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 02bb87578528..29d63f989e79 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -806,11 +806,9 @@ sctp_flush(struct socket *so, int how) return (0); } stcb = LIST_FIRST(&inp->sctp_asoc_list); - if (stcb == NULL) { - SCTP_INP_WUNLOCK(inp); - return (ENOTCONN); + if (stcb != NULL) { + SCTP_TCB_LOCK(stcb); } - SCTP_TCB_LOCK(stcb); SCTP_INP_READ_LOCK(inp); inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; SOCK_LOCK(so); @@ -836,7 +834,7 @@ sctp_flush(struct socket *so, int how) } SOCK_UNLOCK(so); SCTP_INP_READ_UNLOCK(inp); - if (need_to_abort) { + if (need_to_abort && (stcb != NULL)) { inp->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6; SCTP_INP_WUNLOCK(inp); op_err = sctp_generate_cause(SCTP_CAUSE_OUT_OF_RESC, ""); @@ -845,7 +843,9 @@ sctp_flush(struct socket *so, int how) NET_EPOCH_EXIT(et); return (ECONNABORTED); } - SCTP_TCB_UNLOCK(stcb); + if (stcb != NULL) { + SCTP_TCB_UNLOCK(stcb); + } SCTP_INP_WUNLOCK(inp); return (0); } From nobody Sat Sep 16 00:40:23 2023 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 4RnXK35rbPz4t3Mb; Sat, 16 Sep 2023 00:40: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 4RnXK359w6z3Skt; Sat, 16 Sep 2023 00:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694824823; 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=IwK1TBUarfv6zUWRx5mhttXRFn7wJltixv8wwWxRDrQ=; b=Hq6yERqAwKKiDfjKSYG1hSg1lK9cRP5zLPi1LM2hbkKWA+VXZVk3YTlw/ieLROzXWzkjS6 iVCVgWjQfIgnUi/5z5kWr3dkfNO8ohyx5LsVNJv0G4pLnvi6ajrZbHso6BUk/HMHm9/1NG +QVC1DEnMHMwADrKJUKDzHSs/BQwzmcFupoho3EfCKynNPem41+xuo7LbTuC1aiUlZcX3I A6/K5fUtVq+I44JF/36nrAVu2tR8sU5KY4OmPATk3W+P60aL9ute95FOQHrsU/5ol2lq4v 1vOdtk+OhgQfRbMijcw3dwcvS3HeDJE0ONpQeM/K08hbCvb87pWy+PIHxHpKig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694824823; a=rsa-sha256; cv=none; b=gVhqBiL4tv34lSPLlkJoktDlXlDUb3WTt8dhqi89SFrkMxTIsf7eT+yMrWvWyFbTgHWks5 4OgkmHBCaB7J8cyiJ0GE1KoFpLlIig0DYhJx+ZJ5H3mJ7f94kDfDcZuz9x9tjEKbP30mtd IwaM9vsd9eN0G/ZRMeNqbxdMMfkl15OH3+X9F766ybfXnAy5WZLIlsAF9/egq2+U6r2wew WCZE7MGeuRrxshqtcCWEsf+5LjXUmEX7r26U/QDkAG408RyzrAaKONTw9XLrKXXuwgXOQi ZAMIUvXBXUVP++lnZ1cWH63soOJlOFVlEQ7ECYI2cE5IXzUpCVPEyazHpmp6FQ== 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=1694824823; 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=IwK1TBUarfv6zUWRx5mhttXRFn7wJltixv8wwWxRDrQ=; b=LwTqlY0tY4vqfPnjdpXOTJTvpqjVSzPBeOC26Kbiv05z4W6NMTm1BCM82HGTgM9rhe157z LqDyHxQxMBu5O6DGg+i27wZNws31LWb2xNj1EqlfXftEVbKWrxe3Rtwl1lvGMqrAC7UbIB qz/VfKy2GkldUuXqBOZ1ycXq/mzmlcT0mZM3IqlKTb8teH+9WAoA31l7BNRiHgLvhSV8hk PgSQu38YEZAdu1PG1NJKzU24JUfMYW+gshFh2kc72S5XaDJnrMtffOvIWbrd4Emors4ZWw 3vLhb3iVGYgfpwDvAlfaN0mvDLdLokVuGAI2wcY+PscyzAYdIWZTlv3WxPdYEg== 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 4RnXK34F5gzlhJ; Sat, 16 Sep 2023 00:40: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 38G0eNd9045516; Sat, 16 Sep 2023 00:40:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G0eN28045513; Sat, 16 Sep 2023 00:40:23 GMT (envelope-from git) Date: Sat, 16 Sep 2023 00:40:23 GMT Message-Id: <202309160040.38G0eN28045513@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: c3376a666e46 - stable/14 - shmfd: hide direct rangelock(9) use under a wrapper 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: c3376a666e468393fea2ddb7c5898c1d22443a8c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c3376a666e468393fea2ddb7c5898c1d22443a8c commit c3376a666e468393fea2ddb7c5898c1d22443a8c Author: Konstantin Belousov AuthorDate: 2023-08-18 12:38:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-15 19:41:39 +0000 shmfd: hide direct rangelock(9) use under a wrapper (cherry picked from commit 6df6facf44f952f64753bee00831fd93f16c99a9) --- sys/kern/uipc_shm.c | 69 +++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 1975f0d60f89..a8e2502808a0 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -182,6 +182,15 @@ SYSCTL_INT(_vm_largepages, OID_AUTO, reclaim_tries, CTLFLAG_RWTUN, &largepage_reclaim_tries, 0, "Number of contig reclaims before giving up for default alloc policy"); +#define shm_rangelock_unlock(shmfd, cookie) \ + rangelock_unlock(&(shmfd)->shm_rl, (cookie), &(shmfd)->shm_mtx) +#define shm_rangelock_rlock(shmfd, start, end) \ + rangelock_rlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_tryrlock(shmfd, start, end) \ + rangelock_tryrlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_wlock(shmfd, start, end) \ + rangelock_wlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) + static int uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio) { @@ -456,10 +465,10 @@ shm_read(struct file *fp, struct uio *uio, struct ucred *active_cred, return (error); #endif foffset_lock_uio(fp, uio, flags); - rl_cookie = rangelock_rlock(&shmfd->shm_rl, uio->uio_offset, - uio->uio_offset + uio->uio_resid, &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, uio->uio_offset, + uio->uio_offset + uio->uio_resid); error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -497,13 +506,10 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, } else { size = uio->uio_offset + uio->uio_resid; } - if ((flags & FOF_OFFSET) == 0) { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); - } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, uio->uio_offset, - size, &shmfd->shm_mtx); - } + if ((flags & FOF_OFFSET) == 0) + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); + else + rl_cookie = shm_rangelock_wlock(shmfd, uio->uio_offset, size); if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { error = EPERM; } else { @@ -516,7 +522,7 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -571,22 +577,20 @@ shm_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, conf->alloc_policy != SHM_LARGEPAGE_ALLOC_HARD) return (EINVAL); - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); shmfd->shm_lp_psind = conf->psind; shmfd->shm_lp_alloc_policy = conf->alloc_policy; shmfd->shm_object->un_pager.phys.data_val = conf->psind; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); case FIOGSHMLPGCNF: if (!shm_largepage(shmfd)) return (ENOTTY); conf = data; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, OFF_MAX); conf->psind = shmfd->shm_lp_psind; conf->alloc_policy = shmfd->shm_lp_alloc_policy; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); default: return (ENOTTY); @@ -917,10 +921,9 @@ shm_dotruncate(struct shmfd *shmfd, off_t length) void *rl_cookie; int error; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); error = shm_dotruncate_cookie(shmfd, length, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1258,8 +1261,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, error = ENOENT; } } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* * kern_shm_open() likely shouldn't ever error out on @@ -1331,8 +1333,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, shmfd->shm_seals |= initial_seals; shm_hold(shmfd); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, - &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); } sx_xunlock(&shm_dict_lock); @@ -1648,8 +1649,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, shmfd = fp->f_data; maxprot = VM_PROT_NONE; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, objsize, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, objsize); /* FREAD should always be set. */ if ((fp->f_flag & FREAD) != 0) maxprot |= VM_PROT_EXECUTE | VM_PROT_READ; @@ -1723,7 +1723,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, vm_object_deallocate(shmfd->shm_object); } out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1941,8 +1941,7 @@ shm_add_seals(struct file *fp, int seals) error = 0; shmfd = fp->f_data; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* Even already-set seals should result in EPERM. */ if ((shmfd->shm_seals & F_SEAL_SEAL) != 0) { @@ -1973,7 +1972,7 @@ shm_add_seals(struct file *fp, int seals) } shmfd->shm_seals |= nseals; out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -2067,8 +2066,7 @@ shm_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, off = *offset; len = *length; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, off, off + len, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, off, off + len); switch (cmd) { case SPACECTL_DEALLOC: if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { @@ -2082,7 +2080,7 @@ shm_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, default: __assert_unreachable(); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -2109,11 +2107,10 @@ shm_fallocate(struct file *fp, off_t offset, off_t len, struct thread *td) * the shmfd is not necessarily a concern. If other mechanisms are * added to grow a shmfd, this may need to be re-evaluated. */ - rl_cookie = rangelock_wlock(&shmfd->shm_rl, offset, size, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, offset, size); if (size > shmfd->shm_size) error = shm_dotruncate_cookie(shmfd, size, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); /* Translate to posix_fallocate(2) return value as needed. */ if (error == ENOMEM) error = ENOSPC; From nobody Sat Sep 16 00:41:07 2023 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 4RnXKv4WF8z4t3dq; Sat, 16 Sep 2023 00:41: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 4RnXKv44Gyz3Spt; Sat, 16 Sep 2023 00:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694824867; 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=fvEZDdZ8iqO1OAIGKbIAYa4dMkloywHjb+0B1WvZ3g4=; b=GauLFcld/XCTb+Rvdnzasy8g4qfV5owr7a5tFuq43HdrWHWTqVwlLLB8qEQUzkpRHoJ2m1 V6PMvC86rHhqvZHHzgLNe31pjehLCrX+vrSwg4cmrsDbiaKLNVXKgCTq8gJGR7S3Sr++KT /U2PB6viMUmhiRYUWCRFeWY0IqPpv6Xx0eFhqE4MJSC57Qc85p0m+apE34jTHOj1rZG6Vq 5B/t/uuFYM7TMMAkhFuR72Xe4758xWbgA+e44aMTF0Ha9ZBaLDPcpVox1MkiSZrYenqYKw HVNhTzIUAZ04Wze7bo+iYycnnBdboa33nkeQflU0dHu+ywQfaY1Im8+Z1SjHoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694824867; a=rsa-sha256; cv=none; b=h+rJHzb+F7m33ggIm1qgNZHnMqNkobPSOr1zgc4FQGQS0K/fxBgqQ9ldoRi81jFomEp0uM E7JwYwkU8P9L4+Pdqo6HmOR63+4pIM1giKwfNfieyG8SrSJwc4Zm2CyP9fvHey7knOEth8 In94xokRiZhKqcl2gxyjFmyV9HUND5vTDwPysNMXKWiTrWaQ7ZPMGgJGpJkki/Q4pm3XHi VWMmDTp0zUfPUCEcznLleqxUwv1ocAXuF6gepoouN/3QUFL+IEYgPSw4RqTlJ2xfkRONhD Eum51YkmfVMe/CJjvNJKz1ZkBIFhV5jNEAY6xqZb/PboPjUnqyaFMO1LLewXtw== 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=1694824867; 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=fvEZDdZ8iqO1OAIGKbIAYa4dMkloywHjb+0B1WvZ3g4=; b=OfuOpvUQ+U2loXFG2nwWteMRuKjbWVQvMDg2gpRZbw/5/5EQ7DZz9xIzHszZoV2lGPHzOe UchQslTCrlggafzSLhq6MWw8QLuV6yu8qfwEt3/NqExj9P4P21ugagixt3hPdAUtjxmCee ypm55yhL7wJ+8CbV04vaLAsUcsf6raJ0mWNN0vBiqZm1WxTF0uvfkMn2rBDkxI4WOnuUJs lwNHfZqTbLTadKcZAeVCxCXZpCgigqhBsGpNwGRsfaQEQVsdTxNiuXVVZWYF2waKlfoyvc UQgwCyWeLFkmbSHolgYYlNuWkOO23wVKL5Gfrp1oK0fiCpSyVkZwzTKxGII2Qw== 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 4RnXKv38Mvzlm3; Sat, 16 Sep 2023 00:41: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 38G0f7Cs047565; Sat, 16 Sep 2023 00:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G0f75I047562; Sat, 16 Sep 2023 00:41:07 GMT (envelope-from git) Date: Sat, 16 Sep 2023 00:41:07 GMT Message-Id: <202309160041.38G0f75I047562@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: 1da381c2bea7 - stable/13 - shmfd: hide direct rangelock(9) use under a wrapper 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: 1da381c2bea76992a510a48c7a6673a9c64d9c15 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1da381c2bea76992a510a48c7a6673a9c64d9c15 commit 1da381c2bea76992a510a48c7a6673a9c64d9c15 Author: Konstantin Belousov AuthorDate: 2023-08-18 12:38:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-16 00:40:48 +0000 shmfd: hide direct rangelock(9) use under a wrapper (cherry picked from commit 6df6facf44f952f64753bee00831fd93f16c99a9) --- sys/kern/uipc_shm.c | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index f2d883c9c8b7..def8c35025c1 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -178,6 +178,15 @@ SYSCTL_INT(_vm_largepages, OID_AUTO, reclaim_tries, CTLFLAG_RWTUN, &largepage_reclaim_tries, 0, "Number of contig reclaims before giving up for default alloc policy"); +#define shm_rangelock_unlock(shmfd, cookie) \ + rangelock_unlock(&(shmfd)->shm_rl, (cookie), &(shmfd)->shm_mtx) +#define shm_rangelock_rlock(shmfd, start, end) \ + rangelock_rlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_tryrlock(shmfd, start, end) \ + rangelock_tryrlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_wlock(shmfd, start, end) \ + rangelock_wlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) + static int uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio) { @@ -452,10 +461,10 @@ shm_read(struct file *fp, struct uio *uio, struct ucred *active_cred, return (error); #endif foffset_lock_uio(fp, uio, flags); - rl_cookie = rangelock_rlock(&shmfd->shm_rl, uio->uio_offset, - uio->uio_offset + uio->uio_resid, &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, uio->uio_offset, + uio->uio_offset + uio->uio_resid); error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -493,13 +502,10 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, } else { size = uio->uio_offset + uio->uio_resid; } - if ((flags & FOF_OFFSET) == 0) { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); - } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, uio->uio_offset, - size, &shmfd->shm_mtx); - } + if ((flags & FOF_OFFSET) == 0) + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); + else + rl_cookie = shm_rangelock_wlock(shmfd, uio->uio_offset, size); if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { error = EPERM; } else { @@ -512,7 +518,7 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -567,22 +573,20 @@ shm_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, conf->alloc_policy != SHM_LARGEPAGE_ALLOC_HARD) return (EINVAL); - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); shmfd->shm_lp_psind = conf->psind; shmfd->shm_lp_alloc_policy = conf->alloc_policy; shmfd->shm_object->un_pager.phys.data_val = conf->psind; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); case FIOGSHMLPGCNF: if (!shm_largepage(shmfd)) return (ENOTTY); conf = data; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, OFF_MAX); conf->psind = shmfd->shm_lp_psind; conf->alloc_policy = shmfd->shm_lp_alloc_policy; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); default: return (ENOTTY); @@ -899,10 +903,9 @@ shm_dotruncate(struct shmfd *shmfd, off_t length) void *rl_cookie; int error; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); error = shm_dotruncate_cookie(shmfd, length, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1240,8 +1243,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, error = ENOENT; } } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* * kern_shm_open() likely shouldn't ever error out on @@ -1313,8 +1315,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, shmfd->shm_seals |= initial_seals; shm_hold(shmfd); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, - &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); } sx_xunlock(&shm_dict_lock); @@ -1636,8 +1637,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, shmfd = fp->f_data; maxprot = VM_PROT_NONE; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, objsize, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, objsize); /* FREAD should always be set. */ if ((fp->f_flag & FREAD) != 0) maxprot |= VM_PROT_EXECUTE | VM_PROT_READ; @@ -1711,7 +1711,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, vm_object_deallocate(shmfd->shm_object); } out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1929,8 +1929,7 @@ shm_add_seals(struct file *fp, int seals) error = 0; shmfd = fp->f_data; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* Even already-set seals should result in EPERM. */ if ((shmfd->shm_seals & F_SEAL_SEAL) != 0) { @@ -1961,7 +1960,7 @@ shm_add_seals(struct file *fp, int seals) } shmfd->shm_seals |= nseals; out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1997,11 +1996,10 @@ shm_fallocate(struct file *fp, off_t offset, off_t len, struct thread *td) * the shmfd is not necessarily a concern. If other mechanisms are * added to grow a shmfd, this may need to be re-evaluated. */ - rl_cookie = rangelock_wlock(&shmfd->shm_rl, offset, size, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, offset, size); if (size > shmfd->shm_size) error = shm_dotruncate_cookie(shmfd, size, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); /* Translate to posix_fallocate(2) return value as needed. */ if (error == ENOMEM) error = ENOSPC;