CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat May 11 15:25:24 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Document final 8.3 changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.229 -r1.1.2.230 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat May 11 15:25:24 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Document final 8.3 changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.229 -r1.1.2.230 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.229 src/doc/CHANGES-8.3:1.1.2.230 --- src/doc/CHANGES-8.3:1.1.2.229 Sun Apr 28 10:17:03 2024 +++ src/doc/CHANGES-8.3 Sat May 11 15:25:24 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.229 2024/04/28 10:17:03 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.230 2024/05/11 15:25:24 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4435,3 +4435,9 @@ sys/netinet6/frag6.c1.78 inet6: fix calculation of fragment length. [ozaki-r, ticket #1960] +distrib/notes/common/main (manually edited) +external/gpl2/groff/tmac/mdoc.local (manually edited) +sys/sys/param.h (manually edited) +doc/LAST_MINUTE (manually edited) + + Welcome to 8.3
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Sat May 4 18:57:00 UTC 2024 Modified Files: src/doc [netbsd-8]: LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-8]: mdoc.local src/sys/sys [netbsd-8]: param.h Log Message: Welcome to 8.3 To generate a diff of this commit: cvs rdiff -u -r1.2.60.3 -r1.2.60.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.2.4.7 -r1.2.4.8 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.542.2.11 -r1.542.2.12 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.60.3 src/doc/LAST_MINUTE:1.2.60.4 --- src/doc/LAST_MINUTE:1.2.60.3 Tue Mar 31 05:08:40 2020 +++ src/doc/LAST_MINUTE Sat May 4 18:57:00 2024 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.60.3 2020/03/31 05:08:40 martin Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.60.4 2024/05/04 18:57:00 martin Exp $ -This file contains important information on the NetBSD 8.2 release that +This file contains important information on the NetBSD 8.3 release that did not make it into the main documentation. [all] Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.2.4.7 src/external/gpl2/groff/tmac/mdoc.local:1.2.4.8 --- src/external/gpl2/groff/tmac/mdoc.local:1.2.4.7 Tue Apr 14 15:50:27 2020 +++ src/external/gpl2/groff/tmac/mdoc.local Sat May 4 18:56:59 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.2.4.7 2020/04/14 15:50:27 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.2.4.8 2024/05/04 18:56:59 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~8.2_STABLE +.ds doc-operating-system NetBSD\~8.3 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~8.2_STABLE +.ds doc-default-operating-system NetBSD\~8.3 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -65,6 +65,7 @@ .ds doc-operating-system-NetBSD-8.08.0 .ds doc-operating-system-NetBSD-8.18.1 .ds doc-operating-system-NetBSD-8.28.2 +.ds doc-operating-system-NetBSD-8.38.3 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.542.2.11 src/sys/sys/param.h:1.542.2.12 --- src/sys/sys/param.h:1.542.2.11 Sat Feb 6 15:22:19 2021 +++ src/sys/sys/param.h Sat May 4 18:56:59 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.542.2.11 2021/02/06 15:22:19 martin Exp $ */ +/* $NetBSD: param.h,v 1.542.2.12 2024/05/04 18:56:59 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 80200 /* NetBSD 8.2_STABLE */ +#define __NetBSD_Version__ 80300 /* NetBSD 8.3 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Sat May 4 18:57:00 UTC 2024 Modified Files: src/doc [netbsd-8]: LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-8]: mdoc.local src/sys/sys [netbsd-8]: param.h Log Message: Welcome to 8.3 To generate a diff of this commit: cvs rdiff -u -r1.2.60.3 -r1.2.60.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.2.4.7 -r1.2.4.8 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.542.2.11 -r1.542.2.12 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Sat May 4 18:53:21 UTC 2024
Modified Files:
src/distrib/notes/common [netbsd-8]: main
Log Message:
Prepare for 8.3
To generate a diff of this commit:
cvs rdiff -u -r1.535.2.7 -r1.535.2.8 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.535.2.7 src/distrib/notes/common/main:1.535.2.8
--- src/distrib/notes/common/main:1.535.2.7 Sun Mar 29 11:59:06 2020
+++ src/distrib/notes/common/main Sat May 4 18:53:21 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.535.2.7 2020/03/29 11:59:06 martin Exp $
+.\" $NetBSD: main,v 1.535.2.8 2024/05/04 18:53:21 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -50,7 +50,7 @@
.as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
.so \*[.CURDIR]/../common/macros
.
-.Dd May 13, 2019
+.Dd May 4, 2024
.Dt INSTALL 8
.Os NetBSD
.Sh NAME
@@ -480,17 +480,17 @@ would not exist.
.
.if \n[FOR_RELEASE] \{\
.Pp
-.Ss Changes Between The NetBSD 8.1 and 8.2 Releases
+.Ss Changes Between The NetBSD 8.2 and 8.3 Releases
.Pp
The
.Nx
\*V release
-is the first security/critical update of the NetBSD 8 release branch.
+is the third security/critical update of the NetBSD 8 release branch.
It represents a selected subset of fixes deemed important for
security or stability reasons.
The complete list of changes can be found in the
-CHANGES-8.2:
-.Lk https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.2/CHANGES-8.2
+CHANGES-8.3:
+.Lk https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.3/CHANGES-8.3
file in the top level directory of the NetBSD
\*V release
tree.
@@ -568,6 +568,8 @@ Changes between the initial 8.0 branch a
Changes between the 8.0 release and the 8.1 release.
.It Li CHANGES-8.2
Changes between the 8.1 release and the 8.2 release.
+.It Li CHANGES-8.3
+Changes between the 8.2 release and the 8.3 release.
.It Li CHANGES.prev
Changes in previous
.Nx
CVS commit: [netbsd-8] src/distrib/notes/common
Module Name:src Committed By: martin Date: Sat May 4 18:53:21 UTC 2024 Modified Files: src/distrib/notes/common [netbsd-8]: main Log Message: Prepare for 8.3 To generate a diff of this commit: cvs rdiff -u -r1.535.2.7 -r1.535.2.8 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 10:17:03 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1960 To generate a diff of this commit: cvs rdiff -u -r1.1.2.228 -r1.1.2.229 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.228 src/doc/CHANGES-8.3:1.1.2.229 --- src/doc/CHANGES-8.3:1.1.2.228 Thu Apr 18 16:45:55 2024 +++ src/doc/CHANGES-8.3 Sun Apr 28 10:17:03 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.228 2024/04/18 16:45:55 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.229 2024/04/28 10:17:03 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4430,3 +4430,8 @@ sys/arch/x86/x86/viac7temp.c 1.10 viac7temp(4): PR 58148: fix the kernel module. [andvar, ticket #1959] +sys/netinet6/frag6.c1.78 + + inet6: fix calculation of fragment length. + [ozaki-r, ticket #1960] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 10:17:03 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1960 To generate a diff of this commit: cvs rdiff -u -r1.1.2.228 -r1.1.2.229 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src
Committed By: martin
Date: Sun Apr 28 10:15:20 UTC 2024
Modified Files:
src/sys/netinet6 [netbsd-8]: frag6.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1960):
sys/netinet6/frag6.c: revision 1.78
frag6: fix calculation of fragment length
Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.
See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.
Patch from Yasuyuki KOZAKAI (with minor tweaks)
To generate a diff of this commit:
cvs rdiff -u -r1.60.6.6 -r1.60.6.7 src/sys/netinet6/frag6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.60.6.6 src/sys/netinet6/frag6.c:1.60.6.7
--- src/sys/netinet6/frag6.c:1.60.6.6 Thu Oct 27 16:08:50 2022
+++ src/sys/netinet6/frag6.c Sun Apr 28 10:15:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.60.6.6 2022/10/27 16:08:50 martin Exp $ */
+/* $NetBSD: frag6.c,v 1.60.6.7 2024/04/28 10:15:20 martin Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60.6.6 2022/10/27 16:08:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60.6.7 2024/04/28 10:15:20 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -158,9 +158,10 @@ frag6_input(struct mbuf **mp, int *offp,
* sizeof(struct ip6_frag) == 8
* sizeof(struct ip6_hdr) = 40
*/
- if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
- (((ntohs(ip6->ip6_plen) - offset) == 0) ||
- ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+ frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset
+ - sizeof(struct ip6_frag);
+ if ((frgpartlen == 0) ||
+ ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) && (frgpartlen & 0x7) != 0)) {
icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
offsetof(struct ip6_hdr, ip6_plen));
in6_ifstat_inc(dstifp, ifs6_reass_fail);
@@ -269,7 +270,6 @@ frag6_input(struct mbuf **mp, int *offp,
* in size.
* If it would exceed, discard the fragment and return an ICMP error.
*/
- frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset;
if (q6->ip6q_unfrglen >= 0) {
/* The 1st fragment has already arrived. */
if (q6->ip6q_unfrglen + fragoff + frgpartlen > IPV6_MAXPACKET) {
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src Committed By: martin Date: Sun Apr 28 10:15:20 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-8]: frag6.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1960): sys/netinet6/frag6.c: revision 1.78 frag6: fix calculation of fragment length Because of the miscalculation, 32 bytes fragmented IPv6 packets have been wrongly dropped. See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html for more details. Patch from Yasuyuki KOZAKAI (with minor tweaks) To generate a diff of this commit: cvs rdiff -u -r1.60.6.6 -r1.60.6.7 src/sys/netinet6/frag6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Apr 18 16:45:55 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1955 - #1959 To generate a diff of this commit: cvs rdiff -u -r1.1.2.227 -r1.1.2.228 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Apr 18 16:45:55 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1955 - #1959 To generate a diff of this commit: cvs rdiff -u -r1.1.2.227 -r1.1.2.228 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.227 src/doc/CHANGES-8.3:1.1.2.228 --- src/doc/CHANGES-8.3:1.1.2.227 Wed Apr 17 18:09:14 2024 +++ src/doc/CHANGES-8.3 Thu Apr 18 16:45:55 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.227 2024/04/17 18:09:14 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.228 2024/04/18 16:45:55 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4401,3 +4401,32 @@ share/mk/bsd.lib.mk1.398,1.399,1.152 bsd.x11.mk: PR 58104: use TOOL_AWK, not the build host's awk. [riastradh, ticket #1954] +distrib/evbarm/instkernel/sshramdisk/Makefile 1.26 + + evbarm/sshramdisk: PR 58035: put firmware files in the right +place. + [riastradh, ticket #1955] + +external/bsd/am-utils/dist/amd/amq_subr.c 1.4,1.5 +external/bsd/am-utils/dist/amq/amq.c 1.4 +external/bsd/am-utils/dist/amq/amq_xdr.c 1.2 +external/bsd/am-utils/dist/include/amq_defs.h 1.2 + + amd(8): PR 56974: fix crash in amq -i. + [riastradh, ticket #1956] + +external/gpl2/grep/dist/src/grep.c 1.3 + + grep(1): PR 56584: don't read FIFOs with -D skip. + [riastradh, ticket #1957] + +usr.bin/who/utmpentry.c1.22 + + who(1): PR 56013: fix utmpentry counting. + [riastradh, ticket #1958] + +sys/arch/x86/x86/viac7temp.c 1.10 + + viac7temp(4): PR 58148: fix the kernel module. + [andvar, ticket #1959] +
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:44:21 UTC 2024
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: viac7temp.c
Log Message:
Pull up following revision(s) (requested by andvar in ticket #1959):
sys/arch/x86/x86/viac7temp.c: revision 1.10
viac7temp(4): define module metadata using MODULE() macro and implement
viac7temp_modcmd() to handle module load/unload events.
Fixes PR kern/58148. Look OK by mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.20.1 src/sys/arch/x86/x86/viac7temp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/viac7temp.c
diff -u src/sys/arch/x86/x86/viac7temp.c:1.8 src/sys/arch/x86/x86/viac7temp.c:1.8.20.1
--- src/sys/arch/x86/x86/viac7temp.c:1.8 Sun Aug 10 16:44:34 2014
+++ src/sys/arch/x86/x86/viac7temp.c Thu Apr 18 16:44:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: viac7temp.c,v 1.8 2014/08/10 16:44:34 tls Exp $ */
+/* $NetBSD: viac7temp.c,v 1.8.20.1 2024/04/18 16:44:20 martin Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill
@@ -27,11 +27,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.8 2014/08/10 16:44:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.8.20.1 2024/04/18 16:44:20 martin Exp $");
#include
#include
#include
+#include
#include
#include
@@ -162,3 +163,32 @@ viac7temp_refresh_xcall(void *arg0, void
edata->value_cur += 27315;
edata->state = ENVSYS_SVALID;
}
+
+MODULE(MODULE_CLASS_DRIVER, viac7temp, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+viac7temp_modcmd(modcmd_t cmd, void *arg __unused)
+{
+ int error = 0;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ error = config_init_component(cfdriver_ioconf_viac7temp,
+ cfattach_ioconf_viac7temp, cfdata_ioconf_viac7temp);
+#endif
+ return error;
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ error = config_fini_component(cfdriver_ioconf_viac7temp,
+ cfattach_ioconf_viac7temp, cfdata_ioconf_viac7temp);
+#endif
+ return error;
+ default:
+ return ENOTTY;
+ }
+}
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Thu Apr 18 16:44:21 UTC 2024 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: viac7temp.c Log Message: Pull up following revision(s) (requested by andvar in ticket #1959): sys/arch/x86/x86/viac7temp.c: revision 1.10 viac7temp(4): define module metadata using MODULE() macro and implement viac7temp_modcmd() to handle module load/unload events. Fixes PR kern/58148. Look OK by mrg@. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.20.1 src/sys/arch/x86/x86/viac7temp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.bin/who
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:10:17 UTC 2024
Modified Files:
src/usr.bin/who [netbsd-8]: utmpentry.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1958):
usr.bin/who/utmpentry.c: revision 1.22
PR/56013: Kouichi Hashikawa: Move setutent/setutxent right before the loops.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.8.1 src/usr.bin/who/utmpentry.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/who/utmpentry.c
diff -u src/usr.bin/who/utmpentry.c:1.18 src/usr.bin/who/utmpentry.c:1.18.8.1
--- src/usr.bin/who/utmpentry.c:1.18 Sat Nov 21 15:01:43 2015
+++ src/usr.bin/who/utmpentry.c Thu Apr 18 16:10:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $ */
+/* $NetBSD: utmpentry.c,v 1.18.8.1 2024/04/18 16:10:17 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.18.8.1 2024/04/18 16:10:17 martin Exp $");
#endif
#include
@@ -95,14 +95,7 @@ setup(const char *fname)
struct stat st;
const char *sfname;
- if (fname == NULL) {
-#ifdef SUPPORT_UTMPX
- setutxent();
-#endif
-#ifdef SUPPORT_UTMP
- setutent();
-#endif
- } else {
+ if (fname != NULL) {
size_t len = strlen(fname);
if (len == 0)
errx(1, "Filename cannot be 0 length.");
@@ -133,9 +126,9 @@ setup(const char *fname)
what &= ~1;
} else {
if (timespeccmp(_mtimespec, , >))
- utmpxtime = st.st_mtimespec;
+utmpxtime = st.st_mtimespec;
else
- what &= ~1;
+what &= ~1;
}
}
#endif
@@ -204,10 +197,11 @@ getutentries(const char *fname, struct u
#endif
#ifdef SUPPORT_UTMPX
+ setutxent();
while ((what & 1) && (utx = getutxent()) != NULL) {
if (fname == NULL && ((1 << utx->ut_type) & etype) == 0)
continue;
- if ((ep = calloc(1, sizeof(struct utmpentry))) == NULL) {
+ if ((ep = calloc(1, sizeof(*ep))) == NULL) {
warn(NULL);
return 0;
}
@@ -218,6 +212,7 @@ getutentries(const char *fname, struct u
#endif
#ifdef SUPPORT_UTMP
+ setutent();
if ((etype & (1 << USER_PROCESS)) != 0) {
while ((what & 2) && (ut = getutent()) != NULL) {
if (fname == NULL && (*ut->ut_name == '\0' ||
CVS commit: [netbsd-8] src/usr.bin/who
Module Name:src Committed By: martin Date: Thu Apr 18 16:10:17 UTC 2024 Modified Files: src/usr.bin/who [netbsd-8]: utmpentry.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1958): usr.bin/who/utmpentry.c: revision 1.22 PR/56013: Kouichi Hashikawa: Move setutent/setutxent right before the loops. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.8.1 src/usr.bin/who/utmpentry.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/external/gpl2/grep/dist/src
Module Name:src Committed By: martin Date: Thu Apr 18 16:06:25 UTC 2024 Modified Files: src/external/gpl2/grep/dist/src [netbsd-8]: grep.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1957): external/gpl2/grep/dist/src/grep.c: revision 1.3 PR/56584: Andreas Gustafsson: Skip FIFO's when -D To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.8.1 src/external/gpl2/grep/dist/src/grep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/external/gpl2/grep/dist/src
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:06:25 UTC 2024
Modified Files:
src/external/gpl2/grep/dist/src [netbsd-8]: grep.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1957):
external/gpl2/grep/dist/src/grep.c: revision 1.3
PR/56584: Andreas Gustafsson: Skip FIFO's when -D
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/gpl2/grep/dist/src/grep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/grep/dist/src/grep.c
diff -u src/external/gpl2/grep/dist/src/grep.c:1.2 src/external/gpl2/grep/dist/src/grep.c:1.2.8.1
--- src/external/gpl2/grep/dist/src/grep.c:1.2 Sun Jan 10 22:16:40 2016
+++ src/external/gpl2/grep/dist/src/grep.c Thu Apr 18 16:06:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.2 2016/01/10 22:16:40 christos Exp $ */
+/* $NetBSD: grep.c,v 1.2.8.1 2024/04/18 16:06:24 martin Exp $ */
/* grep.c - main driver file for grep.
Copyright 1992, 1997-1999, 2000 Free Software Foundation, Inc.
@@ -271,11 +271,15 @@ reset (int fd, char const *file, struct
}
if (directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode))
return 0;
-#ifndef DJGPP
- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode)))
-#else
- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode)))
+ if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode)
+ || S_ISBLK(stats->stat.st_mode)
+#ifdef S_ISSOCK
+ || S_ISSOCK(stats->stat.st_mode)
+#endif
+#ifdef S_ISFIFO
+ || S_ISFIFO(stats->stat.st_mode)
#endif
+ ))
return 0;
if (S_ISREG (stats->stat.st_mode))
{
CVS commit: [netbsd-8] src/external/bsd/am-utils/dist
Module Name:src
Committed By: martin
Date: Thu Apr 18 16:02:26 UTC 2024
Modified Files:
src/external/bsd/am-utils/dist/amd [netbsd-8]: amq_subr.c
src/external/bsd/am-utils/dist/amq [netbsd-8]: amq.c amq_xdr.c
src/external/bsd/am-utils/dist/include [netbsd-8]: amq_defs.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1956):
external/bsd/am-utils/dist/include/amq_defs.h: revision 1.2
external/bsd/am-utils/dist/amq/amq_xdr.c: revision 1.2
external/bsd/am-utils/dist/amq/amq.c: revision 1.4
external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.4
external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.5
fix pointer bug (thanks RVP) and change to use 64 bit times. Don't bother
with backwards compatibility; too much work for little benefit.
remove long cast (thanks RVP)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/am-utils/dist/amd/amq_subr.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/am-utils/dist/amq/amq.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 \
src/external/bsd/am-utils/dist/amq/amq_xdr.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 \
src/external/bsd/am-utils/dist/include/amq_defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/dist/amd/amq_subr.c
diff -u src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3 src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3.8.1
--- src/external/bsd/am-utils/dist/amd/amq_subr.c:1.3 Sun Jan 18 16:27:36 2015
+++ src/external/bsd/am-utils/dist/amd/amq_subr.c Thu Apr 18 16:02:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq_subr.c,v 1.3 2015/01/18 16:27:36 christos Exp $ */
+/* $NetBSD: amq_subr.c,v 1.3.8.1 2024/04/18 16:02:26 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -331,7 +331,7 @@ bool_t
xdr_amq_mount_tree_node(XDR *xdrs, amq_mount_tree *objp)
{
am_node *mp = (am_node *) objp;
- long mtime;
+ longlong_t mtime;
if (!xdr_amq_string(xdrs, >am_al->al_mnt->mf_info)) {
return (FALSE);
@@ -346,7 +346,7 @@ xdr_amq_mount_tree_node(XDR *xdrs, amq_m
return (FALSE);
}
mtime = mp->am_stats.s_mtime;
- if (!xdr_long(xdrs, )) {
+ if (!xdr_longlong_t(xdrs, )) {
return (FALSE);
}
if (!xdr_u_short(xdrs, >am_stats.s_uid)) {
@@ -530,7 +530,7 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem
u_int len = 0;
int x;
char *n;
- long modify;
+ longlong_t modify;
/*
* Compute length of list
@@ -555,8 +555,8 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem
return (FALSE);
}
-modify = (long)m->modify;
-if (!xdr_long(xdrs, )) {
+modify = m->modify;
+if (!xdr_longlong_t(xdrs, )) {
return (FALSE);
}
Index: src/external/bsd/am-utils/dist/amq/amq.c
diff -u src/external/bsd/am-utils/dist/amq/amq.c:1.3 src/external/bsd/am-utils/dist/amq/amq.c:1.3.8.1
--- src/external/bsd/am-utils/dist/amq/amq.c:1.3 Sun Jan 18 15:37:57 2015
+++ src/external/bsd/am-utils/dist/amq/amq.c Thu Apr 18 16:02:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq.c,v 1.3 2015/01/18 15:37:57 christos Exp $ */
+/* $NetBSD: amq.c,v 1.3.8.1 2024/04/18 16:02:26 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -81,7 +81,7 @@ enum show_opt {
static void
time_print(time_type tt)
{
- time_t t = (time_t)*tt;
+ time_t t = (time_t)tt;
struct tm *tp = localtime();
printf("%02d/%02d/%04d %02d:%02d:%02d",
tp->tm_mon + 1, tp->tm_mday,
Index: src/external/bsd/am-utils/dist/amq/amq_xdr.c
diff -u src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3 src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3.8.1
--- src/external/bsd/am-utils/dist/amq/amq_xdr.c:1.1.1.3 Sat Jan 17 16:34:15 2015
+++ src/external/bsd/am-utils/dist/amq/amq_xdr.c Thu Apr 18 16:02:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq_xdr.c,v 1.1.1.3 2015/01/17 16:34:15 christos Exp $ */
+/* $NetBSD: amq_xdr.c,v 1.1.1.3.8.1 2024/04/18 16:02:26 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -49,7 +49,7 @@
bool_t
xdr_time_type(XDR *xdrs, time_type *objp)
{
- if (!xdr_long(xdrs, (long *) objp)) {
+ if (!xdr_longlong_t(xdrs, (longlong_t *) objp)) {
return (FALSE);
}
return (TRUE);
Index: src/external/bsd/am-utils/dist/include/amq_defs.h
diff -u src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3 src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3.8.1
--- src/external/bsd/am-utils/dist/include/amq_defs.h:1.1.1.3 Sat Jan 17 16:34:18 2015
+++ src/external/bsd/am-utils/dist/include/amq_defs.h Thu Apr 18 16:02:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amq_defs.h,v 1.1.1.3 2015/01/17 16:34:18 christos Exp $ */
+/* $NetBSD: amq_defs.h,v 1.1.1.3.8.1 2024/04/18 16:02:26 martin Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -68,7 +68,7 @@
/*
* TYPEDEFS
*/
-typedef long *time_type;
+typedef long long time_type;
typedef struct amq_mount_info amq_mount_info;
typedef struct
CVS commit: [netbsd-8] src/external/bsd/am-utils/dist
Module Name:src Committed By: martin Date: Thu Apr 18 16:02:26 UTC 2024 Modified Files: src/external/bsd/am-utils/dist/amd [netbsd-8]: amq_subr.c src/external/bsd/am-utils/dist/amq [netbsd-8]: amq.c amq_xdr.c src/external/bsd/am-utils/dist/include [netbsd-8]: amq_defs.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #1956): external/bsd/am-utils/dist/include/amq_defs.h: revision 1.2 external/bsd/am-utils/dist/amq/amq_xdr.c: revision 1.2 external/bsd/am-utils/dist/amq/amq.c: revision 1.4 external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.4 external/bsd/am-utils/dist/amd/amq_subr.c: revision 1.5 fix pointer bug (thanks RVP) and change to use 64 bit times. Don't bother with backwards compatibility; too much work for little benefit. remove long cast (thanks RVP) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/am-utils/dist/amd/amq_subr.c cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/am-utils/dist/amq/amq.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 \ src/external/bsd/am-utils/dist/amq/amq_xdr.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 \ src/external/bsd/am-utils/dist/include/amq_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Thu Apr 18 15:42:45 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1955):
distrib/evbarm/instkernel/sshramdisk/Makefile: revision 1.26
evbarm/instkernel/sshramdisk: Put firmware in the right paths.
Maybe this should also be wired up to `release' to put the ramdisk in
the releasedir so we detect destdir path leakage like this had.
PR port-evbarm/58035
To generate a diff of this commit:
cvs rdiff -u -r1.15.4.1 -r1.15.4.2 \
src/distrib/evbarm/instkernel/sshramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.15.4.1 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.15.4.2
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.15.4.1 Thu Nov 1 07:52:59 2018
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Thu Apr 18 15:42:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15.4.1 2018/11/01 07:52:59 martin Exp $
+# $NetBSD: Makefile,v 1.15.4.2 2024/04/18 15:42:45 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,9 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+IMAGEPREBUILD= \
+ (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
+ | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: [netbsd-8] src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: martin Date: Thu Apr 18 15:42:45 UTC 2024 Modified Files: src/distrib/evbarm/instkernel/sshramdisk [netbsd-8]: Makefile Log Message: Pull up following revision(s) (requested by riastradh in ticket #1955): distrib/evbarm/instkernel/sshramdisk/Makefile: revision 1.26 evbarm/instkernel/sshramdisk: Put firmware in the right paths. Maybe this should also be wired up to `release' to put the ramdisk in the releasedir so we detect destdir path leakage like this had. PR port-evbarm/58035 To generate a diff of this commit: cvs rdiff -u -r1.15.4.1 -r1.15.4.2 \ src/distrib/evbarm/instkernel/sshramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Apr 17 18:09:14 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1953 and #1954 To generate a diff of this commit: cvs rdiff -u -r1.1.2.226 -r1.1.2.227 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.226 src/doc/CHANGES-8.3:1.1.2.227 --- src/doc/CHANGES-8.3:1.1.2.226 Mon Mar 25 15:59:02 2024 +++ src/doc/CHANGES-8.3 Wed Apr 17 18:09:14 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.226 2024/03/25 15:59:02 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.227 2024/04/17 18:09:14 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4390,3 +4390,14 @@ external/gpl2/groff/dist/tmac/doc.tmac correctly. [uwe, ticket #1952] +sys/dev/pci/if_iwn.c1.100 + + iwn(4): PR 58105: use the correct firmware file on + Intel Centrino N 130. + [riastradh, ticket #1953] + +share/mk/bsd.lib.mk1.398,1.399,1.152 (via patch) + + bsd.x11.mk: PR 58104: use TOOL_AWK, not the build host's awk. + [riastradh, ticket #1954] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Apr 17 18:09:14 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1953 and #1954 To generate a diff of this commit: cvs rdiff -u -r1.1.2.226 -r1.1.2.227 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 17 18:07:53 UTC 2024
Modified Files:
src/share/mk [netbsd-8]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1954):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.124.6.1 -r1.124.6.2 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.124.6.1 src/share/mk/bsd.x11.mk:1.124.6.2
--- src/share/mk/bsd.x11.mk:1.124.6.1 Tue Apr 23 10:24:54 2019
+++ src/share/mk/bsd.x11.mk Wed Apr 17 18:07:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.124.6.1 2019/04/23 10:24:54 martin Exp $
+# $NetBSD: bsd.x11.mk,v 1.124.6.2 2024/04/17 18:07:53 martin Exp $
.include
@@ -144,7 +144,7 @@ XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIB
XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 1000) + ((${XORG_SERVER_MINOR}) * 10) + ((${XORG_SERVER_TEENY}) * 1000) + 0)"
-PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
+PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
CVS commit: [netbsd-8] src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 17 18:07:53 UTC 2024
Modified Files:
src/share/mk [netbsd-8]: bsd.x11.mk
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1954):
share/mk/bsd.lib.mk: revision 1.398
share/mk/bsd.lib.mk: revision 1.399
share/mk/bsd.x11.mk: revision 1.152
(via patch)
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.124.6.1 -r1.124.6.2 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Apr 17 16:26:10 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-8]: if_iwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1953): sys/dev/pci/if_iwn.c: revision 1.100 if_iwn.c: pick up proper firmware for Centrino Wireless-N 130 Both variants should use iwlwifi-6000g2b-6 not iwlwifi-6000g2a-6. (It seems only two specific product variants use iwlwifi-6000g2a-6. We could simplify by reversing the sense of the test, as OpenBSD does, but it doesn't seem to matter much, as what we now match seems to be the full gamut possible, so the simpler diff was chosen here.) Addresses PR kern/58105 from wandrien.dev%gmail.com@localhost, with the PCI_PRODUCT_INTEL_WIFI_LINK_130_1 match tested by the reporter. Code inspection of the FreeBSD driver indicates we should safely be able to match PCI_PRODUCT_INTEL_WIFI_LINK_130_2 also. To generate a diff of this commit: cvs rdiff -u -r1.84.6.2 -r1.84.6.3 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_iwn.c diff -u src/sys/dev/pci/if_iwn.c:1.84.6.2 src/sys/dev/pci/if_iwn.c:1.84.6.3 --- src/sys/dev/pci/if_iwn.c:1.84.6.2 Sun Dec 10 10:10:24 2017 +++ src/sys/dev/pci/if_iwn.c Wed Apr 17 16:26:10 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwn.c,v 1.84.6.2 2017/12/10 10:10:24 snj Exp $ */ +/* $NetBSD: if_iwn.c,v 1.84.6.3 2024/04/17 16:26:10 martin Exp $ */ /* $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $ */ /*- @@ -22,7 +22,7 @@ * adapters. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.84.6.2 2017/12/10 10:10:24 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.84.6.3 2024/04/17 16:26:10 martin Exp $"); #define IWN_USE_RBUF /* Use local storage for RX */ #undef IWN_HWCRYPTO /* XXX does not even compile yet */ @@ -785,6 +785,8 @@ iwn5000_attach(struct iwn_softc *sc, pci /* Type 6030 cards return IWN_HW_REV_TYPE_6005 */ if (pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_1 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_2 || + pid == PCI_PRODUCT_INTEL_WIFI_LINK_130_1 || + pid == PCI_PRODUCT_INTEL_WIFI_LINK_130_2 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_1 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_2 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6235 ||
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Apr 17 16:26:10 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-8]: if_iwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1953): sys/dev/pci/if_iwn.c: revision 1.100 if_iwn.c: pick up proper firmware for Centrino Wireless-N 130 Both variants should use iwlwifi-6000g2b-6 not iwlwifi-6000g2a-6. (It seems only two specific product variants use iwlwifi-6000g2a-6. We could simplify by reversing the sense of the test, as OpenBSD does, but it doesn't seem to matter much, as what we now match seems to be the full gamut possible, so the simpler diff was chosen here.) Addresses PR kern/58105 from wandrien.dev%gmail.com@localhost, with the PCI_PRODUCT_INTEL_WIFI_LINK_130_1 match tested by the reporter. Code inspection of the FreeBSD driver indicates we should safely be able to match PCI_PRODUCT_INTEL_WIFI_LINK_130_2 also. To generate a diff of this commit: cvs rdiff -u -r1.84.6.2 -r1.84.6.3 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 25 15:59:02 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1952 To generate a diff of this commit: cvs rdiff -u -r1.1.2.225 -r1.1.2.226 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.225 src/doc/CHANGES-8.3:1.1.2.226 --- src/doc/CHANGES-8.3:1.1.2.225 Mon Mar 25 15:55:32 2024 +++ src/doc/CHANGES-8.3 Mon Mar 25 15:59:02 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.225 2024/03/25 15:55:32 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.226 2024/03/25 15:59:02 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4384,3 +4384,9 @@ sys/dev/qbus/if_qe.c1.82 vax/qe(4): PR 58068: fix crash on various ifconfig operations. [riastradh, ticket #1951] +external/gpl2/groff/dist/tmac/doc.tmac 1.3 + + doc.tmac: PR 58074: .Lk - handle punctuation without anchor-text + correctly. + [uwe, ticket #1952] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 25 15:59:02 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1952 To generate a diff of this commit: cvs rdiff -u -r1.1.2.225 -r1.1.2.226 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/external/gpl2/groff/dist/tmac
Module Name:src Committed By: martin Date: Mon Mar 25 15:58:08 UTC 2024 Modified Files: src/external/gpl2/groff/dist/tmac [netbsd-8]: doc.tmac Log Message: Pull up following revision(s) (requested by uwe in ticket #1952): external/gpl2/groff/dist/tmac/doc.tmac: revision 1.3 doc.tmac: .Lk - handle punctuation without anchor-text correctly doc-get-arg-type expects that doc-width is set beforehand, so call doc-get-width to make sure doc-get-arg-type detects the trailing punctuation correctly. PR bin/58074 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.8.1 src/external/gpl2/groff/dist/tmac/doc.tmac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/external/gpl2/groff/dist/tmac
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:58:08 UTC 2024
Modified Files:
src/external/gpl2/groff/dist/tmac [netbsd-8]: doc.tmac
Log Message:
Pull up following revision(s) (requested by uwe in ticket #1952):
external/gpl2/groff/dist/tmac/doc.tmac: revision 1.3
doc.tmac: .Lk - handle punctuation without anchor-text correctly
doc-get-arg-type expects that doc-width is set beforehand, so call
doc-get-width to make sure doc-get-arg-type detects the trailing
punctuation correctly.
PR bin/58074
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/gpl2/groff/dist/tmac/doc.tmac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/groff/dist/tmac/doc.tmac
diff -u src/external/gpl2/groff/dist/tmac/doc.tmac:1.2 src/external/gpl2/groff/dist/tmac/doc.tmac:1.2.8.1
--- src/external/gpl2/groff/dist/tmac/doc.tmac:1.2 Wed Jan 13 19:01:59 2016
+++ src/external/gpl2/groff/dist/tmac/doc.tmac Mon Mar 25 15:58:08 2024
@@ -6416,6 +6416,7 @@
. ds doc-str-Lk Sy \$@
.
. ie (\n[.$] > 1) \{\
+.doc-get-width \$2
.doc-get-arg-type \$2
.ie (\n[doc-arg-type] < 3) \{\
. Em \)\$2:
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 25 15:55:32 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1949 - #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.224 -r1.1.2.225 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.224 src/doc/CHANGES-8.3:1.1.2.225 --- src/doc/CHANGES-8.3:1.1.2.224 Tue Mar 12 12:50:10 2024 +++ src/doc/CHANGES-8.3 Mon Mar 25 15:55:32 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.224 2024/03/12 12:50:10 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.225 2024/03/25 15:55:32 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4365,3 +4365,22 @@ usr.bin/audio/record/record.c - audioplay gains -n flag (no play, like make -n) - audiorecord manual gained useful examples [mrg, ticket #1948] + +usr.bin/audio/common/wav.c 1.24 + + audioplay(1): avoid errors when a file has zero-length data. + [mrg, ticket #1950] + +distrib/amd64/ramdisks/common/Makefile.ramdisk 1.17 +distrib/i386/ramdisks/common/Makefile.ramdisk 1.16 +etc/etc.amd64/Makefile.inc 1.17 +etc/etc.i386/Makefile.inc 1.70 + + x86: PR 57534: release the zfs and cgd ramdisks too. + [riastradh, ticket #1949] + +sys/dev/qbus/if_qe.c1.82 + + vax/qe(4): PR 58068: fix crash on various ifconfig operations. + [riastradh, ticket #1951] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 25 15:55:32 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1949 - #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.224 -r1.1.2.225 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/qbus
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:37:25 UTC 2024
Modified Files:
src/sys/dev/qbus [netbsd-8]: if_qe.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1951):
sys/dev/qbus/if_qe.c: revision 1.82
vax/qe(4): supply an ipf->if_init() so that if_init() doesn't crash.
convert the existing qeinit() to one compatible with if_init.
should fix PR#58068.
To generate a diff of this commit:
cvs rdiff -u -r1.77.2.1 -r1.77.2.2 src/sys/dev/qbus/if_qe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/qbus/if_qe.c
diff -u src/sys/dev/qbus/if_qe.c:1.77.2.1 src/sys/dev/qbus/if_qe.c:1.77.2.2
--- src/sys/dev/qbus/if_qe.c:1.77.2.1 Thu Jul 26 23:55:30 2018
+++ src/sys/dev/qbus/if_qe.c Mon Mar 25 15:37:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.77.2.1 2018/07/26 23:55:30 snj Exp $ */
+/* $NetBSD: if_qe.c,v 1.77.2.2 2024/03/25 15:37:25 martin Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.77.2.1 2018/07/26 23:55:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.77.2.2 2024/03/25 15:37:25 martin Exp $");
#include "opt_inet.h"
@@ -97,7 +97,7 @@ struct qe_softc {
static int qematch(device_t, cfdata_t, void *);
static void qeattach(device_t, device_t, void *);
-static void qeinit(struct qe_softc *);
+static int qeinit(struct ifnet *);
static void qestart(struct ifnet *);
static void qeintr(void *);
static int qeioctl(struct ifnet *, u_long, void *);
@@ -341,6 +341,7 @@ qeattach(device_t parent, device_t self,
ifp->if_softc = sc;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_start = qestart;
+ ifp->if_init = qeinit;
ifp->if_ioctl = qeioctl;
ifp->if_watchdog = qetimeout;
IFQ_SET_READY(>if_snd);
@@ -381,10 +382,10 @@ qeattach(device_t parent, device_t self,
/*
* Initialization of interface.
*/
-void
-qeinit(struct qe_softc *sc)
+int
+qeinit(struct ifnet *ifp)
{
- struct ifnet *ifp = (struct ifnet *)>sc_if;
+ struct qe_softc *sc = ifp->if_softc;
struct qe_cdata *qc = sc->sc_qedata;
int i;
@@ -411,7 +412,6 @@ qeinit(struct qe_softc *sc)
qc->qc_xmit[i].qe_status1 = qc->qc_xmit[i].qe_flag = QE_NOTYET;
}
-
/*
* Init receive descriptors.
*/
@@ -436,6 +436,7 @@ qeinit(struct qe_softc *sc)
*/
qe_setup(sc);
+ return 0;
}
/*
@@ -651,7 +652,7 @@ qeioctl(struct ifnet *ifp, u_long cmd, v
switch(ifa->ifa_addr->sa_family) {
#ifdef INET
case AF_INET:
- qeinit(sc);
+ qeinit(ifp);
arp_ifinit(ifp, ifa);
break;
#endif
@@ -677,7 +678,7 @@ qeioctl(struct ifnet *ifp, u_long cmd, v
* If interface it marked up and it is stopped, then
* start it.
*/
- qeinit(sc);
+ qeinit(ifp);
break;
case IFF_UP|IFF_RUNNING:
/*
@@ -865,5 +866,5 @@ qetimeout(struct ifnet *ifp)
* Do a reset of interface, to get it going again.
* Will it work by just restart the transmit logic?
*/
- qeinit(sc);
+ qeinit(ifp);
}
CVS commit: [netbsd-8] src/sys/dev/qbus
Module Name:src Committed By: martin Date: Mon Mar 25 15:37:25 UTC 2024 Modified Files: src/sys/dev/qbus [netbsd-8]: if_qe.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1951): sys/dev/qbus/if_qe.c: revision 1.82 vax/qe(4): supply an ipf->if_init() so that if_init() doesn't crash. convert the existing qeinit() to one compatible with if_init. should fix PR#58068. To generate a diff of this commit: cvs rdiff -u -r1.77.2.1 -r1.77.2.2 src/sys/dev/qbus/if_qe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:21:05 UTC 2024
Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-8]: Makefile.ramdisk
src/distrib/i386/ramdisks/common [netbsd-8]: Makefile.ramdisk
src/etc/etc.amd64 [netbsd-8]: Makefile.inc
src/etc/etc.i386 [netbsd-8]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1949):
etc/etc.amd64/Makefile.inc: revision 1.17
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.17
etc/etc.i386/Makefile.inc: revision 1.70
distrib/i386/ramdisks/common/Makefile.ramdisk: revision 1.16
x86: Release the ramdisks too.
This way we will get cgdroot.fs (and zfsroot.fs too) in the release.
PR misc/57534
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.12 -r1.12.8.1 \
src/distrib/i386/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.15 -r1.15.8.1 src/etc/etc.amd64/Makefile.inc
cvs rdiff -u -r1.68 -r1.68.8.1 src/etc/etc.i386/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11.8.1
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11 Wed Oct 7 14:09:04 2015
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.11 2015/10/07 14:09:04 martin Exp $
+# $NetBSD: Makefile.ramdisk,v 1.11.8.1 2024/03/25 15:21:04 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -46,6 +46,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
-release:
+release: ${IMAGE}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include
Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12.8.1
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12 Wed Oct 7 14:09:05 2015
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.12 2015/10/07 14:09:05 martin Exp $
+# $NetBSD: Makefile.ramdisk,v 1.12.8.1 2024/03/25 15:21:04 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -53,6 +53,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
-release:
+release: ${IMAGE}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include
Index: src/etc/etc.amd64/Makefile.inc
diff -u src/etc/etc.amd64/Makefile.inc:1.15 src/etc/etc.amd64/Makefile.inc:1.15.8.1
--- src/etc/etc.amd64/Makefile.inc:1.15 Sun Jan 11 04:03:47 2015
+++ src/etc/etc.amd64/Makefile.inc Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2015/01/11 04:03:47 snj Exp $
+# $NetBSD: Makefile.inc,v 1.15.8.1 2024/03/25 15:21:04 martin Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -15,9 +15,11 @@ BUILD_KERNELS= INSTALL INSTALL_XEN3_DOM
INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/miniroot
+INSTALLATION_DIRS+= installation/ramdisk
snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk '*.*'
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.68 src/etc/etc.i386/Makefile.inc:1.68.8.1
--- src/etc/etc.i386/Makefile.inc:1.68 Sat Mar 7 07:28:37 2015
+++ src/etc/etc.i386/Makefile.inc Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.68 2015/03/07 07:28:37 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.68.8.1 2024/03/25 15:21:04 martin Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -29,6 +29,7 @@ INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/floppy
INSTALLATION_DIRS+= installation/miniroot
+INSTALLATION_DIRS+= installation/ramdisk
# i386 specific distrib stuff
snap_md_post:
@@ -39,3 +40,4 @@ snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Mon Mar 25 15:21:05 UTC 2024 Modified Files: src/distrib/amd64/ramdisks/common [netbsd-8]: Makefile.ramdisk src/distrib/i386/ramdisks/common [netbsd-8]: Makefile.ramdisk src/etc/etc.amd64 [netbsd-8]: Makefile.inc src/etc/etc.i386 [netbsd-8]: Makefile.inc Log Message: Pull up following revision(s) (requested by riastradh in ticket #1949): etc/etc.amd64/Makefile.inc: revision 1.17 distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.17 etc/etc.i386/Makefile.inc: revision 1.70 distrib/i386/ramdisks/common/Makefile.ramdisk: revision 1.16 x86: Release the ramdisks too. This way we will get cgdroot.fs (and zfsroot.fs too) in the release. PR misc/57534 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.8.1 \ src/distrib/amd64/ramdisks/common/Makefile.ramdisk cvs rdiff -u -r1.12 -r1.12.8.1 \ src/distrib/i386/ramdisks/common/Makefile.ramdisk cvs rdiff -u -r1.15 -r1.15.8.1 src/etc/etc.amd64/Makefile.inc cvs rdiff -u -r1.68 -r1.68.8.1 src/etc/etc.i386/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.bin/audio/common
Module Name:src Committed By: martin Date: Mon Mar 25 15:12:58 UTC 2024 Modified Files: src/usr.bin/audio/common [netbsd-8]: wav.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1950): usr.bin/audio/common/wav.c: revision 1.24 audio_wav_parse_hdr: handle zero-length data files again the previous clean up turns zero-length data into no data and thus an error, instead of simply doing nothing. noted by gson. To generate a diff of this commit: cvs rdiff -u -r1.13.8.2 -r1.13.8.3 src/usr.bin/audio/common/wav.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.bin/audio/common
Module Name:src
Committed By: martin
Date: Mon Mar 25 15:12:58 UTC 2024
Modified Files:
src/usr.bin/audio/common [netbsd-8]: wav.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1950):
usr.bin/audio/common/wav.c: revision 1.24
audio_wav_parse_hdr: handle zero-length data files again
the previous clean up turns zero-length data into no data and thus
an error, instead of simply doing nothing. noted by gson.
To generate a diff of this commit:
cvs rdiff -u -r1.13.8.2 -r1.13.8.3 src/usr.bin/audio/common/wav.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/audio/common/wav.c
diff -u src/usr.bin/audio/common/wav.c:1.13.8.2 src/usr.bin/audio/common/wav.c:1.13.8.3
--- src/usr.bin/audio/common/wav.c:1.13.8.2 Tue Mar 12 12:47:40 2024
+++ src/usr.bin/audio/common/wav.c Mon Mar 25 15:12:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wav.c,v 1.13.8.2 2024/03/12 12:47:40 martin Exp $ */
+/* $NetBSD: wav.c,v 1.13.8.3 2024/03/25 15:12:58 martin Exp $ */
/*
* Copyright (c) 2002, 2009, 2013, 2015, 2019, 2024 Matthew R. Green
@@ -33,7 +33,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: wav.c,v 1.13.8.2 2024/03/12 12:47:40 martin Exp $");
+__RCSID("$NetBSD: wav.c,v 1.13.8.3 2024/03/25 15:12:58 martin Exp $");
#endif
@@ -99,7 +99,7 @@ find_riff_chunk(const char search[4], si
*partlen = 0;
#define ADJUST(l) do {\
- if (l >= *(remainp)) \
+ if (l > *(remainp)) \
return false; \
*(wherep) += (l); \
*(remainp) -= (l); \
@@ -158,7 +158,7 @@ audio_wav_parse_hdr(void *hdr, size_t sz
return (AUDIO_ENOENT);
#define ADJUST(l) do {\
- if (l >= remain) \
+ if ((l) > remain) \
return (AUDIO_ESHORTHDR); \
where += (l);\
remain -= (l);\
@@ -279,20 +279,17 @@ audio_wav_parse_hdr(void *hdr, size_t sz
if (!found)
return (AUDIO_EWAVNODATA);
- if (len) {
- if (channels)
- *channels = (u_int)getle16(fmt.channels);
- if (sample)
- *sample = getle32(fmt.sample_rate);
- if (enc)
- *enc = newenc;
- if (prec)
- *prec = newprec;
- if (datasize)
- *datasize = (off_t)len;
- return (where - (char *)hdr);
- }
- return (AUDIO_EWAVNODATA);
+ if (channels)
+ *channels = (u_int)getle16(fmt.channels);
+ if (sample)
+ *sample = getle32(fmt.sample_rate);
+ if (enc)
+ *enc = newenc;
+ if (prec)
+ *prec = newprec;
+ if (datasize)
+ *datasize = (off_t)len;
+ return (where - (char *)hdr);
#undef ADJUST
}
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Mar 12 12:50:10 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1940 and #1948 To generate a diff of this commit: cvs rdiff -u -r1.1.2.223 -r1.1.2.224 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.223 src/doc/CHANGES-8.3:1.1.2.224 --- src/doc/CHANGES-8.3:1.1.2.223 Mon Mar 11 20:06:31 2024 +++ src/doc/CHANGES-8.3 Tue Mar 12 12:50:10 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.223 2024/03/11 20:06:31 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.224 2024/03/12 12:50:10 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4340,3 +4340,28 @@ lib/libc/gen/getcap.c1.58 libc: fix memory leak in getent(). [ozaki-r, ticket #1947] +sys/dev/usb/usbdi.c1.248 + + usbdi(9): PR 57783: avoid locking against self when racing with + the host controller softint to enter ddb. + [riastradh, ticket #1940] + +usr.bin/audio/common/auconv.h up to 1.6 +usr.bin/audio/common/audio.cup to 1.27 +usr.bin/audio/common/decode.c up to 1.2 +usr.bin/audio/common/libaudio.h up to 1.22 +usr.bin/audio/common/sun.c up to 1.11 +usr.bin/audio/common/wav.c up to 1.22 +usr.bin/audio/play/audioplay.1 up to 1.34 +usr.bin/audio/play/play.c up to 1.64 +usr.bin/audio/record/audiorecord.1 up to 1.45 +usr.bin/audio/record/record.c up to 1.58 + + audioplay(1), audiorecord(1): + - support for playing 32-bit and 64-bit IEEE FP .wav files + - support for recording 24 bit .wav files + - read-overflow fixes for .wav files, and other fixes for the + wav parser + - audioplay gains -n flag (no play, like make -n) + - audiorecord manual gained useful examples + [mrg, ticket #1948]
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Mar 12 12:50:10 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1940 and #1948 To generate a diff of this commit: cvs rdiff -u -r1.1.2.223 -r1.1.2.224 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.bin/audio
Module Name:src
Committed By: martin
Date: Tue Mar 12 12:47:41 UTC 2024
Modified Files:
src/usr.bin/audio/common [netbsd-8]: auconv.h audio.c decode.c
libaudio.h sun.c wav.c
src/usr.bin/audio/play [netbsd-8]: audioplay.1 play.c
src/usr.bin/audio/record [netbsd-8]: audiorecord.1 record.c
Log Message:
Pull up the following revisions, requested by mrg in ticket #1948:
usr.bin/audio/common/auconv.h up to 1.6
usr.bin/audio/common/audio.cup to 1.27
usr.bin/audio/common/decode.c up to 1.2
usr.bin/audio/common/libaudio.h up to 1.22
usr.bin/audio/common/sun.c up to 1.11
usr.bin/audio/common/wav.c up to 1.22
usr.bin/audio/play/audioplay.1 up to 1.34
usr.bin/audio/play/play.c up to 1.64
usr.bin/audio/record/audiorecord.1 up to 1.45
usr.bin/audio/record/record.c up to 1.58
- support for playing 32-bit and 64-bit IEEE FP .wav files
- support for recording 24 bit .wav files
- read-overflow fixes for .wav files, and other fixes for the
wav parser
- audioplay gains -n flag (no play, like make -n)
- audiorecord manual gained useful examples
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.54.1 src/usr.bin/audio/common/auconv.h
cvs rdiff -u -r1.25 -r1.25.8.1 src/usr.bin/audio/common/audio.c
cvs rdiff -u -r1.1 -r1.1.8.1 src/usr.bin/audio/common/decode.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/usr.bin/audio/common/libaudio.h
cvs rdiff -u -r1.9 -r1.9.8.1 src/usr.bin/audio/common/sun.c
cvs rdiff -u -r1.13.8.1 -r1.13.8.2 src/usr.bin/audio/common/wav.c
cvs rdiff -u -r1.26 -r1.26.18.1 src/usr.bin/audio/play/audioplay.1
cvs rdiff -u -r1.55 -r1.55.8.1 src/usr.bin/audio/play/play.c
cvs rdiff -u -r1.42 -r1.42.18.1 src/usr.bin/audio/record/audiorecord.1
cvs rdiff -u -r1.54 -r1.54.8.1 src/usr.bin/audio/record/record.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/audio/common/auconv.h
diff -u src/usr.bin/audio/common/auconv.h:1.5 src/usr.bin/audio/common/auconv.h:1.5.54.1
--- src/usr.bin/audio/common/auconv.h:1.5 Mon Apr 28 20:24:12 2008
+++ src/usr.bin/audio/common/auconv.h Tue Mar 12 12:47:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.h,v 1.5 2008/04/28 20:24:12 martin Exp $ */
+/* $NetBSD: auconv.h,v 1.5.54.1 2024/03/12 12:47:40 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -78,6 +78,24 @@ change_sign16_be(u_char *p, int cc)
}
static inline void
+change_sign24_le(u_char *p, int cc)
+{
+ while ((cc -= 3) >= 0) {
+ p[2] ^= 0x80;
+ p += 3;
+ }
+}
+
+static inline void
+change_sign24_be(u_char *p, int cc)
+{
+ while ((cc -= 3) >= 0) {
+ p[0] ^= 0x80;
+ p += 3;
+ }
+}
+
+static inline void
change_sign32_le(u_char *p, int cc)
{
while ((cc -= 4) >= 0) {
@@ -163,6 +181,44 @@ change_sign16_swap_bytes_be(u_char *p, i
}
static inline void
+swap_bytes_change_sign24_le(u_char *p, int cc)
+{
+ u_char t;
+
+ while ((cc -= 3) >= 0) {
+ t = p[2];
+ p[2] = p[0] ^ 0x80;
+ p[0] = t;
+ p += 3;
+ }
+}
+
+static inline void
+swap_bytes_change_sign24_be(u_char *p, int cc)
+{
+ u_char t;
+
+ while ((cc -= 3) >= 0) {
+ t = p[0];
+ p[0] = p[2] ^ 0x80;
+ p[2] = t;
+ p += 3;
+ }
+}
+
+static inline void
+change_sign24_swap_bytes_le(u_char *p, int cc)
+{
+ swap_bytes_change_sign24_be(p, cc);
+}
+
+static inline void
+change_sign24_swap_bytes_be(u_char *p, int cc)
+{
+ swap_bytes_change_sign24_le(p, cc);
+}
+
+static inline void
swap_bytes_change_sign32_le(u_char *p, int cc)
{
u_char t;
Index: src/usr.bin/audio/common/audio.c
diff -u src/usr.bin/audio/common/audio.c:1.25 src/usr.bin/audio/common/audio.c:1.25.8.1
--- src/usr.bin/audio/common/audio.c:1.25 Wed Aug 5 06:54:39 2015
+++ src/usr.bin/audio/common/audio.c Tue Mar 12 12:47:40 2024
@@ -1,7 +1,7 @@
-/* $NetBSD: audio.c,v 1.25 2015/08/05 06:54:39 mrg Exp $ */
+/* $NetBSD: audio.c,v 1.25.8.1 2024/03/12 12:47:40 martin Exp $ */
/*
- * Copyright (c) 1999 Matthew R. Green
+ * Copyright (c) 1999, 2013, 2015, 2019 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: audio.c,v 1.25 2015/08/05 06:54:39 mrg Exp $");
+__RCSID("$NetBSD: audio.c,v 1.25.8.1 2024/03/12 12:47:40 martin Exp $");
#endif
@@ -110,6 +110,8 @@ static const struct {
{ AudioEmpeg_l2_packets,AUDIO_ENCODING_MPEG_L2_PACKETS },
{ AudioEmpeg_l2_system, AUDIO_ENCODING_MPEG_L2_SYSTEM },
{ AudioEac3, AUDIO_ENCODING_AC3 },
+ { "ieee_float32", AUDIO_ENCODING_LIBAUDIO_FLOAT32 },
+ { "ieee_float64", AUDIO_ENCODING_LIBAUDIO_FLOAT64 },
{ NULL, -1 }
};
@@ -203,7 +205,7 @@ write_header(struct track_info *ti)
veclen = 0;
tlen = 0;
CVS commit: [netbsd-8] src/usr.bin/audio
Module Name:src Committed By: martin Date: Tue Mar 12 12:47:41 UTC 2024 Modified Files: src/usr.bin/audio/common [netbsd-8]: auconv.h audio.c decode.c libaudio.h sun.c wav.c src/usr.bin/audio/play [netbsd-8]: audioplay.1 play.c src/usr.bin/audio/record [netbsd-8]: audiorecord.1 record.c Log Message: Pull up the following revisions, requested by mrg in ticket #1948: usr.bin/audio/common/auconv.h up to 1.6 usr.bin/audio/common/audio.cup to 1.27 usr.bin/audio/common/decode.c up to 1.2 usr.bin/audio/common/libaudio.h up to 1.22 usr.bin/audio/common/sun.c up to 1.11 usr.bin/audio/common/wav.c up to 1.22 usr.bin/audio/play/audioplay.1 up to 1.34 usr.bin/audio/play/play.c up to 1.64 usr.bin/audio/record/audiorecord.1 up to 1.45 usr.bin/audio/record/record.c up to 1.58 - support for playing 32-bit and 64-bit IEEE FP .wav files - support for recording 24 bit .wav files - read-overflow fixes for .wav files, and other fixes for the wav parser - audioplay gains -n flag (no play, like make -n) - audiorecord manual gained useful examples To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.54.1 src/usr.bin/audio/common/auconv.h cvs rdiff -u -r1.25 -r1.25.8.1 src/usr.bin/audio/common/audio.c cvs rdiff -u -r1.1 -r1.1.8.1 src/usr.bin/audio/common/decode.c cvs rdiff -u -r1.20 -r1.20.8.1 src/usr.bin/audio/common/libaudio.h cvs rdiff -u -r1.9 -r1.9.8.1 src/usr.bin/audio/common/sun.c cvs rdiff -u -r1.13.8.1 -r1.13.8.2 src/usr.bin/audio/common/wav.c cvs rdiff -u -r1.26 -r1.26.18.1 src/usr.bin/audio/play/audioplay.1 cvs rdiff -u -r1.55 -r1.55.8.1 src/usr.bin/audio/play/play.c cvs rdiff -u -r1.42 -r1.42.18.1 src/usr.bin/audio/record/audiorecord.1 cvs rdiff -u -r1.54 -r1.54.8.1 src/usr.bin/audio/record/record.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Tue Mar 12 12:36:17 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-8]: usbdi.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1940):
sys/dev/usb/usbdi.c: revision 1.248
usbdi(9): Avoid calling ubm_softint with lock held and polling on.
PR kern/57783
To generate a diff of this commit:
cvs rdiff -u -r1.173.2.5 -r1.173.2.6 src/sys/dev/usb/usbdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.173.2.5 src/sys/dev/usb/usbdi.c:1.173.2.6
--- src/sys/dev/usb/usbdi.c:1.173.2.5 Fri Jan 11 15:52:24 2019
+++ src/sys/dev/usb/usbdi.c Tue Mar 12 12:36:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.173.2.5 2019/01/11 15:52:24 martin Exp $ */
+/* $NetBSD: usbdi.c,v 1.173.2.6 2024/03/12 12:36:17 martin Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.173.2.5 2019/01/11 15:52:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.173.2.6 2024/03/12 12:36:17 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1169,14 +1169,34 @@ usbd_dopoll(struct usbd_interface *iface
void
usbd_set_polling(struct usbd_device *dev, int on)
{
- if (on)
- dev->ud_bus->ub_usepolling++;
- else
- dev->ud_bus->ub_usepolling--;
- /* Kick the host controller when switching modes */
mutex_enter(dev->ud_bus->ub_lock);
- dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+ if (on) {
+ /*
+ * Enabling polling. If we're enabling for the first
+ * time, call the softint routine on transition while
+ * we hold the lock and polling is still disabled, and
+ * then enable polling -- once polling is enabled, we
+ * must not hold the lock when we call the softint
+ * routine.
+ */
+ KASSERT(dev->ud_bus->ub_usepolling < __type_max(char));
+ if (dev->ud_bus->ub_usepolling == 0)
+ dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+ dev->ud_bus->ub_usepolling++;
+ } else {
+ /*
+ * Disabling polling. If we're disabling polling for
+ * the last time, disable polling first and then call
+ * the softint routine while we hold the lock -- until
+ * polling is disabled, we must not hold the lock when
+ * we call the softint routine.
+ */
+ KASSERT(dev->ud_bus->ub_usepolling > 0);
+ dev->ud_bus->ub_usepolling--;
+ if (dev->ud_bus->ub_usepolling == 0)
+ dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+ }
mutex_exit(dev->ud_bus->ub_lock);
}
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Tue Mar 12 12:36:17 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-8]: usbdi.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1940): sys/dev/usb/usbdi.c: revision 1.248 usbdi(9): Avoid calling ubm_softint with lock held and polling on. PR kern/57783 To generate a diff of this commit: cvs rdiff -u -r1.173.2.5 -r1.173.2.6 src/sys/dev/usb/usbdi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 11 20:06:31 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1945 - #1947 To generate a diff of this commit: cvs rdiff -u -r1.1.2.222 -r1.1.2.223 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.222 src/doc/CHANGES-8.3:1.1.2.223 --- src/doc/CHANGES-8.3:1.1.2.222 Sun Mar 10 19:22:56 2024 +++ src/doc/CHANGES-8.3 Mon Mar 11 20:06:31 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.222 2024/03/10 19:22:56 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.223 2024/03/11 20:06:31 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4323,3 +4323,20 @@ sys/netinet6/in6.c1.292 a router advertisement processed by dhcpcd. [riastradh, ticket #1944] +sys/kern/sysv_shm.c1.142 (patch) + + sysv_shm: PR 57979: avoid arithmetic overflow when computing + kern.ipc.shmmax. + [riastradh, ticket #1945] + +sys/net/if_tun.c1.175 + + tun(4): PR 58013: allow IPv6 packets with TUNSLMODE configured, + rather than hard-coding tun(4) as IPv4-only. + [riastradh, ticket #1946] + +lib/libc/gen/getcap.c1.58 + + libc: fix memory leak in getent(). + [ozaki-r, ticket #1947] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 11 20:06:31 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1945 - #1947 To generate a diff of this commit: cvs rdiff -u -r1.1.2.222 -r1.1.2.223 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/lib/libc/gen
Module Name:src Committed By: martin Date: Mon Mar 11 20:05:15 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-8]: getcap.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1947): lib/libc/gen/getcap.c: revision 1.58 Fix memory leak in getent() Memory was not freed if record was not found To generate a diff of this commit: cvs rdiff -u -r1.56.8.1 -r1.56.8.2 src/lib/libc/gen/getcap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/lib/libc/gen
Module Name:src
Committed By: martin
Date: Mon Mar 11 20:05:15 UTC 2024
Modified Files:
src/lib/libc/gen [netbsd-8]: getcap.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1947):
lib/libc/gen/getcap.c: revision 1.58
Fix memory leak in getent()
Memory was not freed if record was not found
To generate a diff of this commit:
cvs rdiff -u -r1.56.8.1 -r1.56.8.2 src/lib/libc/gen/getcap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/getcap.c
diff -u src/lib/libc/gen/getcap.c:1.56.8.1 src/lib/libc/gen/getcap.c:1.56.8.2
--- src/lib/libc/gen/getcap.c:1.56.8.1 Tue Jul 4 12:57:45 2017
+++ src/lib/libc/gen/getcap.c Mon Mar 11 20:05:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getcap.c,v 1.56.8.1 2017/07/04 12:57:45 martin Exp $ */
+/* $NetBSD: getcap.c,v 1.56.8.2 2024/03/11 20:05:15 martin Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
#else
-__RCSID("$NetBSD: getcap.c,v 1.56.8.1 2017/07/04 12:57:45 martin Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.56.8.2 2024/03/11 20:05:15 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -502,8 +502,10 @@ getent(char **cap, size_t *len, const ch
break;
}
- if (!foundit)
+ if (!foundit) {
+ free(record);
return -1;
+ }
/*
* Got the capability record, but now we have to expand all tc=name
CVS commit: [netbsd-8] src/sys/net
Module Name:src
Committed By: martin
Date: Mon Mar 11 19:31:31 UTC 2024
Modified Files:
src/sys/net [netbsd-8]: if_tun.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1946):
sys/net/if_tun.c: revision 1.175
tun(4): Allow IPv6 packets with TUNSLMODE configured.
PR kern/58013
To generate a diff of this commit:
cvs rdiff -u -r1.139.2.4 -r1.139.2.5 src/sys/net/if_tun.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.139.2.4 src/sys/net/if_tun.c:1.139.2.5
--- src/sys/net/if_tun.c:1.139.2.4 Wed Aug 15 12:07:30 2018
+++ src/sys/net/if_tun.c Mon Mar 11 19:31:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.139.2.4 2018/08/15 12:07:30 martin Exp $ */
+/* $NetBSD: if_tun.c,v 1.139.2.5 2024/03/11 19:31:31 martin Exp $ */
/*
* Copyright (c) 1988, Julian Onions
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.139.2.4 2018/08/15 12:07:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.139.2.5 2024/03/11 19:31:31 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -577,9 +577,7 @@ tun_output(struct ifnet *ifp, struct mbu
goto out;
}
memcpy(mtod(m0, char *), dst, dst->sa_len);
- }
-
- if (tp->tun_flags & TUN_IFHEAD) {
+ } else if (tp->tun_flags & TUN_IFHEAD) {
/* Prepend the address family */
M_PREPEND(m0, sizeof(*af), M_DONTWAIT);
if (m0 == NULL) {
CVS commit: [netbsd-8] src/sys/net
Module Name:src Committed By: martin Date: Mon Mar 11 19:31:31 UTC 2024 Modified Files: src/sys/net [netbsd-8]: if_tun.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1946): sys/net/if_tun.c: revision 1.175 tun(4): Allow IPv6 packets with TUNSLMODE configured. PR kern/58013 To generate a diff of this commit: cvs rdiff -u -r1.139.2.4 -r1.139.2.5 src/sys/net/if_tun.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/kern
Module Name:src Committed By: martin Date: Mon Mar 11 18:04:54 UTC 2024 Modified Files: src/sys/kern [netbsd-8]: sysv_shm.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1945): sys/kern/sysv_shm.c: revision 1.142 (patch) Avoid overflow when computing kern.ipc.shmmax. Keep shmmax (bytes) and shmall (pages) values aligned and use arithmetic everywhere instead of shifts. Should fix PR 57979 To generate a diff of this commit: cvs rdiff -u -r1.131.10.2 -r1.131.10.3 src/sys/kern/sysv_shm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/kern
Module Name:src
Committed By: martin
Date: Mon Mar 11 18:04:54 UTC 2024
Modified Files:
src/sys/kern [netbsd-8]: sysv_shm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1945):
sys/kern/sysv_shm.c: revision 1.142 (patch)
Avoid overflow when computing kern.ipc.shmmax. Keep shmmax (bytes) and
shmall (pages) values aligned and use arithmetic everywhere instead
of shifts.
Should fix PR 57979
To generate a diff of this commit:
cvs rdiff -u -r1.131.10.2 -r1.131.10.3 src/sys/kern/sysv_shm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sysv_shm.c
diff -u src/sys/kern/sysv_shm.c:1.131.10.2 src/sys/kern/sysv_shm.c:1.131.10.3
--- src/sys/kern/sysv_shm.c:1.131.10.2 Tue Jan 21 18:12:54 2020
+++ src/sys/kern/sysv_shm.c Mon Mar 11 18:04:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_shm.c,v 1.131.10.2 2020/01/21 18:12:54 martin Exp $ */
+/* $NetBSD: sysv_shm.c,v 1.131.10.3 2024/03/11 18:04:54 martin Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.131.10.2 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.131.10.3 2024/03/11 18:04:54 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -1004,10 +1004,10 @@ shminit(struct sysctllog **clog)
ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)));
if (shminfo.shmmax == 0)
- shminfo.shmmax = max(physmem / 4, 1024) * PAGE_SIZE;
+ shminfo.shmall = max(physmem / 4, 1024);
else
- shminfo.shmmax *= PAGE_SIZE;
- shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
+ shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
+ shminfo.shmmax = (uint64_t)shminfo.shmall * PAGE_SIZE;
for (i = 0; i < shminfo.shmmni; i++) {
cv_init(_cv[i], "shmwait");
@@ -1129,7 +1129,7 @@ sysctl_ipc_shmmax(SYSCTLFN_ARGS)
return EINVAL;
shminfo.shmmax = round_page(newsize);
- shminfo.shmall = shminfo.shmmax >> PAGE_SHIFT;
+ shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
return 0;
}
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Mar 10 19:22:56 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1939, #1941 - #1944 To generate a diff of this commit: cvs rdiff -u -r1.1.2.221 -r1.1.2.222 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.221 src/doc/CHANGES-8.3:1.1.2.222 --- src/doc/CHANGES-8.3:1.1.2.221 Thu Feb 29 10:47:52 2024 +++ src/doc/CHANGES-8.3 Sun Mar 10 19:22:56 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.221 2024/02/29 10:47:52 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.222 2024/03/10 19:22:56 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4292,3 +4292,34 @@ sys/dev/pci/if_wmreg.h 1.131 - Fix comment. [msaitoh, ticket #1938] +lib/libc/net/getnameinfo.c 1.60 + + getnameinfo(3): PR 57609: fix socket address length checks. + [riastradh, ticket #1939] + +lib/libc/net/getnameinfo.3 1.43 + + getnameinfo(3): PR 57832_ document NI_NUMERICSCOPE. + [riastradh, ticket #1941] + +sys/dev/usb/if_urtwn.c1.109 (patch) + + urtwn(4): PR 57965: avoid deadlock on command ring overflow. + [riastradh, ticket #1942] + +usr.bin/getconf/getconf.1 1.14 +usr.bin/getconf/getconf.c 1.37 + + getconf(1): PR 57875: accept variable names with or without + leading underscore. This matches FreeBSD and makes it more + portable to GNU getconf(1), which currently _requires_ a leading + underscore while ours currently _refuses_ a leading underscore. + [riastradh, ticket #1943] + +sys/netinet6/in6.c1.292 + + netinet6: PR 53922: avoid NPD on certain inet6 addr configs. + This can be provoked by anyone on the local network by issuing + a router advertisement processed by dhcpcd. + [riastradh, ticket #1944] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Mar 10 19:22:56 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1939, #1941 - #1944 To generate a diff of this commit: cvs rdiff -u -r1.1.2.221 -r1.1.2.222 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src Committed By: martin Date: Sun Mar 10 19:13:09 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-8]: in6.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1944): sys/netinet6/in6.c: revision 1.292 netinet6: Avoid NPD on `ifconfig ifN inet6 ... pltime 0 vltime 0'. PR kern/53922 To generate a diff of this commit: cvs rdiff -u -r1.245.2.14 -r1.245.2.15 src/sys/netinet6/in6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet6/in6.c diff -u src/sys/netinet6/in6.c:1.245.2.14 src/sys/netinet6/in6.c:1.245.2.15 --- src/sys/netinet6/in6.c:1.245.2.14 Fri Aug 4 14:38:09 2023 +++ src/sys/netinet6/in6.c Sun Mar 10 19:13:09 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.c,v 1.245.2.14 2023/08/04 14:38:09 martin Exp $ */ +/* $NetBSD: in6.c,v 1.245.2.15 2024/03/10 19:13:09 martin Exp $ */ /* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.14 2023/08/04 14:38:09 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.15 2024/03/10 19:13:09 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -708,7 +708,14 @@ in6_control1(struct socket *so, u_long c int s = splsoftnet(); error = in6_update_ifa1(ifp, ifra, , , 0); splx(s); - if (error) + /* + * in6_update_ifa1 doesn't create the address if its + * valid lifetime (vltime) is zero, since we would just + * delete the address immediately in that case anyway. + * So it may succeed but return null ia. In that case, + * nothing left to do. + */ + if (error || ia == NULL) break; pfil_run_addrhooks(if_pfil, cmd, >ia_ifa); break;
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src Committed By: martin Date: Sun Mar 10 19:13:09 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-8]: in6.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1944): sys/netinet6/in6.c: revision 1.292 netinet6: Avoid NPD on `ifconfig ifN inet6 ... pltime 0 vltime 0'. PR kern/53922 To generate a diff of this commit: cvs rdiff -u -r1.245.2.14 -r1.245.2.15 src/sys/netinet6/in6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.bin/getconf
Module Name:src Committed By: martin Date: Sun Mar 10 19:05:46 UTC 2024 Modified Files: src/usr.bin/getconf [netbsd-8]: getconf.1 getconf.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1943): usr.bin/getconf/getconf.c: revision 1.37 usr.bin/getconf/getconf.1: revision 1.14 PR/57875: Jason Bacon: Try again without an _ for portability. getconf.1: Note that leading underscores in configuration variable names are ignored by getconf(1). While here, add a section with examples, and make the synopsis more concise. PR bin/57875 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.16.1 src/usr.bin/getconf/getconf.1 cvs rdiff -u -r1.35 -r1.35.18.1 src/usr.bin/getconf/getconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.bin/getconf
Module Name:src
Committed By: martin
Date: Sun Mar 10 19:05:46 UTC 2024
Modified Files:
src/usr.bin/getconf [netbsd-8]: getconf.1 getconf.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1943):
usr.bin/getconf/getconf.c: revision 1.37
usr.bin/getconf/getconf.1: revision 1.14
PR/57875: Jason Bacon: Try again without an _ for portability.
getconf.1: Note that leading underscores in configuration
variable names are ignored by getconf(1).
While here, add a section with examples, and make the synopsis
more concise.
PR bin/57875
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.16.1 src/usr.bin/getconf/getconf.1
cvs rdiff -u -r1.35 -r1.35.18.1 src/usr.bin/getconf/getconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/getconf/getconf.1
diff -u src/usr.bin/getconf/getconf.1:1.13 src/usr.bin/getconf/getconf.1:1.13.16.1
--- src/usr.bin/getconf/getconf.1:1.13 Sun Apr 13 01:45:34 2014
+++ src/usr.bin/getconf/getconf.1 Sun Mar 10 19:05:46 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: getconf.1,v 1.13 2014/04/13 01:45:34 snj Exp $
+.\" $NetBSD: getconf.1,v 1.13.16.1 2024/03/10 19:05:46 martin Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 9, 2011
+.Dd February 18, 2024
.Dt GETCONF 1
.Os
.Sh NAME
@@ -37,13 +37,10 @@
.Nm
.Ar system_var
.Nm
-.Fl a
-.Nm
.Ar path_var
.Ar pathname
.Nm
-.Fl a
-.Ar pathname
+.Fl a Op Ar pathname
.Sh DESCRIPTION
The
.Nm
@@ -80,8 +77,28 @@ standard output, in the format
=
.Va value
.Dc .
+.Pp
+For compatibility with other operating systems,
+.Nm
+will ignore leading underscores in the names specified in the
+.Ar system_var
+and
+.Ar path_var
+arguments.
.Sh EXIT STATUS
.Ex -std
+.Sh EXAMPLES
+To retrieve the number of configured processors, use:
+.Bd -literal -offset indent
+$ getconf NPROCESSORS_CONF
+.Ed
+.Pp
+To retrieve the maximum number of bytes (excluding the trailing
+.Dv NUL )
+for a filename in the current directory, use:
+.Bd -literal -offset indent
+$ getconf NAME_MAX .
+.Ed
.Sh SEE ALSO
.Xr pathconf 2 ,
.Xr confstr 3 ,
Index: src/usr.bin/getconf/getconf.c
diff -u src/usr.bin/getconf/getconf.c:1.35 src/usr.bin/getconf/getconf.c:1.35.18.1
--- src/usr.bin/getconf/getconf.c:1.35 Thu Dec 19 19:11:50 2013
+++ src/usr.bin/getconf/getconf.c Sun Mar 10 19:05:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getconf.c,v 1.35 2013/12/19 19:11:50 rmind Exp $ */
+/* $NetBSD: getconf.c,v 1.35.18.1 2024/03/10 19:05:46 martin Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: getconf.c,v 1.35 2013/12/19 19:11:50 rmind Exp $");
+__RCSID("$NetBSD: getconf.c,v 1.35.18.1 2024/03/10 19:05:46 martin Exp $");
#endif /* not lint */
#include
@@ -193,7 +193,7 @@ main(int argc, char **argv)
{
int ch;
const struct conf_variable *cp;
- const char *varname, *pathname;
+ const char *varname, *pathname, *vn;
int found;
setprogname(argv[0]);
@@ -226,8 +226,10 @@ main(int argc, char **argv)
pathname = argv[0]; /* may be NULL */
found = 0;
+ vn = varname;
+again:
for (cp = conf_table; cp->name != NULL; cp++) {
- if (a_flag || strcmp(varname, cp->name) == 0) {
+ if (a_flag || strcmp(vn, cp->name) == 0) {
/*LINTED weird expression*/
if ((cp->type == PATHCONF) == (pathname != NULL)) {
printvar(cp, pathname);
@@ -238,8 +240,11 @@ main(int argc, char **argv)
}
}
- if (!a_flag && !found)
+ if (!a_flag && !found) {
+ if (*vn++ == '_')
+ goto again;
errx(EXIT_FAILURE, "%s: unknown variable", varname);
+ }
(void)fflush(stdout);
return ferror(stdout) ? EXIT_FAILURE : EXIT_SUCCESS;
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sun Mar 10 19:00:27 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-8]: if_urtwn.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1942):
sys/dev/usb/if_urtwn.c: revision 1.109 (patch)
urtwn(4): Ditch old queued commands on overflow.
Don't increment ring->queued past what the task will decrement.
This is a stop-gap measure; really, we should just have one task for
each operation that is deferred to the task thread.
PR kern/57965
To generate a diff of this commit:
cvs rdiff -u -r1.53.2.6 -r1.53.2.7 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.53.2.6 src/sys/dev/usb/if_urtwn.c:1.53.2.7
--- src/sys/dev/usb/if_urtwn.c:1.53.2.6 Sat Dec 14 12:33:47 2019
+++ src/sys/dev/usb/if_urtwn.c Sun Mar 10 19:00:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.53.2.6 2019/12/14 12:33:47 martin Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.53.2.7 2024/03/10 19:00:27 martin Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.6 2019/12/14 12:33:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.7 2024/03/10 19:00:27 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -808,6 +808,24 @@ urtwn_free_tx_list(struct urtwn_softc *s
}
static void
+urtwn_cmdq_invariants(struct urtwn_softc *sc)
+{
+ struct urtwn_host_cmd_ring *const ring __diagused = >cmdq;
+
+ KASSERT(mutex_owned(>sc_task_mtx));
+ KASSERTMSG((ring->cur >= 0 && ring->cur < URTWN_HOST_CMD_RING_COUNT),
+ "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev), ring->cur, ring->next, ring->queued);
+ KASSERTMSG((ring->next >= 0 && ring->next < URTWN_HOST_CMD_RING_COUNT),
+ "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev), ring->cur, ring->next, ring->queued);
+ KASSERTMSG((ring->queued >= 0 &&
+ ring->queued <= URTWN_HOST_CMD_RING_COUNT),
+ "%s: %d commands queued",
+ device_xname(sc->sc_dev), ring->queued);
+}
+
+static void
urtwn_task(void *arg)
{
struct urtwn_softc *sc = arg;
@@ -820,7 +838,11 @@ urtwn_task(void *arg)
/* Process host commands. */
s = splusb();
mutex_spin_enter(>sc_task_mtx);
+ urtwn_cmdq_invariants(sc);
while (ring->next != ring->cur) {
+ KASSERTMSG(ring->queued > 0, "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev),
+ ring->cur, ring->next, ring->queued);
cmd = >cmd[ring->next];
mutex_spin_exit(>sc_task_mtx);
splx(s);
@@ -828,6 +850,10 @@ urtwn_task(void *arg)
cmd->cb(sc, cmd->data);
s = splusb();
mutex_spin_enter(>sc_task_mtx);
+ urtwn_cmdq_invariants(sc);
+ KASSERTMSG(ring->queued > 0, "%s: cur=%d next=%d queued=%d",
+ device_xname(sc->sc_dev),
+ ring->cur, ring->next, ring->queued);
ring->queued--;
ring->next = (ring->next + 1) % URTWN_HOST_CMD_RING_COUNT;
}
@@ -842,6 +868,7 @@ urtwn_do_async(struct urtwn_softc *sc, v
{
struct urtwn_host_cmd_ring *ring = >cmdq;
struct urtwn_host_cmd *cmd;
+ bool schedtask = false;
int s;
DPRINTFN(DBG_FN, ("%s: %s: cb=%p, arg=%p, len=%d\n",
@@ -849,19 +876,27 @@ urtwn_do_async(struct urtwn_softc *sc, v
s = splusb();
mutex_spin_enter(>sc_task_mtx);
+ urtwn_cmdq_invariants(sc);
cmd = >cmd[ring->cur];
cmd->cb = cb;
KASSERT(len <= sizeof(cmd->data));
memcpy(cmd->data, arg, len);
ring->cur = (ring->cur + 1) % URTWN_HOST_CMD_RING_COUNT;
- /* If there is no pending command already, schedule a task. */
- if (!sc->sc_dying && ++ring->queued == 1) {
- mutex_spin_exit(>sc_task_mtx);
- usb_add_task(sc->sc_udev, >sc_task, USB_TASKQ_DRIVER);
- } else
- mutex_spin_exit(>sc_task_mtx);
+ /*
+ * Schedule a task to process the command if need be.
+ */
+ if (!sc->sc_dying) {
+ if (ring->queued == URTWN_HOST_CMD_RING_COUNT)
+ device_printf(sc->sc_dev, "command queue overflow\n");
+ else if (ring->queued++ == 0)
+ schedtask = true;
+ }
+ mutex_spin_exit(>sc_task_mtx);
splx(s);
+
+ if (schedtask)
+ usb_add_task(sc->sc_udev, >sc_task, USB_TASKQ_DRIVER);
}
static void
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Mar 10 19:00:27 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-8]: if_urtwn.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1942): sys/dev/usb/if_urtwn.c: revision 1.109 (patch) urtwn(4): Ditch old queued commands on overflow. Don't increment ring->queued past what the task will decrement. This is a stop-gap measure; really, we should just have one task for each operation that is deferred to the task thread. PR kern/57965 To generate a diff of this commit: cvs rdiff -u -r1.53.2.6 -r1.53.2.7 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/lib/libc/net
Module Name:src Committed By: martin Date: Sun Mar 10 18:48:57 UTC 2024 Modified Files: src/lib/libc/net [netbsd-8]: getnameinfo.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #1941): lib/libc/net/getnameinfo.3: revision 1.43 Document the NI_NUMERICSCOPE flag. PR lib/57832 To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.18.1 src/lib/libc/net/getnameinfo.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/net/getnameinfo.3 diff -u src/lib/libc/net/getnameinfo.3:1.41 src/lib/libc/net/getnameinfo.3:1.41.18.1 --- src/lib/libc/net/getnameinfo.3:1.41 Sun Aug 18 10:40:06 2013 +++ src/lib/libc/net/getnameinfo.3 Sun Mar 10 18:48:57 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: getnameinfo.3,v 1.41 2013/08/18 10:40:06 wiz Exp $ +.\" $NetBSD: getnameinfo.3,v 1.41.18.1 2024/03/10 18:48:57 martin Exp $ .\" $KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $ .\" $OpenBSD: getnameinfo.3,v 1.36 2004/12/21 09:48:20 jmc Exp $ .\" @@ -17,7 +17,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.Dd August 18, 2013 +.Dd February 15, 2024 .Dt GETNAMEINFO 3 .Os .Sh NAME @@ -106,6 +106,10 @@ If the host name cannot be found in DNS a non-zero error code is returned. If the host name is not found and the flag is not set, the address is returned in numeric form. +.It NI_NUMERICSCOPE +For IPv6 addresses the numeric form of the IPv6 scope identifier is +returned. +This flag is ignored for non-IPv6 addresses. .It NI_NUMERICSERV The service name is returned as a digit string representing the port number. .It NI_DGRAM
CVS commit: [netbsd-8] src/lib/libc/net
Module Name:src Committed By: martin Date: Sun Mar 10 18:48:57 UTC 2024 Modified Files: src/lib/libc/net [netbsd-8]: getnameinfo.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #1941): lib/libc/net/getnameinfo.3: revision 1.43 Document the NI_NUMERICSCOPE flag. PR lib/57832 To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.18.1 src/lib/libc/net/getnameinfo.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/lib/libc/net
Module Name:src
Committed By: martin
Date: Sun Mar 10 13:47:32 UTC 2024
Modified Files:
src/lib/libc/net [netbsd-8]: getnameinfo.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1939):
lib/libc/net/getnameinfo.c: revision 1.60
PR/57609: Carl Engvall: Add salen checks but accept larger sizes
(upto sockaddr_storage)
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.8.1 src/lib/libc/net/getnameinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getnameinfo.c
diff -u src/lib/libc/net/getnameinfo.c:1.59 src/lib/libc/net/getnameinfo.c:1.59.8.1
--- src/lib/libc/net/getnameinfo.c:1.59 Tue Sep 22 16:15:08 2015
+++ src/lib/libc/net/getnameinfo.c Sun Mar 10 13:47:32 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.59 2015/09/22 16:15:08 christos Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.59.8.1 2024/03/10 13:47:32 martin Exp $ */
/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */
/*
@@ -47,7 +47,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.59 2015/09/22 16:15:08 christos Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.59.8.1 2024/03/10 13:47:32 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@@ -128,6 +128,13 @@ getnameinfo(const struct sockaddr *sa, s
int flags)
{
+ /*
+ * getnameinfo() accepts an salen of sizeof(struct sockaddr_storage)
+ * at maximum as shown in RFC 4038 Sec.6.2.3.
+ */
+ if (salen > sizeof(struct sockaddr_storage))
+ return EAI_FAMILY;
+
switch (sa->sa_family) {
case AF_APPLETALK:
return getnameinfo_atalk(sa, salen, host, hostlen,
@@ -220,6 +227,9 @@ getnameinfo_local(const struct sockaddr
const struct sockaddr_un *sun =
(const struct sockaddr_un *)(const void *)sa;
+if (salen <= sizeof(*sun) - sizeof(sun->sun_path))
+ return EAI_FAMILY;
+
if (serv != NULL && servlen > 0)
serv[0] = '\0';
@@ -266,8 +276,8 @@ getnameinfo_inet(const struct sockaddr *
return EAI_FAMILY;
found:
- if (salen != afd->a_socklen)
- return EAI_FAIL;
+ if (salen < afd->a_socklen)
+ return EAI_FAMILY;
/* network byte order */
port = ((const struct sockinet *)(const void *)sa)->si_port;
@@ -544,6 +554,9 @@ getnameinfo_link(const struct sockaddr *
const struct ieee1394_hwaddr *iha;
int n;
+if (salen <= sizeof(*sdl) - sizeof(sdl->sdl_data))
+ return EAI_FAMILY;
+
if (serv != NULL && servlen > 0)
*serv = '\0';
CVS commit: [netbsd-8] src/lib/libc/net
Module Name:src Committed By: martin Date: Sun Mar 10 13:47:32 UTC 2024 Modified Files: src/lib/libc/net [netbsd-8]: getnameinfo.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1939): lib/libc/net/getnameinfo.c: revision 1.60 PR/57609: Carl Engvall: Add salen checks but accept larger sizes (upto sockaddr_storage) To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.59.8.1 src/lib/libc/net/getnameinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Feb 29 10:47:52 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1938 To generate a diff of this commit: cvs rdiff -u -r1.1.2.220 -r1.1.2.221 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.220 src/doc/CHANGES-8.3:1.1.2.221 --- src/doc/CHANGES-8.3:1.1.2.220 Fri Feb 23 18:18:35 2024 +++ src/doc/CHANGES-8.3 Thu Feb 29 10:47:52 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.220 2024/02/23 18:18:35 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.221 2024/02/29 10:47:52 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4280,3 +4280,15 @@ tests/lib/libm/t_fenv.c1.14,1.15 libm: PR 57949: fix spurious side effects in fetestexcept. [riastradh, ticket #1937] +sys/dev/pci/if_wm.c 1.792,1.794-1.798 via patch +sys/dev/pci/if_wmreg.h 1.131 + + - Add RQDPC(Receive Queue Drop Packet Count) to iqdrops. + - Drop frames if the RX descriptor ring has no room on multiqueue + system. + - Improve dmesg output. + - Print RX packet buffer size. + - Fix the upper 16bit of Image Unique ID(EtrackID). + - Fix comment. + [msaitoh, ticket #1938] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Feb 29 10:47:52 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1938 To generate a diff of this commit: cvs rdiff -u -r1.1.2.220 -r1.1.2.221 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Feb 29 10:46:28 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h Log Message: Pull up the following, requested by msaitoh in ticket #1938: sys/dev/pci/if_wm.c 1.792,1.794-1.798 via patch sys/dev/pci/if_wmreg.h 1.131 - Add RQDPC(Receive Queue Drop Packet Count) to iqdrops. - Drop frames if the RX descriptor ring has no room on multiqueue system. - Improve dmesg output. - Print RX packet buffer size. - Fix the upper 16bit of Image Unique ID(EtrackID). - Fix comment. To generate a diff of this commit: cvs rdiff -u -r1.508.4.54 -r1.508.4.55 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.98.6.18 -r1.98.6.19 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Feb 29 10:46:28 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h
Log Message:
Pull up the following, requested by msaitoh in ticket #1938:
sys/dev/pci/if_wm.c 1.792,1.794-1.798 via patch
sys/dev/pci/if_wmreg.h 1.131
- Add RQDPC(Receive Queue Drop Packet Count) to iqdrops.
- Drop frames if the RX descriptor ring has no room on multiqueue system.
- Improve dmesg output.
- Print RX packet buffer size.
- Fix the upper 16bit of Image Unique ID(EtrackID).
- Fix comment.
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.54 -r1.508.4.55 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.98.6.18 -r1.98.6.19 src/sys/dev/pci/if_wmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.54 src/sys/dev/pci/if_wm.c:1.508.4.55
--- src/sys/dev/pci/if_wm.c:1.508.4.54 Sat Feb 3 12:04:06 2024
+++ src/sys/dev/pci/if_wm.c Thu Feb 29 10:46:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.54 2024/02/03 12:04:06 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.55 2024/02/29 10:46:27 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.54 2024/02/03 12:04:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.55 2024/02/29 10:46:27 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -469,9 +469,9 @@ struct wm_rxqueue {
/* RX event counters */
WM_Q_EVCNT_DEFINE(rxq, intr); /* Interrupts */
WM_Q_EVCNT_DEFINE(rxq, defer); /* Rx deferred processing */
-
WM_Q_EVCNT_DEFINE(rxq, ipsum); /* IP checksums checked */
WM_Q_EVCNT_DEFINE(rxq, tusum); /* TCP/UDP cksums checked */
+ WM_Q_EVCNT_DEFINE(rxq, qdrop); /* Rx queue drop packet */
#endif
};
@@ -2693,6 +2693,10 @@ alloc_retry:
/* Reset the chip to a known state. */
wm_reset(sc);
+ /* sc->sc_pba is set in wm_reset(). */
+ aprint_verbose_dev(sc->sc_dev, "RX packet buffer size: %uKB\n",
+ sc->sc_pba);
+
/*
* Check for I21[01] PLL workaround.
*
@@ -6526,6 +6530,7 @@ wm_update_stats(struct wm_softc *sc)
struct ifnet *ifp = >sc_ethercom.ec_if;
uint64_t crcerrs, algnerrc, symerrc, mpc, colc, sec, rlec, rxerrc,
cexterr;
+ uint64_t total_qdrop = 0;
crcerrs = CSR_READ(sc, WMREG_CRCERRS);
symerrc = CSR_READ(sc, WMREG_SYMERRC);
@@ -6674,6 +6679,22 @@ wm_update_stats(struct wm_softc *sc)
WM_EVCNT_ADD(>sc_ev_lenerrs, CSR_READ(sc, WMREG_LENERRS));
WM_EVCNT_ADD(>sc_ev_scvpc, CSR_READ(sc, WMREG_SCVPC));
WM_EVCNT_ADD(>sc_ev_hrmpc, CSR_READ(sc, WMREG_HRMPC));
+#ifdef WM_EVENT_COUNTERS
+ for (int i = 0; i < sc->sc_nqueues; i++) {
+ struct wm_rxqueue *rxq = >sc_queue[i].wmq_rxq;
+ uint32_t rqdpc;
+
+ rqdpc = CSR_READ(sc, WMREG_RQDPC(i));
+ /*
+ * On I210 and newer device, the RQDPC register is not
+ * cleard on read.
+ */
+ if ((rqdpc != 0) && (sc->sc_type >= WM_T_I210))
+CSR_WRITE(sc, WMREG_RQDPC(i), 0);
+ WM_Q_EVCNT_ADD(rxq, qdrop, rqdpc);
+ total_qdrop += rqdpc;
+ }
+#endif
}
if ((sc->sc_type >= WM_T_I350) && !WM_IS_ICHPCH(sc)) {
WM_EVCNT_ADD(>sc_ev_tlpic, CSR_READ(sc, WMREG_TLPIC));
@@ -6702,7 +6723,7 @@ wm_update_stats(struct wm_softc *sc)
* If you want to know the nubmer of WMREG_RMBC, you should use such as
* own EVCNT instead of if_iqdrops.
*/
- ifp->if_iqdrops += mpc;
+ ifp->if_iqdrops += mpc + total_qdrop;
}
void
@@ -6719,6 +6740,8 @@ wm_clear_evcnt(struct wm_softc *sc)
WM_Q_EVCNT_STORE(rxq, defer, 0);
WM_Q_EVCNT_STORE(rxq, ipsum, 0);
WM_Q_EVCNT_STORE(rxq, tusum, 0);
+ if ((sc->sc_type >= WM_T_82575) && !WM_IS_ICHPCH(sc))
+ WM_Q_EVCNT_STORE(rxq, qdrop, 0);
}
/* TX queues */
@@ -8052,9 +8075,10 @@ wm_alloc_txrx_queues(struct wm_softc *sc
WM_Q_INTR_EVCNT_ATTACH(rxq, intr, rxq, i, xname);
WM_Q_INTR_EVCNT_ATTACH(rxq, defer, rxq, i, xname);
-
WM_Q_MISC_EVCNT_ATTACH(rxq, ipsum, rxq, i, xname);
WM_Q_MISC_EVCNT_ATTACH(rxq, tusum, rxq, i, xname);
+ if ((sc->sc_type >= WM_T_82575) && !WM_IS_ICHPCH(sc))
+ WM_Q_MISC_EVCNT_ATTACH(rxq, qdrop, rxq, i, xname);
#endif /* WM_EVENT_COUNTERS */
rx_done++;
@@ -8117,6 +8141,8 @@ wm_free_txrx_queues(struct wm_softc *sc)
WM_Q_EVCNT_DETACH(rxq, defer, rxq, i);
WM_Q_EVCNT_DETACH(rxq, ipsum, rxq, i);
WM_Q_EVCNT_DETACH(rxq, tusum, rxq, i);
+ if ((sc->sc_type >= WM_T_82575) && !WM_IS_ICHPCH(sc))
+ WM_Q_EVCNT_DETACH(rxq, qdrop, rxq, i);
#endif /* WM_EVENT_COUNTERS */
wm_free_rx_buffer(sc, rxq);
@@ -8306,6 +8332,8 @@ wm_init_rx_regs(struct wm_softc *sc, str
rxq->rxq_descsize * rxq->rxq_ndesc);
if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
+ uint32_t srrctl;
+
if (MCLBYTES & ((1 << SRRCTL_BSIZEPKT_SHIFT) - 1))
panic("%s: MCLBYTES %d unsupported for
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Feb 23 18:18:35 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1937 To generate a diff of this commit: cvs rdiff -u -r1.1.2.219 -r1.1.2.220 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.219 src/doc/CHANGES-8.3:1.1.2.220 --- src/doc/CHANGES-8.3:1.1.2.219 Sat Feb 17 16:14:05 2024 +++ src/doc/CHANGES-8.3 Fri Feb 23 18:18:35 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.219 2024/02/17 16:14:05 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.220 2024/02/23 18:18:35 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4274,3 +4274,9 @@ libexec/utmp_update/utmp_update.c 1.14 utmp_update(8): check for non-printable characters in ut_host. [shm, ticket #1936] +lib/libm/arch/x86_64/fenv.c 1.11 +tests/lib/libm/t_fenv.c1.14,1.15 + + libm: PR 57949: fix spurious side effects in fetestexcept. + [riastradh, ticket #1937] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Feb 23 18:18:35 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1937 To generate a diff of this commit: cvs rdiff -u -r1.1.2.219 -r1.1.2.220 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Fri Feb 23 18:15:53 UTC 2024
Modified Files:
src/lib/libm/arch/x86_64 [netbsd-8]: fenv.c
src/tests/lib/libm [netbsd-8]: t_fenv.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1937):
tests/lib/libm/t_fenv.c: revision 1.14
tests/lib/libm/t_fenv.c: revision 1.15
lib/libm/arch/x86_64/fenv.c: revision 1.11
fenv(3): Add test for PR port-amd64/57949.
fenv(3): Fix fetestexcept to avoid side effects on trap state.
PR port-amd64/57949
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/lib/libm/arch/x86_64/fenv.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/tests/lib/libm/t_fenv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/arch/x86_64/fenv.c
diff -u src/lib/libm/arch/x86_64/fenv.c:1.7 src/lib/libm/arch/x86_64/fenv.c:1.7.4.1
--- src/lib/libm/arch/x86_64/fenv.c:1.7 Wed Mar 22 23:11:09 2017
+++ src/lib/libm/arch/x86_64/fenv.c Fri Feb 23 18:15:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.c,v 1.7 2017/03/22 23:11:09 chs Exp $ */
+/* $NetBSD: fenv.c,v 1.7.4.1 2024/02/23 18:15:53 martin Exp $ */
/*-
* Copyright (c) 2004-2005 David Schultz
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: fenv.c,v 1.7 2017/03/22 23:11:09 chs Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.7.4.1 2024/02/23 18:15:53 martin Exp $");
#include "namespace.h"
@@ -259,7 +259,6 @@ fesetexceptflag(const fexcept_t *flagp,
int
fetestexcept(int excepts)
{
- fenv_t fenv;
uint32_t mxcsr;
uint16_t status;
int ex;
@@ -268,17 +267,10 @@ fetestexcept(int excepts)
ex = excepts & FE_ALL_EXCEPT;
- /* Store the current x87 floating-point environment */
- memset(, 0, sizeof(fenv));
-
- __fnstenv();
__fnstsw();
-
- /* Store the MXCSR register state */
- __stmxcsr();
__stmxcsr();
- return ((fenv.x87.status | fenv.mxcsr) & ex);
+ return ((status | mxcsr) & ex);
}
/*
Index: src/tests/lib/libm/t_fenv.c
diff -u src/tests/lib/libm/t_fenv.c:1.3 src/tests/lib/libm/t_fenv.c:1.3.8.1
--- src/tests/lib/libm/t_fenv.c:1.3 Tue Dec 22 14:20:59 2015
+++ src/tests/lib/libm/t_fenv.c Fri Feb 23 18:15:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fenv.c,v 1.3 2015/12/22 14:20:59 christos Exp $ */
+/* $NetBSD: t_fenv.c,v 1.3.8.1 2024/02/23 18:15:53 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_fenv.c,v 1.3 2015/12/22 14:20:59 christos Exp $");
+__RCSID("$NetBSD: t_fenv.c,v 1.3.8.1 2024/02/23 18:15:53 martin Exp $");
#include
@@ -185,12 +185,40 @@ ATF_TC_BODY(feenableexcept, tc)
ATF_CHECK(fpgetmask() == FP_X_INV);
}
+ATF_TC(fetestexcept_trap);
+ATF_TC_HEAD(fetestexcept_trap, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify fetestexcept doesn't affect the trapped excpetions");
+}
+ATF_TC_BODY(fetestexcept_trap, tc)
+{
+ int except;
+
+ fedisableexcept(FE_ALL_EXCEPT);
+ ATF_CHECK_EQ_MSG((except = fegetexcept()), 0,
+ "fegetexcept()=0x%x", except);
+
+ (void)fetestexcept(FE_ALL_EXCEPT);
+ ATF_CHECK_EQ_MSG((except = fegetexcept()), 0,
+ "fegetexcept()=0x%x", except);
+
+ feenableexcept(FE_ALL_EXCEPT);
+ ATF_CHECK_EQ_MSG((except = fegetexcept()), FE_ALL_EXCEPT,
+ "fegetexcept()=0x%x FE_ALL_EXCEPT=0x%x", except, FE_ALL_EXCEPT);
+
+ (void)fetestexcept(FE_ALL_EXCEPT);
+ ATF_CHECK_EQ_MSG((except = fegetexcept()), FE_ALL_EXCEPT,
+ "fegetexcept()=0x%x FE_ALL_EXCEPT=0x%x", except, FE_ALL_EXCEPT);
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, fegetround);
ATF_TP_ADD_TC(tp, fesetround);
ATF_TP_ADD_TC(tp, fegetexcept);
ATF_TP_ADD_TC(tp, feenableexcept);
+ ATF_TP_ADD_TC(tp, fetestexcept_trap);
return atf_no_error();
}
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Fri Feb 23 18:15:53 UTC 2024 Modified Files: src/lib/libm/arch/x86_64 [netbsd-8]: fenv.c src/tests/lib/libm [netbsd-8]: t_fenv.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1937): tests/lib/libm/t_fenv.c: revision 1.14 tests/lib/libm/t_fenv.c: revision 1.15 lib/libm/arch/x86_64/fenv.c: revision 1.11 fenv(3): Add test for PR port-amd64/57949. fenv(3): Fix fetestexcept to avoid side effects on trap state. PR port-amd64/57949 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/lib/libm/arch/x86_64/fenv.c cvs rdiff -u -r1.3 -r1.3.8.1 src/tests/lib/libm/t_fenv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Feb 17 16:14:05 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1935 and #1936 To generate a diff of this commit: cvs rdiff -u -r1.1.2.218 -r1.1.2.219 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.218 src/doc/CHANGES-8.3:1.1.2.219 --- src/doc/CHANGES-8.3:1.1.2.218 Sat Feb 3 14:28:16 2024 +++ src/doc/CHANGES-8.3 Sat Feb 17 16:14:05 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.218 2024/02/03 14:28:16 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.219 2024/02/17 16:14:05 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4246,3 +4246,31 @@ sys/dev/hdaudio/hdafg.c1.29 hdaudio(4): PR 57890: fix crash on shutdown with record-only devices. [riastradh, ticket #1934] +external/public-domain/tz/dist/Makefile up to 1.1.1.38 +external/public-domain/tz/dist/NEWS up to 1.1.1.45 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.37 +external/public-domain/tz/dist/africa up to 1.1.1.33 +external/public-domain/tz/dist/asia up to 1.12 +external/public-domain/tz/dist/australasia up to 1.9 +external/public-domain/tz/dist/checknow.awk up to 1.1.1.2 +external/public-domain/tz/dist/etcetera up to 1.1.1.8 +external/public-domain/tz/dist/europe up to 1.1.1.39 +external/public-domain/tz/dist/leap-seconds.list up to 1.7 +external/public-domain/tz/dist/leapseconds up to 1.7 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.14 +external/public-domain/tz/dist/northamerica up to 1.1.1.35 +external/public-domain/tz/dist/southamerica up to 1.1.1.25 +external/public-domain/tz/dist/theory.html up to 1.1.1.19 +external/public-domain/tz/dist/version up to 1.12 +external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9 +external/public-domain/tz/dist/zonenow.tab up to 1.1.1.2 +doc/3RDPARTY apply patch + + Updated tzdata to 2024a. + [kre, ticket #1935] + +libexec/utmp_update/utmp_update.c 1.14 + + utmp_update(8): check for non-printable characters in ut_host. + [shm, ticket #1936] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Feb 17 16:14:05 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1935 and #1936 To generate a diff of this commit: cvs rdiff -u -r1.1.2.218 -r1.1.2.219 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/libexec/utmp_update
Module Name:src
Committed By: martin
Date: Sat Feb 17 16:11:46 UTC 2024
Modified Files:
src/libexec/utmp_update [netbsd-8]: utmp_update.c
Log Message:
Pull up following revision(s) (requested by shm in ticket #1936):
libexec/utmp_update/utmp_update.c: revision 1.14
Check for non-printable characters in ut_host.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.8.1 src/libexec/utmp_update/utmp_update.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/utmp_update/utmp_update.c
diff -u src/libexec/utmp_update/utmp_update.c:1.13 src/libexec/utmp_update/utmp_update.c:1.13.8.1
--- src/libexec/utmp_update/utmp_update.c:1.13 Sun Apr 26 08:56:19 2015
+++ src/libexec/utmp_update/utmp_update.c Sat Feb 17 16:11:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $ */
+/* $NetBSD: utmp_update.c,v 1.13.8.1 2024/02/17 16:11:46 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $");
+__RCSID("$NetBSD: utmp_update.c,v 1.13.8.1 2024/02/17 16:11:46 martin Exp $");
#include
#include
@@ -41,6 +41,7 @@ __RCSID("$NetBSD: utmp_update.c,v 1.13 2
#include
#include
#include
+#include
#include
#include
#include
@@ -80,6 +81,7 @@ main(int argc, char *argv[])
int res;
uid_t euid, ruid;
char tty[MAXPATHLEN];
+ const char *p, *ep;
euid = geteuid();
ruid = getuid();
@@ -115,6 +117,12 @@ main(int argc, char *argv[])
logerr(0, "Invalid utmpx type %d", (int)utx->ut_type);
}
+ p = utx->ut_host;
+ ep = p + sizeof(utx->ut_host);
+ for (; p < ep && *p; p++)
+ if (!isprint((unsigned char)*p))
+ logerr(0, "Non-printable characters in hostname");
+
if (ruid != 0) {
if ((pwd = getpwuid(ruid)) == NULL)
logerr(0, "User %ld does not exist in password"
CVS commit: [netbsd-8] src/libexec/utmp_update
Module Name:src Committed By: martin Date: Sat Feb 17 16:11:46 UTC 2024 Modified Files: src/libexec/utmp_update [netbsd-8]: utmp_update.c Log Message: Pull up following revision(s) (requested by shm in ticket #1936): libexec/utmp_update/utmp_update.c: revision 1.14 Check for non-printable characters in ut_host. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.8.1 src/libexec/utmp_update/utmp_update.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Sat Feb 17 15:55:09 UTC 2024 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-8]: Makefile NEWS TZDATA_VERSION africa asia australasia checknow.awk etcetera europe leap-seconds.list leapseconds leapseconds.awk northamerica southamerica theory.html version zishrink.awk zonenow.tab Log Message: Pull up the following, requested by kre in ticket #1935: external/public-domain/tz/dist/Makefile up to 1.1.1.38 external/public-domain/tz/dist/NEWS up to 1.1.1.45 external/public-domain/tz/dist/TZDATA_VERSION up to 1.37 external/public-domain/tz/dist/africa up to 1.1.1.33 external/public-domain/tz/dist/asia up to 1.12 external/public-domain/tz/dist/australasia up to 1.9 external/public-domain/tz/dist/checknow.awk up to 1.1.1.2 external/public-domain/tz/dist/etcetera up to 1.1.1.8 external/public-domain/tz/dist/europe up to 1.1.1.39 external/public-domain/tz/dist/leap-seconds.list up to 1.7 external/public-domain/tz/dist/leapseconds up to 1.7 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.14 external/public-domain/tz/dist/northamerica up to 1.1.1.35 external/public-domain/tz/dist/southamerica up to 1.1.1.25 external/public-domain/tz/dist/theory.html up to 1.1.1.19 external/public-domain/tz/dist/version up to 1.12 external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9 external/public-domain/tz/dist/zonenow.tab up to 1.1.1.2 doc/3RDPARTYapply patch Updated tzdata to 2024a To generate a diff of this commit: cvs rdiff -u -r1.1444.2.28 -r1.1444.2.29 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.17.4.10 -r1.1.1.17.4.11 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.18.4.11 -r1.1.1.18.4.12 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.8.4.11 -r1.8.4.12 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.11.4.11 -r1.1.1.11.4.12 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.16.4.10 -r1.1.1.16.4.11 \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.11.4.10 -r1.1.1.11.4.11 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.1.6.2 -r1.1.1.1.6.3 \ src/external/public-domain/tz/dist/checknow.awk \ src/external/public-domain/tz/dist/zonenow.tab cvs rdiff -u -r1.1.1.2.6.5 -r1.1.1.2.6.6 \ src/external/public-domain/tz/dist/etcetera cvs rdiff -u -r1.1.1.7.4.7 -r1.1.1.7.4.8 \ src/external/public-domain/tz/dist/leap-seconds.list cvs rdiff -u -r1.1.1.8.4.8 -r1.1.1.8.4.9 \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.5.8.6 -r1.1.1.5.8.7 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.11.4.7 -r1.1.1.11.4.8 \ src/external/public-domain/tz/dist/southamerica cvs rdiff -u -r1.1.1.1.2.12 -r1.1.1.1.2.13 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.5.4.11 -r1.1.1.5.4.12 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \ src/external/public-domain/tz/dist/zishrink.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1444.2.28 src/doc/3RDPARTY:1.1444.2.29 --- src/doc/3RDPARTY:1.1444.2.28 Sat Dec 30 19:00:31 2023 +++ src/doc/3RDPARTY Sat Feb 17 15:55:08 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1444.2.28 2023/12/30 19:00:31 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1444.2.29 2024/02/17 15:55:08 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1411,8 +1411,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2017b / tzdata2023dgtz -Current Vers: tzcode2023d / tzdata2023d +Version: tzcode2017b / tzdata2024agtz +Current Vers: tzcode2024a / tzdata2024a Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/external/public-domain/tz/dist/Makefile diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.10 src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.11 --- src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.10 Sat Dec 30 19:00:32 2023 +++ src/external/public-domain/tz/dist/Makefile Sat Feb 17 15:55:08 2024 @@ -53,7 +53,7 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of POSIX-like TZ +# The POSIXRULES macro controls interpretation of
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Sat Feb 17 15:55:09 UTC 2024 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-8]: Makefile NEWS TZDATA_VERSION africa asia australasia checknow.awk etcetera europe leap-seconds.list leapseconds leapseconds.awk northamerica southamerica theory.html version zishrink.awk zonenow.tab Log Message: Pull up the following, requested by kre in ticket #1935: external/public-domain/tz/dist/Makefile up to 1.1.1.38 external/public-domain/tz/dist/NEWS up to 1.1.1.45 external/public-domain/tz/dist/TZDATA_VERSION up to 1.37 external/public-domain/tz/dist/africa up to 1.1.1.33 external/public-domain/tz/dist/asia up to 1.12 external/public-domain/tz/dist/australasia up to 1.9 external/public-domain/tz/dist/checknow.awk up to 1.1.1.2 external/public-domain/tz/dist/etcetera up to 1.1.1.8 external/public-domain/tz/dist/europe up to 1.1.1.39 external/public-domain/tz/dist/leap-seconds.list up to 1.7 external/public-domain/tz/dist/leapseconds up to 1.7 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.14 external/public-domain/tz/dist/northamerica up to 1.1.1.35 external/public-domain/tz/dist/southamerica up to 1.1.1.25 external/public-domain/tz/dist/theory.html up to 1.1.1.19 external/public-domain/tz/dist/version up to 1.12 external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9 external/public-domain/tz/dist/zonenow.tab up to 1.1.1.2 doc/3RDPARTYapply patch Updated tzdata to 2024a To generate a diff of this commit: cvs rdiff -u -r1.1444.2.28 -r1.1444.2.29 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.17.4.10 -r1.1.1.17.4.11 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.18.4.11 -r1.1.1.18.4.12 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.8.4.11 -r1.8.4.12 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.11.4.11 -r1.1.1.11.4.12 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.16.4.10 -r1.1.1.16.4.11 \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.11.4.10 -r1.1.1.11.4.11 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.1.6.2 -r1.1.1.1.6.3 \ src/external/public-domain/tz/dist/checknow.awk \ src/external/public-domain/tz/dist/zonenow.tab cvs rdiff -u -r1.1.1.2.6.5 -r1.1.1.2.6.6 \ src/external/public-domain/tz/dist/etcetera cvs rdiff -u -r1.1.1.7.4.7 -r1.1.1.7.4.8 \ src/external/public-domain/tz/dist/leap-seconds.list cvs rdiff -u -r1.1.1.8.4.8 -r1.1.1.8.4.9 \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.5.8.6 -r1.1.1.5.8.7 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.11.4.7 -r1.1.1.11.4.8 \ src/external/public-domain/tz/dist/southamerica cvs rdiff -u -r1.1.1.1.2.12 -r1.1.1.1.2.13 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.5.4.11 -r1.1.1.5.4.12 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \ src/external/public-domain/tz/dist/zishrink.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Feb 3 14:28:16 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1931 - #1934 To generate a diff of this commit: cvs rdiff -u -r1.1.2.217 -r1.1.2.218 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src
Committed By: martin
Date: Sat Feb 3 14:28:16 UTC 2024
Modified Files:
src/doc [netbsd-8]: CHANGES-8.3
Log Message:
Tickets #1931 - #1934
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.217 -r1.1.2.218 src/doc/CHANGES-8.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.217 src/doc/CHANGES-8.3:1.1.2.218
--- src/doc/CHANGES-8.3:1.1.2.217 Sun Jan 14 15:36:10 2024
+++ src/doc/CHANGES-8.3 Sat Feb 3 14:28:16 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-8.3,v 1.1.2.217 2024/01/14 15:36:10 martin Exp $
+$NetBSD: CHANGES-8.3,v 1.1.2.218 2024/02/03 14:28:16 martin Exp $
A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
release:
@@ -4192,3 +4192,57 @@ external/bsd/iscsi/dist/src/lib/protocol
logout decap.
[riastradh, ticket #1930]
+sys/dev/pci/pcidevs1.1477,1.1494,1.1498-1.1502
+sys/dev/pci/pcidevs.h(regen)
+sys/dev/pci/pcidevs_data.h (regen)
+
+ - Add EXAR XR17V354 PCIe UART.
+ - Add Mellanox ConnectX-6 Lx.
+ - Add some newer Areca boards.
+ - Update Intel Raptor Lake devices.
+ - Add Intel C26[26] eSPI.
+ - Add Intel I219-LM20, LM21, V20 and V21.
+ - Add Intel I225/I226 series devices.
+ [msaitoh, ticket #1931]
+
+sys/dev/pci/if_wm.c1.793
+
+ wm(4): add Intel I219-{LM,V}(20,21) support.
+ [msaitoh, ticket #1932]
+
+sys/dev/pci/ixgbe/ix_txrx.c 1.105-1.116 via patch
+sys/dev/pci/ixgbe/ixgbe.c 1.345-1.346,1.349 via patch
+sys/dev/pci/ixgbe/ixgbe.h 1.94-1.98
+sys/dev/pci/ixgbe/ixgbe_type.h 1.62
+sys/dev/pci/ixgbe/ixv.c1.193,1.195-1.196
+
+ - Clear the WTHRESH bit field before writing it.
+ - Optimize ixgbe_txeof().
+ - Use kmem_zalloc() instead of malloc(,M_ZERO).
+ - Add QPRDC(Queue Packet Receive Drop Count) into iqdrops.
+ - No functional change
+ - Move assignment of TXD.
+ - ixv(4): Remove unused IFF_OACTIVE.
+ - Don't include the Flow Director related members to reduce the
+ size of struct tx_ring. On amd64 and aarch64, the real size is
+ not changed because of the alignment.
+ - The descriptor ring size and the alignment are tested in the
+ attach function, so it's not required to use
+ roundup2(size, DBA_ALIGN).
+ - Use #ifdef LRO more to reduce the size of struct rx_ring.
+ - Change "me" from 32bit to 8bit because the max is 128.
+ This commit doesn't change the real size of ix_queue, tx_ring
+ and rx_ring because of the alignment.
+ - Th RSC (hardware receive side coalescing) feature has been
+ disabled all along, so enclose the code with #ifdef RSC.
+ - Remove unused.
+ - Modify for the readability.
+ - Modify comment.
+ - Fix comment. Whitespace.
+ [msaitoh, ticket #1933]
+
+sys/dev/hdaudio/hdafg.c1.29
+
+ hdaudio(4): PR 57890: fix crash on shutdown with record-only devices.
+ [riastradh, ticket #1934]
+
CVS commit: [netbsd-8] src/sys/dev/hdaudio
Module Name:src
Committed By: martin
Date: Sat Feb 3 14:27:05 UTC 2024
Modified Files:
src/sys/dev/hdaudio [netbsd-8]: hdafg.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1934):
sys/dev/hdaudio/hdafg.c: revision 1.29
ignore NULL for hdaudio_audiodev in hdafg_freem
also guard against NULL in ad_{capture,playback}
observed during shutdown on Lenovo W510
To generate a diff of this commit:
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/dev/hdaudio/hdafg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hdaudio/hdafg.c
diff -u src/sys/dev/hdaudio/hdafg.c:1.12.2.2 src/sys/dev/hdaudio/hdafg.c:1.12.2.3
--- src/sys/dev/hdaudio/hdafg.c:1.12.2.2 Tue Oct 9 10:09:51 2018
+++ src/sys/dev/hdaudio/hdafg.c Sat Feb 3 14:27:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.12.2.2 2018/10/09 10:09:51 martin Exp $ */
+/* $NetBSD: hdafg.c,v 1.12.2.3 2024/02/03 14:27:05 martin Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.12.2.2 2018/10/09 10:09:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.12.2.3 2024/02/03 14:27:05 martin Exp $");
#include
#include
@@ -4224,9 +4224,12 @@ hdafg_freem(void *opaque, void *addr, si
struct hdaudio_audiodev *ad = opaque;
struct hdaudio_stream *st;
- if (addr == DMA_KERNADDR(>ad_playback->st_data))
+ if (ad == NULL)
+ return;
+
+ if (ad->ad_playback != NULL && addr == DMA_KERNADDR(>ad_playback->st_data))
st = ad->ad_playback;
- else if (addr == DMA_KERNADDR(>ad_capture->st_data))
+ else if (ad->ad_capture != NULL && addr == DMA_KERNADDR(>ad_capture->st_data))
st = ad->ad_capture;
else
return;
CVS commit: [netbsd-8] src/sys/dev/hdaudio
Module Name:src
Committed By: martin
Date: Sat Feb 3 14:27:05 UTC 2024
Modified Files:
src/sys/dev/hdaudio [netbsd-8]: hdafg.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1934):
sys/dev/hdaudio/hdafg.c: revision 1.29
ignore NULL for hdaudio_audiodev in hdafg_freem
also guard against NULL in ad_{capture,playback}
observed during shutdown on Lenovo W510
To generate a diff of this commit:
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/dev/hdaudio/hdafg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sat Feb 3 12:17:03 UTC 2024
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_type.h ixv.c
Log Message:
Pull up the following, requested by msaitoh in ticket #1933:
sys/dev/pci/ixgbe/ix_txrx.c 1.105-1.116 via patch
sys/dev/pci/ixgbe/ixgbe.c 1.345-1.346,1.349 via
patch
sys/dev/pci/ixgbe/ixgbe.h 1.94-1.98
sys/dev/pci/ixgbe/ixgbe_type.h 1.62
sys/dev/pci/ixgbe/ixv.c 1.193,1.195-1.196
- Clear the WTHRESH bit field before writing it.
- Optimize ixgbe_txeof().
- Use kmem_zalloc() instead of malloc(,M_ZERO).
- Add QPRDC(Queue Packet Receive Drop Count) into iqdrops.
- No functional change
- Move assignment of TXD.
- ixv(4): Remove unused IFF_OACTIVE.
- Don't include the Flow Director related members to reduce the
size of struct tx_ring. On amd64 and aarch64, the real size is
not changed because of the alignment.
- The descriptor ring size and the alignment are tested in the
attach function, so it's not required to use
roundup2(size, DBA_ALIGN).
- Use #ifdef LRO more to reduce the size of struct rx_ring.
- Change "me" from 32bit to 8bit because the max is 128.
This commit doesn't change the real size of ix_queue, tx_ring
and rx_ring because of the alignment.
- Th RSC (hardware receive side coalescing) feature has been
disabled all along, so enclose the code with #ifdef RSC.
- Remove unused.
- Modify for the readability.
- Modify comment.
- Fix comment. Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.30 -r1.24.2.31 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.88.2.58 -r1.88.2.59 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.24.6.29 -r1.24.6.30 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.22.2.21 -r1.22.2.22 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.56.2.43 -r1.56.2.44 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.30 src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.31
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.30 Wed Oct 18 14:23:15 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Sat Feb 3 12:17:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.24.2.30 2023/10/18 14:23:15 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.24.2.31 2024/02/03 12:17:03 martin Exp $ */
/**
@@ -64,13 +64,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.24.2.30 2023/10/18 14:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.24.2.31 2024/02/03 12:17:03 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
#include "ixgbe.h"
+#ifdef RSC
/*
* HW RSC control:
* this feature only works with
@@ -84,7 +85,9 @@ __KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v
* to enable.
*/
static bool ixgbe_rsc_enable = FALSE;
+#endif
+#ifdef IXGBE_FDIR
/*
* For Flow Director: this is the
* number of TX packets we sample
@@ -95,6 +98,7 @@ static bool ixgbe_rsc_enable = FALSE;
* setting this to 0.
*/
static int atr_sample_rate = 20;
+#endif
#define IXGBE_M_ADJ(sc, rxr, mp) \
if (sc->max_frame_size <= (rxr->mbuf_sz - ETHER_ALIGN)) \
@@ -122,8 +126,9 @@ static __inline void ixgbe_rx_input(stru
static int ixgbe_dma_malloc(struct ixgbe_softc *, bus_size_t,
struct ixgbe_dma_alloc *, int);
static void ixgbe_dma_free(struct ixgbe_softc *, struct ixgbe_dma_alloc *);
-
-static void ixgbe_setup_hw_rsc(struct rx_ring *);
+#ifdef RSC
+static void ixgbe_setup_hw_rsc(struct rx_ring *);
+#endif
/
* ixgbe_legacy_start_locked - Transmit entry point
@@ -406,7 +411,7 @@ ixgbe_drain_all(struct ixgbe_softc *sc)
static int
ixgbe_xmit(struct tx_ring *txr, struct mbuf *m_head)
{
- struct ixgbe_softc *sc = txr->sc;
+ struct ixgbe_softc *sc = txr->sc;
struct ixgbe_tx_buf *txbuf;
union ixgbe_adv_tx_desc *txd = NULL;
struct ifnet *ifp = sc->ifp;
@@ -487,8 +492,8 @@ retry:
}
/*
- * Set up the appropriate offload context
- * this will consume the first descriptor
+ * Set up the appropriate offload context if requested,
+ * this may consume one TX descriptor.
*/
error = ixgbe_tx_ctx_setup(txr, m_head, _type_len, _status);
if (__predict_false(error)) {
@@ -625,14 +630,8 @@ ixgbe_allocate_transmit_buffers(struct t
goto fail;
}
- txr->tx_buffers =
- (struct ixgbe_tx_buf *) malloc(sizeof(struct ixgbe_tx_buf) *
- sc->num_tx_desc, M_DEVBUF, M_NOWAIT | M_ZERO);
- if (txr->tx_buffers == NULL) {
- aprint_error_dev(dev, "Unable
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Sat Feb 3 12:17:03 UTC 2024 Modified Files: src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h ixgbe_type.h ixv.c Log Message: Pull up the following, requested by msaitoh in ticket #1933: sys/dev/pci/ixgbe/ix_txrx.c 1.105-1.116 via patch sys/dev/pci/ixgbe/ixgbe.c 1.345-1.346,1.349 via patch sys/dev/pci/ixgbe/ixgbe.h 1.94-1.98 sys/dev/pci/ixgbe/ixgbe_type.h 1.62 sys/dev/pci/ixgbe/ixv.c 1.193,1.195-1.196 - Clear the WTHRESH bit field before writing it. - Optimize ixgbe_txeof(). - Use kmem_zalloc() instead of malloc(,M_ZERO). - Add QPRDC(Queue Packet Receive Drop Count) into iqdrops. - No functional change - Move assignment of TXD. - ixv(4): Remove unused IFF_OACTIVE. - Don't include the Flow Director related members to reduce the size of struct tx_ring. On amd64 and aarch64, the real size is not changed because of the alignment. - The descriptor ring size and the alignment are tested in the attach function, so it's not required to use roundup2(size, DBA_ALIGN). - Use #ifdef LRO more to reduce the size of struct rx_ring. - Change "me" from 32bit to 8bit because the max is 128. This commit doesn't change the real size of ix_queue, tx_ring and rx_ring because of the alignment. - Th RSC (hardware receive side coalescing) feature has been disabled all along, so enclose the code with #ifdef RSC. - Remove unused. - Modify for the readability. - Modify comment. - Fix comment. Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.24.2.30 -r1.24.2.31 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.88.2.58 -r1.88.2.59 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.24.6.29 -r1.24.6.30 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.22.2.21 -r1.22.2.22 src/sys/dev/pci/ixgbe/ixgbe_type.h cvs rdiff -u -r1.56.2.43 -r1.56.2.44 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Feb 3 12:04:07 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1932):
sys/dev/pci/if_wm.c: revision 1.793
Add Intel I219-{LM,V}(20,21) support.
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.53 -r1.508.4.54 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.53 src/sys/dev/pci/if_wm.c:1.508.4.54
--- src/sys/dev/pci/if_wm.c:1.508.4.53 Wed Oct 18 14:41:54 2023
+++ src/sys/dev/pci/if_wm.c Sat Feb 3 12:04:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.53 2023/10/18 14:41:54 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.54 2024/02/03 12:04:06 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.53 2023/10/18 14:41:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.54 2024/02/03 12:04:06 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1732,6 +1732,12 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM19,
"I219 LM (19) Ethernet Connection",
WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM20,
+ "I219 LM (20) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM21,
+ "I219 LM (21) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM22,
"I219 LM (22) Ethernet Connection",
WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP(RPL) */
@@ -1792,6 +1798,12 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V19,
"I219 V (19) Ethernet Connection",
WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V20,
+ "I219 V (20) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V21,
+ "I219 V (21) Ethernet Connection",
+ WM_T_PCH_TGP, WMP_F_COPPER }, /* MTP */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V22,
"I219 V (22) Ethernet Connection",
WM_T_PCH_TGP, WMP_F_COPPER }, /* ADP(RPL) */
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Feb 3 12:04:07 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1932):
sys/dev/pci/if_wm.c: revision 1.793
Add Intel I219-{LM,V}(20,21) support.
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.53 -r1.508.4.54 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Feb 3 11:32:33 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen (ticket #1931) To generate a diff of this commit: cvs rdiff -u -r1.1281.2.30 -r1.1281.2.31 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.30 -r1.1280.2.31 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Feb 3 11:32:33 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen (ticket #1931) To generate a diff of this commit: cvs rdiff -u -r1.1281.2.30 -r1.1281.2.31 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.30 -r1.1280.2.31 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Feb 3 11:30:32 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-8]: pcidevs
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1931):
sys/dev/pci/pcidevs: revision 1.1477
sys/dev/pci/pcidevs: revision 1.1494
sys/dev/pci/pcidevs: revision 1.1498
sys/dev/pci/pcidevs: revision 1.1499
sys/dev/pci/pcidevs: revision 1.1500
sys/dev/pci/pcidevs: revision 1.1501
sys/dev/pci/pcidevs: revision 1.1502
Add ID for the EXAR XR17V354 PCIe UART.
>From Hakan Engvall.
PR kern/57202
pcidevs: Add missing I225/I226 series devices
pcidevs: Add Mellanox ConnectX-6 Lx.
add some newer Areca boards in prep for updating driver
Add Intel C26[26] eSPI.
Update Intel Raptor Lake devices.
Add Intel I219-{LM,V}(20,21)
To generate a diff of this commit:
cvs rdiff -u -r1.1289.2.30 -r1.1289.2.31 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1289.2.30 src/sys/dev/pci/pcidevs:1.1289.2.31
--- src/sys/dev/pci/pcidevs:1.1289.2.30 Wed Oct 18 14:41:55 2023
+++ src/sys/dev/pci/pcidevs Sat Feb 3 11:30:32 2024
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289.2.30 2023/10/18 14:41:55 martin Exp $
+$NetBSD: pcidevs,v 1.1289.2.31 2024/02/03 11:30:32 martin Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1488,6 +1488,7 @@ product ARECA ARC1170 0x1170 ARC-1170
product ARECA ARC1200 0x1200 ARC-1200
product ARECA ARC1200_B 0x1201 ARC-1200 rev B
product ARECA ARC1202 0x1202 ARC-1202
+product ARECA ARC1203 0x1203 ARC-1203
product ARECA ARC1210 0x1210 ARC-1210
product ARECA ARC1214 0x1214 ARC-1214
product ARECA ARC1220 0x1220 ARC-1220
@@ -1500,6 +1501,8 @@ product ARECA ARC1381 0x1381 ARC-1381
product ARECA ARC1680 0x1680 ARC-1680
product ARECA ARC1681 0x1681 ARC-1681
product ARECA ARC1880 0x1880 ARC-1880
+product ARECA ARC1884 0x1884 ARC-1884
+product ARECA ARC1886 0x1886 ARC-1886
/* ASIX Electronics products */
product ASIX AX88140A 0x1400 AX88140A 10/100 Ethernet
@@ -3225,6 +3228,7 @@ product ES FREEDOM 0x0001 Freedom PCI-GB
product EXAR XR17D152 0x0152 dual-channel Universal PCI UART
product EXAR XR17D154 0x0154 quad-channel Universal PCI UART
product EXAR XR17D158 0x0158 octal-channel Universal PCI UART
+product EXAR XR17V354 0x0354 quad-channel Universal PCIe UART
/* FORE products */
product FORE PCA200 0x0210 ATM PCA-200
@@ -3932,6 +3936,7 @@ product INTEL I219_LM11 0x0d4c I219-LM
product INTEL I219_V11 0x0d4d I219-V (11) Ethernet Connection
product INTEL I219_LM10 0x0d4e I219-LM (10) Ethernet Connection
product INTEL I219_V10 0x0d4f I219-V (10) Ethernet Connection
+product INTEL I225_IT 0x0d9f I225-IT Ethernet Connection
product INTEL I219_LM12 0x0d53 I219-LM (12) Ethernet Connection
product INTEL I219_V12 0x0d55 I219-V (12) Ethernet Connection
product INTEL I219_LM23 0x0dc5 I219-LM (23) Ethernet Connection
@@ -4252,6 +4257,8 @@ product INTEL 82439HX 0x1250 82439HX (T
product INTEL I226_LM 0x125b I226-LM Ethernet
product INTEL I226_V 0x125c I226-V Ethernet
product INTEL I226_IT 0x125d I226-IT Ethernet
+product INTEL I221_V 0x125e I221-V Ethernet Connection
+product INTEL I226_BLANK_NVM 0x125f I226 Ethernet Connection (blankNVM)
product INTEL C3K_X553_10G 0x1306 C3000 X553 10G Ethernet
product INTEL C3K_X553_1G 0x1307 C3000 X553 1G Ethernet
product INTEL 82870P2_PPB 0x1460 82870P2 P64H2 PCI-PCI Bridge
@@ -4378,9 +4385,12 @@ product INTEL C3K_X553_SGMII 0x15e4 C300
product INTEL C3K_X553_SGMII_L 0x15e5 C3000 X553 1GbE SGMII (non-10G SKU)
product INTEL I225_LM 0x15f2 I225 LM Ethernet
product INTEL I225_V 0x15f3 I225 V Ethernet
+product INTEL I220_V 0x15f7 I220-V Ethernet Connection
+product INTEL I225_BLANK_NVM 0x15fd I225 Ethernet Connection (blankNVM)
product INTEL I219_LM15 0x15f4 I219-LM (15) Ethernet Connection
product INTEL I219_V15 0x15f5 I219-V (15) Ethernet Connection
product INTEL I210_SGMII_WOF 0x15f6 I210 Ethernet (SGMII)
+product INTEL I225_I 0x15f8 I225-I Ethernet Connection
product INTEL I219_LM14 0x15f9 I219-LM (14) Ethernet Connection
product INTEL I219_V14 0x15fa I219-V (14) Ethernet Connection
product INTEL I219_LM13 0x15fb I219-LM (13) Ethernet Connection
@@ -5413,6 +5423,9 @@ product INTEL XE5_V3_BRA4 0x2ffb Xeon E
product INTEL XE5_V3_SADBR1 0x2ffc Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
product INTEL XE5_V3_SADBR2 0x2ffd Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
product INTEL XE5_V3_SADBR3 0x2ffe Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+product INTEL I225_K 0x3100 I225-K Ethernet Connection
+product INTEL I225_K2 0x3101 I225-K2 Ethernet Connection
+product INTEL I226_K 0x3102 I226-K Ethernet
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Feb 3 11:30:32 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-8]: pcidevs
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1931):
sys/dev/pci/pcidevs: revision 1.1477
sys/dev/pci/pcidevs: revision 1.1494
sys/dev/pci/pcidevs: revision 1.1498
sys/dev/pci/pcidevs: revision 1.1499
sys/dev/pci/pcidevs: revision 1.1500
sys/dev/pci/pcidevs: revision 1.1501
sys/dev/pci/pcidevs: revision 1.1502
Add ID for the EXAR XR17V354 PCIe UART.
>From Hakan Engvall.
PR kern/57202
pcidevs: Add missing I225/I226 series devices
pcidevs: Add Mellanox ConnectX-6 Lx.
add some newer Areca boards in prep for updating driver
Add Intel C26[26] eSPI.
Update Intel Raptor Lake devices.
Add Intel I219-{LM,V}(20,21)
To generate a diff of this commit:
cvs rdiff -u -r1.1289.2.30 -r1.1289.2.31 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Jan 14 15:36:10 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1930 To generate a diff of this commit: cvs rdiff -u -r1.1.2.216 -r1.1.2.217 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.216 src/doc/CHANGES-8.3:1.1.2.217 --- src/doc/CHANGES-8.3:1.1.2.216 Mon Jan 1 11:40:17 2024 +++ src/doc/CHANGES-8.3 Sun Jan 14 15:36:10 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.216 2024/01/01 11:40:17 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.217 2024/01/14 15:36:10 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4186,3 +4186,9 @@ sys/conf/copyright1.22 Update copyright notice for 2024. [hgutch, ticket #1929] +external/bsd/iscsi/dist/src/lib/protocol.c 1.5 + + libiscsi: PR 57784: fix types of Time2Wait and Time2Retain in + logout decap. + [riastradh, ticket #1930] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Jan 14 15:36:10 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1930 To generate a diff of this commit: cvs rdiff -u -r1.1.2.216 -r1.1.2.217 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:34:58 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-8]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1930): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.24.1 src/external/bsd/iscsi/dist/src/lib/protocol.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/iscsi/dist/src/lib/protocol.c diff -u src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4.24.1 --- src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 Sat Sep 29 07:18:21 2012 +++ src/external/bsd/iscsi/dist/src/lib/protocol.c Sun Jan 14 15:34:58 2024 @@ -920,8 +920,8 @@ iscsi_logout_rsp_decap(uint8_t *header, rsp->StatSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 24))); /* StatSN */ rsp->ExpCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 28))); /* ExpCmdSN */ rsp->MaxCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 32))); /* MaxCmdSN */ - rsp->Time2Wait = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 40))); /* Time2Wait */ - rsp->Time2Retain = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 42))); /* Time2Retain */ + rsp->Time2Wait = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 40))); /* Time2Wait */ + rsp->Time2Retain = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 42))); /* Time2Retain */ errmsg = NULL; (void) memset(zeros, 0x0, sizeof(zeros));
CVS commit: [netbsd-8] src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:34:58 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-8]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1930): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.24.1 src/external/bsd/iscsi/dist/src/lib/protocol.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jan 1 11:40:17 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1929 To generate a diff of this commit: cvs rdiff -u -r1.1.2.215 -r1.1.2.216 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.215 src/doc/CHANGES-8.3:1.1.2.216 --- src/doc/CHANGES-8.3:1.1.2.215 Sat Dec 30 19:19:01 2023 +++ src/doc/CHANGES-8.3 Mon Jan 1 11:40:17 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.215 2023/12/30 19:19:01 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.216 2024/01/01 11:40:17 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4180,3 +4180,9 @@ doc/3RDPARTY (apply patch) Update tzdata to tzdata2023dgtz. [kre, ticket #1928] + +sys/conf/copyright1.22 + + Update copyright notice for 2024. + [hgutch, ticket #1929] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jan 1 11:40:17 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1929 To generate a diff of this commit: cvs rdiff -u -r1.1.2.215 -r1.1.2.216 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:39:25 UTC 2024 Modified Files: src/sys/conf [netbsd-8]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #1929): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.15.8.5 -r1.15.8.6 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.15.8.5 src/sys/conf/copyright:1.15.8.6 --- src/sys/conf/copyright:1.15.8.5 Tue Jan 3 16:41:52 2023 +++ src/sys/conf/copyright Mon Jan 1 11:39:25 2024 @@ -1,6 +1,6 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, -2018, 2019, 2020, 2021, 2022, 2023 +2018, 2019, 2020, 2021, 2022, 2023, 2024 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: [netbsd-8] src/sys/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:39:25 UTC 2024 Modified Files: src/sys/conf [netbsd-8]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #1929): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.15.8.5 -r1.15.8.6 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
