CVS commit: src/share/man/man4
Module Name:src Committed By: riastradh Date: Tue Mar 12 02:28:03 UTC 2024 Modified Files: src/share/man/man4: wg.4 Log Message: wg(4): Rework example numbering for clarity and add IPv6. Let's avoid triggering unease with host number 0. PR misc/58015 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/wg.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/wg.4 diff -u src/share/man/man4/wg.4:1.7 src/share/man/man4/wg.4:1.8 --- src/share/man/man4/wg.4:1.7 Sat Mar 9 12:36:07 2024 +++ src/share/man/man4/wg.4 Tue Mar 12 02:28:03 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: wg.4,v 1.7 2024/03/09 12:36:07 riastradh Exp $ +.\" $NetBSD: wg.4,v 1.8 2024/03/12 02:28:03 riastradh Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -75,21 +75,23 @@ endpoint IP address outside the tunnel. .Sh EXAMPLES Typical network topology: .Bd -literal -offset abcd -wm0 = 192.0.2.123 bge0 = 198.51.100.45 - Stationary server: Roaming client: +-++-+ |A||B| |-||-| -|[wm0]-internet[bge0]| +| | 192.0.2.123 198.51.100.45 | | +|[wm0]--internet---[bge0]| |[wg0] port 1234 - - - (tunnel) - - - - - - [wg0]| -| 10.0.1.0 | 10.0.1.1 | +| 10.2.0.1 | 10.2.0.42 | +| fd00:2::0 | fd00:2::42 | | | || | +--[wm1]--+ +-+ +-+ - | | VPN 10.0.1.0/24 | + | 10.1.0.1 | VPN 10.2.0.0/24 | + | | fd00:2::/64 | | +-+ +-+ -| LAN 10.0.0.0/24 | +| LAN 10.1.0.0/24 | +| fd00:1::/64 | +-+ .Ed .Pp @@ -114,40 +116,52 @@ A# (umask 0077; wg-keygen > /etc/wg/wg0. .Ed .Pp Configure A to listen on port 1234 and allow connections from B to -appear in the 10.0.1.0/24 subnet: +appear in the 10.2.0.0/24 and fd00:2::/64 subnets: .Bd -literal -offset abcd -A# ifconfig wg0 create 10.0.1.0/24 +A# ifconfig wg0 create +A# ifconfig wg0 inet 10.2.0.1/24 +A# ifconfig wg0 inet6 fd00:2::1/64 A# wgconfig wg0 set private-key /etc/wg/wg0 A# wgconfig wg0 set listen-port 1234 A# wgconfig wg0 add peer B \e X7EGm3T3IfodBcyilkaC89j0SH3XD6+/pwvp7Dgp5SU= \e --preshared-key=/etc/wg/wg0.A-B \e ---allowed-ips=10.0.1.1/32 +--allowed-ips=10.2.0.42/32,fd00:2::42/128 A# ifconfig wg0 up A# ifconfig wg0 wg0: flags=0x8041 mtu 1420 -inet 10.0.1.0/24 flags 0 +status: active inet6 fe80::22f7:d6ff:fe3a:1e60%wg0/64 flags 0 scopeid 0x3 +inet6 fd00:2::1/64 flags 0 +inet 10.2.0.1/24 flags 0 .Ed .Pp Configure B to connect to A at 192.0.2.123 on port 1234 and the packets can begin to flow: .Bd -literal -offset abcd -B# ifconfig wg0 create 10.0.1.1/24 +B# ifconfig wg0 create +B# ifconfig wg0 inet 10.2.0.42/24 +B# ifconfig wg0 inet6 fd00:2::42/64 B# wgconfig wg0 set private-key /etc/wg/wg0 B# wgconfig wg0 add peer A \e N+B4Nelg+4ysvbLW3qenxIwrJVE9MdjMyqrIisH7V0Y= \e --preshared-key=/etc/wg/wg0.A-B \e ---allowed-ips=10.0.1.0/32 \e +--allowed-ips=10.2.0.1/32,fd00:2::1/128 \e --endpoint=192.0.2.123:1234 B# ifconfig wg0 up B# ifconfig wg0 wg0: flags=0x8041 mtu 1420 -inet 10.0.1.1/24 flags 0 +status: active inet6 fe80::56eb:59ff:fe3d:d413%wg0/64 flags 0 scopeid 0x3 -B# ping -n 10.0.1.0 -PING 10.0.1.0 (10.0.1.0): 56 data bytes -64 bytes from 10.0.1.0: icmp_seq=0 ttl=255 time=2.721110 ms +inet6 fd00:2::42/64 flags 0 +inet 10.2.0.42/24 flags 0 +B# ping -n 10.2.0.1 +PING 10.2.0.1 (10.2.0.1): 56 data bytes +64 bytes from 10.2.0.1: icmp_seq=0 ttl=255 time=2.721110 ms +\&... +B# ping6 -n fd00:2::1 +PING6(56=40+8+8 bytes) fd00:2::42 --> fd00:2::1 +16 bytes from fd00:2::1, icmp_seq=0 hlim=64 time=2.634 ms \&... .Ed .\"
CVS commit: src/share/man/man4
Module Name:src Committed By: riastradh Date: Tue Mar 12 02:28:03 UTC 2024 Modified Files: src/share/man/man4: wg.4 Log Message: wg(4): Rework example numbering for clarity and add IPv6. Let's avoid triggering unease with host number 0. PR misc/58015 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/wg.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: gutteridge
Date: Tue Mar 12 02:26:16 UTC 2024
Modified Files:
src/sys/arch/x86/x86: coretemp.c
Log Message:
coretemp.c: don't accept impossibly low TjMax values
r. 1.39 introduced a regression where instead of applying a reasonable
default maximum (as was done prior to that change), incorrect values
were accepted and applied, as failures to retrieve an expected MSR
value weren't accounted for.
Apply different logic for unexpectedly low vs. high maximums, with
distinct warnings for each. Also add another warning about a retrieval
failure right at the outset (which also just uses the default, then).
This change fundamentally doesn't address the fact that
__SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT)
doesn't necessarily return a valid value. It just restores prior
behaviour, which is more reasonable than applying a zero value, which
started happening on some older hardware. (I infer this is most likely
an issue with dated generations of Intel hardware with this feature.)
The challenge is that this evidently isn't all documented properly
anywhere. Various "magic values" in this driver need further
investigation.
While here, also fix output so warnings are cleanly formatted, rather
than the slightly scrambled way they were appearing.
Tested on older Intel hardware I had on hand:
E7500 (now falls back to default 100 rather than 0)
E5540 (successfully retrieves 97, as before)
i5-3340M (successfully retrieves 105, as before)
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/x86/coretemp.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/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.40 src/sys/arch/x86/x86/coretemp.c:1.41
--- src/sys/arch/x86/x86/coretemp.c:1.40 Thu Feb 29 01:59:11 2024
+++ src/sys/arch/x86/x86/coretemp.c Tue Mar 12 02:26:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.40 2024/02/29 01:59:11 gutteridge Exp $ */
+/* $NetBSD: coretemp.c,v 1.41 2024/03/12 02:26:16 gutteridge Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.40 2024/02/29 01:59:11 gutteridge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.41 2024/03/12 02:26:16 gutteridge Exp $");
#include
#include
@@ -110,7 +110,7 @@ static int coretemp_match(device_t, cfda
static void coretemp_attach(device_t, device_t, void *);
static int coretemp_detach(device_t, int);
static int coretemp_quirks(struct cpu_info *);
-static void coretemp_tjmax(device_t);
+static int coretemp_tjmax(device_t);
static void coretemp_refresh(struct sysmon_envsys *, envsys_data_t *);
static void coretemp_refresh_xcall(void *, void *);
@@ -194,9 +194,10 @@ coretemp_attach(device_t parent, device_
if (sysmon_envsys_register(sc->sc_sme) != 0)
goto fail;
- coretemp_tjmax(self);
- aprint_verbose(", Tjmax=%d", sc->sc_tjmax);
- aprint_normal("\n");
+ if (coretemp_tjmax(self) == 0) {
+ aprint_verbose(", Tjmax=%d", sc->sc_tjmax);
+ aprint_normal("\n");
+ }
return;
fail:
@@ -258,7 +259,7 @@ coretemp_quirks(struct cpu_info *ci)
return 1;
}
-void
+static int
coretemp_tjmax(device_t self)
{
struct coretemp_softc *sc = device_private(self);
@@ -288,17 +289,19 @@ coretemp_tjmax(device_t self)
if ((model < 0x17) && ((msr & __BIT(28)) == 0))
goto notee;
- if (rdmsr_safe(MSR_IA32_EXT_CONFIG, ) == EFAULT)
- return;
+ if (rdmsr_safe(MSR_IA32_EXT_CONFIG, ) == EFAULT) {
+ aprint_normal("\n");
+ aprint_error_dev(sc->sc_dev,
+ "Failed to read MSR_IA32_EXT_CONFIG MSR. "
+ "Using default (%d)\n", sc->sc_tjmax);
+ return 1;
+ }
- if ((msr & __BIT(30)) != 0) {
+ if ((msr & __BIT(30)) != 0)
sc->sc_tjmax = 85;
- return;
- }
} else if (model == 0x17 && stepping == 0x06) {
/* The mobile Penryn family. */
sc->sc_tjmax = 105;
- return;
} else if (model == 0x1c) {
if (stepping == 0x0a) {
/* 45nm Atom D400, N400 and D500 series */
@@ -307,21 +310,39 @@ coretemp_tjmax(device_t self)
sc->sc_tjmax = 90;
} else {
notee:
- /* Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET. */
+ /*
+ * Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET.
+ * It is not fully known which CPU models have the MSR.
+ */
if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT) {
+ aprint_normal("\n");
aprint_error_dev(sc->sc_dev,
"Failed to read TEMPERATURE_TARGET MSR. "
- "Use the default (%d)\n", sc->sc_tjmax);
- return;
+ "Using default (%d)\n", sc->sc_tjmax);
+ return 1;
}
tjmax = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
- if ((tjmax < TJMAX_LIMIT_LOW) || (tjmax > TJMAX_LIMIT_HIGH))
+ if (tjmax < TJMAX_LIMIT_LOW) {
+ aprint_normal("\n");
+ aprint_error_dev(sc->sc_dev,
+ "WARNING: Tjmax(%d) retrieved was below expected range, "
+"using default (%d).\n", tjmax,
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: gutteridge Date: Tue Mar 12 02:26:16 UTC 2024 Modified Files: src/sys/arch/x86/x86: coretemp.c Log Message: coretemp.c: don't accept impossibly low TjMax values r. 1.39 introduced a regression where instead of applying a reasonable default maximum (as was done prior to that change), incorrect values were accepted and applied, as failures to retrieve an expected MSR value weren't accounted for. Apply different logic for unexpectedly low vs. high maximums, with distinct warnings for each. Also add another warning about a retrieval failure right at the outset (which also just uses the default, then). This change fundamentally doesn't address the fact that __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT) doesn't necessarily return a valid value. It just restores prior behaviour, which is more reasonable than applying a zero value, which started happening on some older hardware. (I infer this is most likely an issue with dated generations of Intel hardware with this feature.) The challenge is that this evidently isn't all documented properly anywhere. Various "magic values" in this driver need further investigation. While here, also fix output so warnings are cleanly formatted, rather than the slightly scrambled way they were appearing. Tested on older Intel hardware I had on hand: E7500 (now falls back to default 100 rather than 0) E5540 (successfully retrieves 97, as before) i5-3340M (successfully retrieves 105, as before) To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/x86/coretemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/audio/common
Module Name:src
Committed By: mrg
Date: Tue Mar 12 00:34:38 UTC 2024
Modified Files:
src/usr.bin/audio/common: wav.c
Log Message:
audioplay(1): handle mis-aligned RIFF chunks.
put the code to find RIFF chunks into a new find_riff_chunk() function,
and handle mis-aligned chunk lengths. can now play files with chunks
that say they are 7 bytes long, and have 1 byte padding.
add some -V -V extra-verbose for the wav parser.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 src/usr.bin/audio/common/wav.c:1.22
--- src/usr.bin/audio/common/wav.c:1.21 Mon Mar 11 23:12:29 2024
+++ src/usr.bin/audio/common/wav.c Tue Mar 12 00:34:38 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wav.c,v 1.21 2024/03/11 23:12:29 mrg Exp $ */
+/* $NetBSD: wav.c,v 1.22 2024/03/12 00:34:38 mrg 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.21 2024/03/11 23:12:29 mrg Exp $");
+__RCSID("$NetBSD: wav.c,v 1.22 2024/03/12 00:34:38 mrg Exp $");
#endif
@@ -90,6 +90,49 @@ wav_enc_from_val(int encoding)
/*
* WAV format helpers
*/
+
+static bool
+find_riff_chunk(const char search[4], size_t *remainp, char **wherep, uint32_t *partlen)
+{
+ wav_audioheaderpart part;
+
+ *partlen = 0;
+
+#define ADJUST(l) do {\
+ if (l >= *(remainp)) \
+ return false; \
+ *(wherep) += (l); \
+ *(remainp) -= (l); \
+} while (0)
+
+ while (*remainp >= sizeof part) {
+ const char *emsg = "";
+ uint32_t len;
+
+ memcpy(, *wherep, sizeof part);
+ ADJUST(sizeof part);
+ len = getle32(part.len);
+ if (len % 2) {
+ emsg = " (odd length, adjusted)";
+ len += 1;
+ }
+ if (strncmp(part.name, search, sizeof *search) == 0) {
+ *partlen = len;
+ if (verbose > 1)
+fprintf(stderr, "Found part %.04s length %d%s\n",
+part.name, len, emsg);
+ return true;
+ }
+ ADJUST(len);
+ if (verbose > 1)
+ fprintf(stderr, "Skipping part %.04s length %d%s\n",
+ part.name, len, emsg);
+ }
+#undef ADJUST
+
+ return false;
+}
+
/*
* find a .wav header, etc. returns header length on success
*/
@@ -98,7 +141,6 @@ audio_wav_parse_hdr(void *hdr, size_t sz
u_int *sample, u_int *channels, off_t *datasize)
{
char *where = hdr;
- wav_audioheaderpart part;
wav_audioheaderfmt fmt;
wav_audiohdrextensible ext;
size_t remain = sz;
@@ -131,17 +173,7 @@ audio_wav_parse_hdr(void *hdr, size_t sz
return (AUDIO_ENOENT);
ADJUST(sizeof strWAVE);
- found = false;
- while (remain >= sizeof part) {
- memcpy(, where, sizeof part);
- ADJUST(sizeof part);
- len = getle32(part.len);
- if (strncmp(part.name, strfmt, sizeof strfmt) == 0) {
- found = true;
- break;
- }
- ADJUST(len);
- }
+ found = find_riff_chunk(strfmt, , , );
/* too short ? */
if (!found || remain <= sizeof fmt)
@@ -243,20 +275,9 @@ audio_wav_parse_hdr(void *hdr, size_t sz
break;
}
- found = false;
- while (remain >= sizeof part) {
- memcpy(, where, sizeof part);
- ADJUST(sizeof part);
- len = getle32(part.len);
- if (strncmp(part.name, strdata, sizeof strdata) == 0) {
- found = true;
- break;
- }
- /* Adjust len here only for non-data parts. */
- ADJUST(len);
- }
+ found = find_riff_chunk(strdata, , , );
if (!found)
- return (AUDIO_ENOENT);
+ return (AUDIO_EWAVNODATA);
if (len) {
if (channels)
CVS commit: src/usr.bin/audio/common
Module Name:src Committed By: mrg Date: Tue Mar 12 00:34:38 UTC 2024 Modified Files: src/usr.bin/audio/common: wav.c Log Message: audioplay(1): handle mis-aligned RIFF chunks. put the code to find RIFF chunks into a new find_riff_chunk() function, and handle mis-aligned chunk lengths. can now play files with chunks that say they are 7 bytes long, and have 1 byte padding. add some -V -V extra-verbose for the wav parser. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 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: src/usr.bin/audio/common
Module Name:src
Committed By: mrg
Date: Mon Mar 11 23:12:29 UTC 2024
Modified Files:
src/usr.bin/audio/common: wav.c
Log Message:
minor clean up in the RIFF/WAVE header checking.
use memcmp() not strncmp() to check for "RIFF" and "WAVE".
avoid endian convesion on part.len 3 times.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/usr.bin/audio/common/wav.c:1.21
--- src/usr.bin/audio/common/wav.c:1.20 Mon Mar 11 19:17:52 2024
+++ src/usr.bin/audio/common/wav.c Mon Mar 11 23:12:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wav.c,v 1.20 2024/03/11 19:17:52 mrg Exp $ */
+/* $NetBSD: wav.c,v 1.21 2024/03/11 23:12:29 mrg 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.20 2024/03/11 19:17:52 mrg Exp $");
+__RCSID("$NetBSD: wav.c,v 1.21 2024/03/11 23:12:29 mrg Exp $");
#endif
@@ -122,12 +122,14 @@ audio_wav_parse_hdr(void *hdr, size_t sz
remain -= (l);\
} while (0)
- if (strncmp(where, strRIFF, sizeof strRIFF) != 0)
- return (AUDIO_ENOENT);
- ADJUST(8);
- if (strncmp(where, strWAVE, sizeof strWAVE) != 0)
+ if (memcmp(where, strRIFF, sizeof strRIFF) != 0)
return (AUDIO_ENOENT);
+ ADJUST(sizeof strRIFF);
+ /* XXX we ignore the RIFF length here */
ADJUST(4);
+ if (memcmp(where, strWAVE, sizeof strWAVE) != 0)
+ return (AUDIO_ENOENT);
+ ADJUST(sizeof strWAVE);
found = false;
while (remain >= sizeof part) {
@@ -245,18 +247,18 @@ audio_wav_parse_hdr(void *hdr, size_t sz
while (remain >= sizeof part) {
memcpy(, where, sizeof part);
ADJUST(sizeof part);
+ len = getle32(part.len);
if (strncmp(part.name, strdata, sizeof strdata) == 0) {
found = true;
break;
}
/* Adjust len here only for non-data parts. */
- len = getle32(part.len);
ADJUST(len);
}
if (!found)
return (AUDIO_ENOENT);
- if (getle32(part.len)) {
+ if (len) {
if (channels)
*channels = (u_int)getle16(fmt.channels);
if (sample)
@@ -266,7 +268,7 @@ audio_wav_parse_hdr(void *hdr, size_t sz
if (prec)
*prec = newprec;
if (datasize)
- *datasize = (off_t)getle32(part.len);
+ *datasize = (off_t)len;
return (where - (char *)hdr);
}
return (AUDIO_EWAVNODATA);
CVS commit: src/usr.bin/audio/common
Module Name:src Committed By: mrg Date: Mon Mar 11 23:12:29 UTC 2024 Modified Files: src/usr.bin/audio/common: wav.c Log Message: minor clean up in the RIFF/WAVE header checking. use memcmp() not strncmp() to check for "RIFF" and "WAVE". avoid endian convesion on part.len 3 times. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 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: src/lib/libc/arch/sparc64/gen
Module Name:src Committed By: christos Date: Mon Mar 11 23:05:35 UTC 2024 Modified Files: src/lib/libc/arch/sparc64/gen: fpsetround.c Log Message: fix lint To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/sparc64/gen/fpsetround.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/sparc64/gen
Module Name:src
Committed By: christos
Date: Mon Mar 11 23:05:35 UTC 2024
Modified Files:
src/lib/libc/arch/sparc64/gen: fpsetround.c
Log Message:
fix lint
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/sparc64/gen/fpsetround.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/arch/sparc64/gen/fpsetround.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetround.c:1.7 src/lib/libc/arch/sparc64/gen/fpsetround.c:1.8
--- src/lib/libc/arch/sparc64/gen/fpsetround.c:1.7 Sun Oct 27 21:06:36 2013
+++ src/lib/libc/arch/sparc64/gen/fpsetround.c Mon Mar 11 19:05:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.7 2013/10/28 01:06:36 mrg Exp $ */
+/* $NetBSD: fpsetround.c,v 1.8 2024/03/11 23:05:35 christos Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.7 2013/10/28 01:06:36 mrg Exp $");
+__RCSID("$NetBSD: fpsetround.c,v 1.8 2024/03/11 23:05:35 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -19,14 +19,15 @@ __RCSID("$NetBSD: fpsetround.c,v 1.7 201
__weak_alias(fpsetround,_fpsetround)
#endif
+#ifdef SOFTFLOATSPARC64_FOR_GCC
+extern fp_rnd _softfloat_float_rounding_mode;
+#endif
+
fp_rnd
fpsetround(fp_rnd rnd_dir)
{
fp_rnd old;
fp_rnd new;
-#ifdef SOFTFLOATSPARC64_FOR_GCC
- extern fp_rnd _softfloat_float_rounding_mode;
-#endif
__asm("st %%fsr,%0" : "=m" (*));
@@ -35,7 +36,7 @@ fpsetround(fp_rnd rnd_dir)
#endif
new = old;
- new &= ~(0x03 << 30);
+ new &= ~(0x03U << 30);
new |= ((rnd_dir & 0x03) << 30);
__asm("ld %0,%%fsr" : : "m" (*));
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Mon Mar 11 23:03:35 UTC 2024 Modified Files: src/lib/libc/time: localtime.c Log Message: add casts for compat code where time_t is 32 bits. To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/lib/libc/time/localtime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Mon Mar 11 23:03:35 UTC 2024
Modified Files:
src/lib/libc/time: localtime.c
Log Message:
add casts for compat code where time_t is 32 bits.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/lib/libc/time/localtime.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/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.142 src/lib/libc/time/localtime.c:1.143
--- src/lib/libc/time/localtime.c:1.142 Thu Mar 7 15:42:04 2024
+++ src/lib/libc/time/localtime.c Mon Mar 11 19:03:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.142 2024/03/07 20:42:04 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.143 2024/03/11 23:03:35 christos Exp $ */
/* Convert timestamp from time_t to struct tm. */
@@ -12,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.142 2024/03/07 20:42:04 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.143 2024/03/11 23:03:35 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -1871,7 +1871,7 @@ timesub(const time_t *timep, int_fast32_
for localtime values before 1970 when time_t is unsigned. */
dayrem = (int)(tdays % DAYSPERREPEAT);
dayrem += dayoff % DAYSPERREPEAT;
- y = (EPOCH_YEAR - YEARSPERREPEAT
+ y = (time_t)(EPOCH_YEAR - YEARSPERREPEAT
+ ((1 + dayoff / DAYSPERREPEAT + dayrem / DAYSPERREPEAT
- ((dayrem % DAYSPERREPEAT) < 0)
+ tdays / DAYSPERREPEAT)
@@ -1884,7 +1884,7 @@ timesub(const time_t *timep, int_fast32_
while (year_lengths[isleap(y)] <= idays) {
int_fast32_t tdelta = idays / DAYSPERLYEAR;
int_fast32_t ydelta = tdelta + !tdelta;
- time_t newy = y + ydelta;
+ time_t newy = (time_t)(y + ydelta);
register int leapdays;
leapdays = (int)(leaps_thru_end_of(newy - 1) -
leaps_thru_end_of(y - 1));
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: riastradh
Date: Mon Mar 11 21:10:46 UTC 2024
Modified Files:
src/sys/dev/ic: nvme.c
Log Message:
nvme(4): Disestablish admin q interrupt while suspended.
And re-establish on resume. Fixes nvmectl(8) after a suspend/resume
cycle on some systems.
Adapted from a patch by mrg@.
PR kern/58025
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/nvme.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/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.68 src/sys/dev/ic/nvme.c:1.69
--- src/sys/dev/ic/nvme.c:1.68 Sun Mar 10 04:49:22 2024
+++ src/sys/dev/ic/nvme.c Mon Mar 11 21:10:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.68 2024/03/10 04:49:22 mrg Exp $ */
+/* $NetBSD: nvme.c,v 1.69 2024/03/11 21:10:46 riastradh Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.68 2024/03/10 04:49:22 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.69 2024/03/11 21:10:46 riastradh Exp $");
#include
#include
@@ -575,7 +575,6 @@ nvme_detach(struct nvme_softc *sc, int f
return error;
/* from now on we are committed to detach, following will never fail */
- sc->sc_intr_disestablish(sc, NVME_ADMIN_Q);
for (i = 0; i < sc->sc_nq; i++)
nvme_q_free(sc, sc->sc_q[i]);
kmem_free(sc->sc_q, sizeof(*sc->sc_q) * sc->sc_nq);
@@ -603,6 +602,11 @@ nvme_resume(struct nvme_softc *sc)
}
nvme_q_reset(sc, sc->sc_admin_q);
+ if (sc->sc_intr_establish(sc, NVME_ADMIN_Q, sc->sc_admin_q)) {
+ error = EIO;
+ device_printf(sc->sc_dev, "unable to establish admin q\n");
+ goto disable;
+ }
error = nvme_enable(sc, ffs(sc->sc_mps) - 1);
if (error) {
@@ -651,6 +655,8 @@ nvme_shutdown(struct nvme_softc *sc)
if (disabled)
goto disable;
+ sc->sc_intr_disestablish(sc, NVME_ADMIN_Q);
+
cc = nvme_read4(sc, NVME_CC);
CLR(cc, NVME_CC_SHN_MASK);
SET(cc, NVME_CC_SHN(NVME_CC_SHN_NORMAL));
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riastradh Date: Mon Mar 11 21:10:46 UTC 2024 Modified Files: src/sys/dev/ic: nvme.c Log Message: nvme(4): Disestablish admin q interrupt while suspended. And re-establish on resume. Fixes nvmectl(8) after a suspend/resume cycle on some systems. Adapted from a patch by mrg@. PR kern/58025 To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/nvme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Mar 11 20:11:22 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #620 - #622, #624 - #632 To generate a diff of this commit: cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.209 src/doc/CHANGES-10.0:1.1.2.210 --- src/doc/CHANGES-10.0:1.1.2.209 Sun Mar 10 19:21:05 2024 +++ src/doc/CHANGES-10.0 Mon Mar 11 20:11:22 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.209 2024/03/10 19:21:05 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.210 2024/03/11 20:11:22 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -21313,3 +21313,102 @@ sys/netinet6/in6.c1.292 a router advertisement processed by dhcpcd. [riastradh, ticket #619] +external/mpl/mozilla-certdata/dist/certdata.txt up to 1.1.1.2 +distrib/sets/lists/base/mi 1.1334 +doc/3RDPARTY 1.1982,1.1994 +external/mpl/mozilla-certdata/share/Makefile 1.4 +external/mpl/mozilla-certdata/share/certdata.awk 1.3 +external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem delete +external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem 1.2 +external/mpl/mozilla-certdata/share/certs/Chambers_of_Commerce_Root_-_2008.pem delete +external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-01.pem 1.1 +external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-02.pem 1.1 +external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-01.pem 1.1 +external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-02.pem 1.1 +external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_1_2022.pem 1.1 +external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_2_2022.pem 1.1 +external/mpl/mozilla-certdata/share/certs/Global_Chambersign_Root_-_2008.pem delete +external/mpl/mozilla-certdata/share/certs/Security_Communication_Root_CA.pem delete +external/mpl/mozilla-certdata/share/certs/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem delete +external/mpl/mozilla-certdata/share/certs/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem delete +external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_ECC_Root_2021.pem 1.1 +external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_RSA_Root_2023.pem 1.1 +external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_ECC_Root_2020.pem 1.1 +external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_RSA_Root_2023.pem 1.1 +external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G3.pem 1.1 +external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G4.pem 1.1 +external/mpl/mozilla-certdata/share/certs/TrustCor_ECA-1.pem delete +external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-1.pem delete +external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-2.pem delete +external/mpl/mozilla-certdata/share/certs/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem delete +external/mpl/mozilla-certdata/share/certs/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem delete +external/mpl/mozilla-certdata/share/email.trust 1.2 +external/mpl/mozilla-certdata/share/server.trust 1.2 + + mozilla-certdata: PR 57984: update to 2024-02-12. + [riastradh, ticket #620] + +usr.sbin/certctl/certctl.sh 1.6 + + certctl(8): PR 57993: speed up a little by avoiding basename(1). + [riastradh, ticket #621] + +etc/named.conf 1.11 +external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h 1.11 +usr.sbin/postinstall/postinstall.in 1.59-1.61 + + named(8): fix bus errors on alignement critical architectures. + Update the default named.conf for the new version. + postinstall(8): add support to upgrade the named(8) configuration. + [christos, ticket #622] + +usr.sbin/wgconfig/wgconfig.8 1.11 + + wgconfig(8): PR 57663: fix typo in option name in the man page. + [riastradh, ticket #624] + +usr.sbin/certctl/certctl.sh 1.7 + + certctl(8): PR 57997: avoid non-POSIX `if' syntax by always + using a non-empty compound list. + [riastradh, ticket #625] + +sys/kern/sysv_shm.c1.142 + + sysv_shm: PR 57979: avoid arithmetic overflow when computing + kern.ipc.shmmax. + [riastradh, ticket #626] + +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 #627] + +sys/net/if_wg.c 1.78 + + wg(4): PR 58021: fix psref crash in rump. + [riastradh, ticket #628] + +share/man/man4/wg.41.7 + + wg(4): PR 58015: spruce up example. + [riastradh, ticket #629] + +lib/libc/gen/getcap.c1.58 + + libc: fix memory leak in getent(). + [ozaki-r, ticket #630] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Mar 11 20:11:22 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #620 - #622, #624 - #632 To generate a diff of this commit: cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Mar 11 20:09:49 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: xhci_pci.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #632): sys/dev/pci/xhci_pci.c: revision 1.33 Consistently use cached chipset tag value. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/dev/pci/xhci_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Mar 11 20:09:49 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-10]: xhci_pci.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #632):
sys/dev/pci/xhci_pci.c: revision 1.33
Consistently use cached chipset tag value.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/dev/pci/xhci_pci.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/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.32 src/sys/dev/pci/xhci_pci.c:1.32.2.1
--- src/sys/dev/pci/xhci_pci.c:1.32 Fri Oct 28 21:57:58 2022
+++ src/sys/dev/pci/xhci_pci.c Mon Mar 11 20:09:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_pci.c,v 1.32 2022/10/28 21:57:58 riastradh Exp $ */
+/* $NetBSD: xhci_pci.c,v 1.32.2.1 2024/03/11 20:09:49 martin Exp $ */
/* OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.32 2022/10/28 21:57:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.32.2.1 2024/03/11 20:09:49 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_xhci_pci.h"
@@ -229,7 +229,7 @@ xhci_pci_attach(device_t parent, device_
}
intrstr = pci_intr_string(pc, psc->sc_pihp[0], intrbuf,
sizeof(intrbuf));
- pci_intr_setattr(pa->pa_pc, >sc_pihp[0], PCI_INTR_MPSAFE, true);
+ pci_intr_setattr(pc, >sc_pihp[0], PCI_INTR_MPSAFE, true);
psc->sc_ih = pci_intr_establish_xname(pc, psc->sc_pihp[0], IPL_USB,
xhci_intr, sc, device_xname(sc->sc_dev));
if (psc->sc_ih == NULL) {
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Mar 11 20:08:16 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-10]: ehci_pci.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #631):
sys/dev/pci/ehci_pci.c: revision 1.76
Consistently use cached chipset tag value.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/dev/pci/ehci_pci.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/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.75 src/sys/dev/pci/ehci_pci.c:1.75.2.1
--- src/sys/dev/pci/ehci_pci.c:1.75 Fri Oct 28 21:56:44 2022
+++ src/sys/dev/pci/ehci_pci.c Mon Mar 11 20:08:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.75 2022/10/28 21:56:44 riastradh Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.75.2.1 2024/03/11 20:08:15 martin Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.75 2022/10/28 21:56:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.75.2.1 2024/03/11 20:08:15 martin Exp $");
#include
#include
@@ -196,7 +196,7 @@ ehci_pci_attach(device_t parent, device_
* Allocate IRQ
*/
intrstr = pci_intr_string(pc, sc->sc_pihp[0], intrbuf, sizeof(intrbuf));
- pci_intr_setattr(pa->pa_pc, >sc_pihp[0], PCI_INTR_MPSAFE, true);
+ pci_intr_setattr(pc, >sc_pihp[0], PCI_INTR_MPSAFE, true);
sc->sc_ih = pci_intr_establish_xname(pc, sc->sc_pihp[0], IPL_USB,
ehci_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Mar 11 20:08:16 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: ehci_pci.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #631): sys/dev/pci/ehci_pci.c: revision 1.76 Consistently use cached chipset tag value. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/dev/pci/ehci_pci.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-9] src/doc
Module Name:src Committed By: martin Date: Mon Mar 11 20:04:39 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1813 - #1816 To generate a diff of this commit: cvs rdiff -u -r1.1.2.138 -r1.1.2.139 src/doc/CHANGES-9.4 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-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.138 src/doc/CHANGES-9.4:1.1.2.139 --- src/doc/CHANGES-9.4:1.1.2.138 Sun Mar 10 19:22:08 2024 +++ src/doc/CHANGES-9.4 Mon Mar 11 20:04:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.138 2024/03/10 19:22:08 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.139 2024/03/11 20:04:38 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -13438,3 +13438,29 @@ sys/netinet6/in6.c1.292 a router advertisement processed by dhcpcd. [riastradh, ticket #1812] +etc/named.conf 1.11 +external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h 1.11 +usr.sbin/postinstall/postinstall.in 1.59 + + named(8): fix bus errors on alignement critical architectures. + Update the default named.conf for the new version. + postinstall(8): add support to upgrade the named(8) configuration. + [christos, ticket #1813] + +sys/kern/sysv_shm.c1.142 + + sysv_shm: PR 57979: avoid arithmetic overflow when computing + kern.ipc.shmmax. + [riastradh, ticket #1814] + +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 #1815] + +lib/libc/gen/getcap.c1.58 + + libc: fix memory leak in getent(). + [ozaki-r, ticket #1816] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Mar 11 20:04:39 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1813 - #1816 To generate a diff of this commit: cvs rdiff -u -r1.1.2.138 -r1.1.2.139 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/lib/libc/gen
Module Name:src Committed By: martin Date: Mon Mar 11 20:02:12 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-9]: getcap.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1816): 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.57 -r1.57.8.1 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-9] src/lib/libc/gen
Module Name:src
Committed By: martin
Date: Mon Mar 11 20:02:12 UTC 2024
Modified Files:
src/lib/libc/gen [netbsd-9]: getcap.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1816):
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.57 -r1.57.8.1 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.57 src/lib/libc/gen/getcap.c:1.57.8.1
--- src/lib/libc/gen/getcap.c:1.57 Sun Jun 18 03:56:39 2017
+++ src/lib/libc/gen/getcap.c Mon Mar 11 20:02:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getcap.c,v 1.57 2017/06/18 03:56:39 manu Exp $ */
+/* $NetBSD: getcap.c,v 1.57.8.1 2024/03/11 20:02:12 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.57 2017/06/18 03:56:39 manu Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.57.8.1 2024/03/11 20:02:12 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-10] src/lib/libc/gen
Module Name:src
Committed By: martin
Date: Mon Mar 11 20:00:54 UTC 2024
Modified Files:
src/lib/libc/gen [netbsd-10]: getcap.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #630):
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.57 -r1.57.16.1 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.57 src/lib/libc/gen/getcap.c:1.57.16.1
--- src/lib/libc/gen/getcap.c:1.57 Sun Jun 18 03:56:39 2017
+++ src/lib/libc/gen/getcap.c Mon Mar 11 20:00:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getcap.c,v 1.57 2017/06/18 03:56:39 manu Exp $ */
+/* $NetBSD: getcap.c,v 1.57.16.1 2024/03/11 20:00:53 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.57 2017/06/18 03:56:39 manu Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.57.16.1 2024/03/11 20:00:53 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-10] src/lib/libc/gen
Module Name:src Committed By: martin Date: Mon Mar 11 20:00:54 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-10]: getcap.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #630): 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.57 -r1.57.16.1 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-10] src/share/man/man4
Module Name:src Committed By: martin Date: Mon Mar 11 19:39:23 UTC 2024 Modified Files: src/share/man/man4 [netbsd-10]: wg.4 Log Message: Pull up following revision(s) (requested by riastradh in ticket #629): share/man/man4/wg.4: revision 1.7 wg(4): Spruce up example a bit. - Suggest umask so the private keys aren't world readable. - Suggest use of pre-shared key files. - Use TEST-NET-1 and TEST-NET-2 addresses for the example instead of real publicly routable addresses. Holding off on adding IPv6 example until the tun(4) issue is fixed (PR bin/58013). PR misc/58015 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.6.1 src/share/man/man4/wg.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/share/man/man4
Module Name:src Committed By: martin Date: Mon Mar 11 19:39:23 UTC 2024 Modified Files: src/share/man/man4 [netbsd-10]: wg.4 Log Message: Pull up following revision(s) (requested by riastradh in ticket #629): share/man/man4/wg.4: revision 1.7 wg(4): Spruce up example a bit. - Suggest umask so the private keys aren't world readable. - Suggest use of pre-shared key files. - Use TEST-NET-1 and TEST-NET-2 addresses for the example instead of real publicly routable addresses. Holding off on adding IPv6 example until the tun(4) issue is fixed (PR bin/58013). PR misc/58015 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.6.1 src/share/man/man4/wg.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/wg.4 diff -u src/share/man/man4/wg.4:1.6 src/share/man/man4/wg.4:1.6.6.1 --- src/share/man/man4/wg.4:1.6 Mon Aug 31 20:20:22 2020 +++ src/share/man/man4/wg.4 Mon Mar 11 19:39:23 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: wg.4,v 1.6 2020/08/31 20:20:22 riastradh Exp $ +.\" $NetBSD: wg.4,v 1.6.6.1 2024/03/11 19:39:23 martin Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -75,7 +75,7 @@ endpoint IP address outside the tunnel. .Sh EXAMPLES Typical network topology: .Bd -literal -offset abcd -wm0 = 1.2.3.4 bge0 = 4.3.2.1 +wm0 = 192.0.2.123 bge0 = 198.51.100.45 Stationary server: Roaming client: +-++-+ @@ -95,17 +95,24 @@ Stationary server: .Pp Generate key pairs on A and B: .Bd -literal -offset abcd -A# wg-keygen > /etc/wg/wg0 +A# (umask 0077; wg-keygen > /etc/wg/wg0) A# wg-keygen --pub < /etc/wg/wg0 > /etc/wg/wg0.pub A# cat /etc/wg/wg0.pub N+B4Nelg+4ysvbLW3qenxIwrJVE9MdjMyqrIisH7V0Y= -B# wg-keygen > /etc/wg/wg0 +B# (umask 0077; wg-keygen > /etc/wg/wg0) B# wg-keygen --pub < /etc/wg/wg0 > /etc/wg/wg0.pub B# cat /etc/wg/wg0.pub X7EGm3T3IfodBcyilkaC89j0SH3XD6+/pwvp7Dgp5SU= .Ed .Pp +Generate a pre-shared key on A and copy it to B to defend against +potential future quantum cryptanalysis (not necessary for +functionality): +.Bd -literal -offset abcd +A# (umask 0077; wg-keygen > /etc/wg/wg0.A-B) +.Ed +.Pp Configure A to listen on port 1234 and allow connections from B to appear in the 10.0.1.0/24 subnet: .Bd -literal -offset abcd @@ -114,6 +121,7 @@ A# wgconfig wg0 set private-key /etc/wg/ A# wgconfig wg0 set listen-port 1234 A# wgconfig wg0 add peer B \e X7EGm3T3IfodBcyilkaC89j0SH3XD6+/pwvp7Dgp5SU= \e +--preshared-key=/etc/wg/wg0.A-B \e --allowed-ips=10.0.1.1/32 A# ifconfig wg0 up A# ifconfig wg0 @@ -122,15 +130,16 @@ wg0: flags=0x8041 inet6 fe80::22f7:d6ff:fe3a:1e60%wg0/64 flags 0 scopeid 0x3 .Ed .Pp -Configure B to connect to A at 1.2.3.4 on port 1234 and the packets can -begin to flow: +Configure B to connect to A at 192.0.2.123 on port 1234 and the packets +can begin to flow: .Bd -literal -offset abcd B# ifconfig wg0 create 10.0.1.1/24 B# wgconfig wg0 set private-key /etc/wg/wg0 B# wgconfig wg0 add peer A \e N+B4Nelg+4ysvbLW3qenxIwrJVE9MdjMyqrIisH7V0Y= \e +--preshared-key=/etc/wg/wg0.A-B \e --allowed-ips=10.0.1.0/32 \e ---endpoint=1.2.3.4:1234 +--endpoint=192.0.2.123:1234 B# ifconfig wg0 up B# ifconfig wg0 wg0: flags=0x8041 mtu 1420
CVS commit: [netbsd-10] src/sys/net
Module Name:src
Committed By: martin
Date: Mon Mar 11 19:34:00 UTC 2024
Modified Files:
src/sys/net [netbsd-10]: if_wg.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #628):
sys/net/if_wg.c: revision 1.78
wg(4): Bind to CPU in wg_handle_packet.
Required by use of psref there.
Assert we're bound up front so we catch mistakes early, rather than
later on if we get unlucky in preemption and scheduling.
PR bin/58021
To generate a diff of this commit:
cvs rdiff -u -r1.71.2.2 -r1.71.2.3 src/sys/net/if_wg.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_wg.c
diff -u src/sys/net/if_wg.c:1.71.2.2 src/sys/net/if_wg.c:1.71.2.3
--- src/sys/net/if_wg.c:1.71.2.2 Fri Jul 7 19:02:22 2023
+++ src/sys/net/if_wg.c Mon Mar 11 19:34:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wg.c,v 1.71.2.2 2023/07/07 19:02:22 martin Exp $ */
+/* $NetBSD: if_wg.c,v 1.71.2.3 2024/03/11 19:34:00 martin Exp $ */
/*
* Copyright (C) Ryota Ozaki
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.71.2.2 2023/07/07 19:02:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.71.2.3 2024/03/11 19:34:00 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq_enabled.h"
@@ -2870,6 +2870,8 @@ wg_handle_packet(struct wg_softc *wg, st
{
struct wg_msg *wgm;
+ KASSERT(curlwp->l_pflag & LP_BOUND);
+
m = wg_validate_msg_header(wg, m);
if (__predict_false(m == NULL))
return;
@@ -5039,6 +5041,7 @@ rumpkern_wg_recv_peer(struct wg_softc *w
{
struct mbuf *m;
const struct sockaddr *src;
+ int bound;
WG_TRACE("");
@@ -5053,7 +5056,9 @@ rumpkern_wg_recv_peer(struct wg_softc *w
WG_DLOG("iov_len=%lu\n", iov[1].iov_len);
WG_DUMP_BUF(iov[1].iov_base, iov[1].iov_len);
+ bound = curlwp_bind();
wg_handle_packet(wg, m, src);
+ curlwp_bindx(bound);
}
#endif /* WG_RUMPKERNEL */
CVS commit: [netbsd-10] src/sys/net
Module Name:src Committed By: martin Date: Mon Mar 11 19:34:00 UTC 2024 Modified Files: src/sys/net [netbsd-10]: if_wg.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #628): sys/net/if_wg.c: revision 1.78 wg(4): Bind to CPU in wg_handle_packet. Required by use of psref there. Assert we're bound up front so we catch mistakes early, rather than later on if we get unlucky in preemption and scheduling. PR bin/58021 To generate a diff of this commit: cvs rdiff -u -r1.71.2.2 -r1.71.2.3 src/sys/net/if_wg.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/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-9] src/sys/net
Module Name:src
Committed By: martin
Date: Mon Mar 11 19:30:06 UTC 2024
Modified Files:
src/sys/net [netbsd-9]: if_tun.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1815):
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.156 -r1.156.2.1 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.156 src/sys/net/if_tun.c:1.156.2.1
--- src/sys/net/if_tun.c:1.156 Fri Apr 26 08:38:25 2019
+++ src/sys/net/if_tun.c Mon Mar 11 19:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.156 2019/04/26 08:38:25 pgoyette Exp $ */
+/* $NetBSD: if_tun.c,v 1.156.2.1 2024/03/11 19:30:06 martin Exp $ */
/*
* Copyright (c) 1988, Julian Onions
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.156 2019/04/26 08:38:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.156.2.1 2024/03/11 19:30:06 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -586,9 +586,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-9] src/sys/net
Module Name:src Committed By: martin Date: Mon Mar 11 19:30:06 UTC 2024 Modified Files: src/sys/net [netbsd-9]: if_tun.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1815): 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.156 -r1.156.2.1 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-10] src/sys/net
Module Name:src
Committed By: martin
Date: Mon Mar 11 19:28:45 UTC 2024
Modified Files:
src/sys/net [netbsd-10]: if_tun.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #627):
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.173.4.1 -r1.173.4.2 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.173.4.1 src/sys/net/if_tun.c:1.173.4.2
--- src/sys/net/if_tun.c:1.173.4.1 Sun Jan 14 15:18:37 2024
+++ src/sys/net/if_tun.c Mon Mar 11 19:28:45 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.173.4.1 2024/01/14 15:18:37 martin Exp $ */
+/* $NetBSD: if_tun.c,v 1.173.4.2 2024/03/11 19:28:45 martin Exp $ */
/*
* Copyright (c) 1988, Julian Onions
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.173.4.1 2024/01/14 15:18:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.173.4.2 2024/03/11 19:28:45 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -604,9 +604,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-10] src/sys/net
Module Name:src Committed By: martin Date: Mon Mar 11 19:28:45 UTC 2024 Modified Files: src/sys/net [netbsd-10]: if_tun.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #627): 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.173.4.1 -r1.173.4.2 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: src/usr.bin/audio/common
Module Name:src Committed By: mrg Date: Mon Mar 11 19:17:52 UTC 2024 Modified Files: src/usr.bin/audio/common: wav.c Log Message: be sure to byte swap ext.len when checking/printing it. noted by rillig@. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 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: src/usr.bin/audio/common
Module Name:src
Committed By: mrg
Date: Mon Mar 11 19:17:52 UTC 2024
Modified Files:
src/usr.bin/audio/common: wav.c
Log Message:
be sure to byte swap ext.len when checking/printing it.
noted by rillig@.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 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.19 src/usr.bin/audio/common/wav.c:1.20
--- src/usr.bin/audio/common/wav.c:1.19 Fri Mar 8 06:57:59 2024
+++ src/usr.bin/audio/common/wav.c Mon Mar 11 19:17:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wav.c,v 1.19 2024/03/08 06:57:59 mrg Exp $ */
+/* $NetBSD: wav.c,v 1.20 2024/03/11 19:17:52 mrg 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.19 2024/03/08 06:57:59 mrg Exp $");
+__RCSID("$NetBSD: wav.c,v 1.20 2024/03/11 19:17:52 mrg Exp $");
#endif
@@ -175,8 +175,10 @@ audio_wav_parse_hdr(void *hdr, size_t sz
*
* warn about this, but don't consider it an error.
*/
- if (ext.len != 22 && verbose)
- fprintf(stderr, "warning: WAVE ext.len %u not 22\n", ext.len);
+ if (getle16(ext.len) != 22 && verbose) {
+ fprintf(stderr, "warning: WAVE ext.len %u not 22\n",
+ getle16(ext.len));
+ }
} else if (len < sizeof(fmt)) {
if (verbose)
fprintf(stderr, "WAVE fmt unsupported size %u\n", len);
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-9] src/sys/kern
Module Name:src Committed By: martin Date: Mon Mar 11 18:01:48 UTC 2024 Modified Files: src/sys/kern [netbsd-9]: sysv_shm.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1814): sys/kern/sysv_shm.c: revision 1.142 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.135.2.4 -r1.135.2.5 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-9] src/sys/kern
Module Name:src
Committed By: martin
Date: Mon Mar 11 18:01:48 UTC 2024
Modified Files:
src/sys/kern [netbsd-9]: sysv_shm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1814):
sys/kern/sysv_shm.c: revision 1.142
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.135.2.4 -r1.135.2.5 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.135.2.4 src/sys/kern/sysv_shm.c:1.135.2.5
--- src/sys/kern/sysv_shm.c:1.135.2.4 Thu Oct 10 17:23:45 2019
+++ src/sys/kern/sysv_shm.c Mon Mar 11 18:01:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_shm.c,v 1.135.2.4 2019/10/10 17:23:45 martin Exp $ */
+/* $NetBSD: sysv_shm.c,v 1.135.2.5 2024/03/11 18:01:48 martin Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.135.2.4 2019/10/10 17:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.135.2.5 2024/03/11 18:01:48 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -961,10 +961,10 @@ shminit(struct sysctllog **clog)
ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)));
if (shminfo.shmmax == 0)
- shminfo.shmmax = uimax(physmem / 4, 1024) * PAGE_SIZE;
+ shminfo.shmall = uimax(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");
@@ -1087,7 +1087,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-10] src/sys/kern
Module Name:src
Committed By: martin
Date: Mon Mar 11 18:00:06 UTC 2024
Modified Files:
src/sys/kern [netbsd-10]: sysv_shm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #626):
sys/kern/sysv_shm.c: revision 1.142
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.141 -r1.141.26.1 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.141 src/sys/kern/sysv_shm.c:1.141.26.1
--- src/sys/kern/sysv_shm.c:1.141 Wed Oct 9 17:47:13 2019
+++ src/sys/kern/sysv_shm.c Mon Mar 11 18:00:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_shm.c,v 1.141 2019/10/09 17:47:13 chs Exp $ */
+/* $NetBSD: sysv_shm.c,v 1.141.26.1 2024/03/11 18:00:06 martin Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.141 2019/10/09 17:47:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.141.26.1 2024/03/11 18:00:06 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -961,10 +961,10 @@ shminit(void)
ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)));
if (shminfo.shmmax == 0)
- shminfo.shmmax = uimax(physmem / 4, 1024) * PAGE_SIZE;
+ shminfo.shmall = uimax(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");
@@ -1083,7 +1083,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-10] src/sys/kern
Module Name:src Committed By: martin Date: Mon Mar 11 18:00:06 UTC 2024 Modified Files: src/sys/kern [netbsd-10]: sysv_shm.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #626): sys/kern/sysv_shm.c: revision 1.142 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.141 -r1.141.26.1 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-10] src/usr.sbin/certctl
Module Name:src Committed By: martin Date: Mon Mar 11 17:50:04 UTC 2024 Modified Files: src/usr.sbin/certctl [netbsd-10]: certctl.sh Log Message: Pull up following revision(s) (requested by riastradh in ticket #625): usr.sbin/certctl/certctl.sh: revision 1.7 certctl(8): Pacify formal POSIX sh syntax. According to POSIX 2018, the syntax between `then' and `elif' and `fi' must be a _non-empty_ list of commands: compound_list: linebreak term | linebreak term separator ; ... if_clause: If compound_list Then compound_list else_part Fi | If compound_list Then compound_list Fi ; else_part: Elif compound_list Then compound_list | Elif compound_list Then compound_list else_part | Else compound_list ; https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18 +_10_02 NetBSD's sh(1) currently doesn't enforce this and allows an empty sequence of commands, but let's not rely on that nonstandard quirk. Noted in PR 57997. To generate a diff of this commit: cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/usr.sbin/certctl/certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/certctl
Module Name:src Committed By: martin Date: Mon Mar 11 17:50:04 UTC 2024 Modified Files: src/usr.sbin/certctl [netbsd-10]: certctl.sh Log Message: Pull up following revision(s) (requested by riastradh in ticket #625): usr.sbin/certctl/certctl.sh: revision 1.7 certctl(8): Pacify formal POSIX sh syntax. According to POSIX 2018, the syntax between `then' and `elif' and `fi' must be a _non-empty_ list of commands: compound_list: linebreak term | linebreak term separator ; ... if_clause: If compound_list Then compound_list else_part Fi | If compound_list Then compound_list Fi ; else_part: Elif compound_list Then compound_list | Elif compound_list Then compound_list else_part | Else compound_list ; https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18 +_10_02 NetBSD's sh(1) currently doesn't enforce this and allows an empty sequence of commands, but let's not rely on that nonstandard quirk. Noted in PR 57997. To generate a diff of this commit: cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/usr.sbin/certctl/certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/certctl/certctl.sh diff -u src/usr.sbin/certctl/certctl.sh:1.4.2.4 src/usr.sbin/certctl/certctl.sh:1.4.2.5 --- src/usr.sbin/certctl/certctl.sh:1.4.2.4 Mon Mar 11 17:12:53 2024 +++ src/usr.sbin/certctl/certctl.sh Mon Mar 11 17:50:04 2024 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: certctl.sh,v 1.4.2.4 2024/03/11 17:12:53 martin Exp $ +# $NetBSD: certctl.sh,v 1.4.2.5 2024/03/11 17:50:04 martin Exp $ # # Copyright (c) 2023 The NetBSD Foundation, Inc. # All rights reserved. @@ -440,6 +440,7 @@ rehash() return 1 elif [ ! -e "$certsdir" ]; then # Directory doesn't exist at all. Nothing to do! + : elif [ ! -d "$certsdir" ]; then error "certificates directory is not a directory" return 1
CVS commit: [netbsd-10] src/usr.sbin/wgconfig
Module Name:src Committed By: martin Date: Mon Mar 11 17:44:14 UTC 2024 Modified Files: src/usr.sbin/wgconfig [netbsd-10]: wgconfig.8 Log Message: Pull up following revision(s) (requested by riastradh in ticket #624): usr.sbin/wgconfig/wgconfig.8: revision 1.11 Fix typo in wgconfig(8) >From rudolf in PR 57663 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.6.1 src/usr.sbin/wgconfig/wgconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/wgconfig/wgconfig.8 diff -u src/usr.sbin/wgconfig/wgconfig.8:1.10 src/usr.sbin/wgconfig/wgconfig.8:1.10.6.1 --- src/usr.sbin/wgconfig/wgconfig.8:1.10 Wed Aug 26 16:03:42 2020 +++ src/usr.sbin/wgconfig/wgconfig.8 Mon Mar 11 17:44:14 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: wgconfig.8,v 1.10 2020/08/26 16:03:42 riastradh Exp $ +.\" $NetBSD: wgconfig.8,v 1.10.6.1 2024/03/11 17:44:14 martin Exp $ .\" .\" Copyright (C) Ryota Ozaki .\" All rights reserved. @@ -138,7 +138,7 @@ is the peer's base64-encoded public key, .Pp The following options may be specified: .Bl -tag -width abcd -.It Fl Fl preshared-key-file Ns Li \&= Ns Ar filename +.It Fl Fl preshared-key Ns Li \&= Ns Ar filename Set a secret preshared key generated by .Nm wg-keygen .Fl Fl psk .
CVS commit: [netbsd-10] src/usr.sbin/wgconfig
Module Name:src Committed By: martin Date: Mon Mar 11 17:44:14 UTC 2024 Modified Files: src/usr.sbin/wgconfig [netbsd-10]: wgconfig.8 Log Message: Pull up following revision(s) (requested by riastradh in ticket #624): usr.sbin/wgconfig/wgconfig.8: revision 1.11 Fix typo in wgconfig(8) >From rudolf in PR 57663 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.6.1 src/usr.sbin/wgconfig/wgconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Mon Mar 11 17:37:43 UTC 2024
Modified Files:
src/etc [netbsd-9]: named.conf
src/external/mpl/bind/dist/lib/isc/netmgr [netbsd-9]: netmgr-int.h
src/usr.sbin/postinstall [netbsd-9]: postinstall.in
Log Message:
Pull up following revision(s) (requested by christos in ticket #1813):
etc/named.conf: revision 1.11
usr.sbin/postinstall/postinstall.in: revision 1.59
external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h: revision 1.11
Make sure that the extra field is maximally aligned since it is used for
other struct storage.
- fix named.conf (remove dnssec-enable option)
- use proper local variables instead of adding _ or other prefixes.
- centralize rm use
- use grep -q instead of > /dev/null
- reduce constant duplication
remove obsolete option "dnssec-enable"
To generate a diff of this commit:
cvs rdiff -u -r1.7.32.1 -r1.7.32.2 src/etc/named.conf
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \
src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h
cvs rdiff -u -r1.5.2.5 -r1.5.2.6 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.7.32.1 src/etc/named.conf:1.7.32.2
--- src/etc/named.conf:1.7.32.1 Fri Mar 27 08:43:42 2020
+++ src/etc/named.conf Mon Mar 11 17:37:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.7.32.1 2020/03/27 08:43:42 sborrill Exp $
+# $NetBSD: named.conf,v 1.7.32.2 2024/03/11 17:37:42 martin Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -10,7 +10,6 @@
options {
directory "/etc/namedb";
- dnssec-enable yes;
dnssec-validation auto;
managed-keys-directory "keys";
bindkeys-file "bind.keys";
Index: src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10.2.2 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10.2.3
--- src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10.2.2 Thu Feb 29 12:35:14 2024
+++ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h Mon Mar 11 17:37:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netmgr-int.h,v 1.10.2.2 2024/02/29 12:35:14 martin Exp $ */
+/* $NetBSD: netmgr-int.h,v 1.10.2.3 2024/03/11 17:37:43 martin Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -276,7 +276,7 @@ struct isc_nmhandle {
LINK(isc_nmhandle_t) active_link;
#endif
void *opaque;
- char extra[];
+ max_align_t extra[];
};
typedef enum isc__netievent_type {
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.5.2.5 src/usr.sbin/postinstall/postinstall.in:1.5.2.6
--- src/usr.sbin/postinstall/postinstall.in:1.5.2.5 Tue Jul 7 20:02:27 2020
+++ src/usr.sbin/postinstall/postinstall.in Mon Mar 11 17:37:42 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.5.2.5 2020/07/07 20:02:27 martin Exp $
+# $NetBSD: postinstall.in,v 1.5.2.6 2024/03/11 17:37:42 martin Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1299,15 +1299,47 @@ do_mtree()
#
# named
#
+handle_named_conf()
+{
+ local op="$1"
+ local option="dnssec-enable"
+ local failed=0
+ local conf
+
+ shift
+
+ for conf; do
+ local c=$(readlink -f "${conf}")
+ if ! ${GREP} -qs "${option}" "${c}"
+ then
+ continue
+ fi
+
+ if [ "${op}" = "fix" ]; then
+ ${SED} -e "/${option}/d" "${c}" > "${c}.new"
+ failed=$(( ${failed} + $? ))
+ mv "${c}.new" "${c}"
+ failed=$(( ${failed} + $? ))
+ msg "Removed obsolete '${option}' in ${c}"
+ else
+ msg "'${option}' option in ${c} should be removed"
+ failed=$(( ${failed} + 1 ))
+ fi
+ done
+
+ return ${failed}
+}
+
additem named "named configuration update"
do_named()
{
+ local oldconf="${DEST_DIR}/etc/namedb/named.conf"
+ local conf="${DEST_DIR}/etc/named.conf"
[ -n "$1" ] || err 3 "USAGE: do_named fix|check"
- op="$1"
+ local op="$1"
- move_file "${op}" \
- "${DEST_DIR}/etc/namedb/named.conf" \
- "${DEST_DIR}/etc/named.conf"
+ move_file "${op}" "${oldconf}" "${conf}"
+ handle_named_conf "${op}" "${oldconf}" "${conf}"
compare_dir "${op}" "${SRC_DIR}/etc/namedb" "${DEST_DIR}/etc/namedb" \
644 \
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Mar 11 17:37:43 UTC 2024 Modified Files: src/etc [netbsd-9]: named.conf src/external/mpl/bind/dist/lib/isc/netmgr [netbsd-9]: netmgr-int.h src/usr.sbin/postinstall [netbsd-9]: postinstall.in Log Message: Pull up following revision(s) (requested by christos in ticket #1813): etc/named.conf: revision 1.11 usr.sbin/postinstall/postinstall.in: revision 1.59 external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h: revision 1.11 Make sure that the extra field is maximally aligned since it is used for other struct storage. - fix named.conf (remove dnssec-enable option) - use proper local variables instead of adding _ or other prefixes. - centralize rm use - use grep -q instead of > /dev/null - reduce constant duplication remove obsolete option "dnssec-enable" To generate a diff of this commit: cvs rdiff -u -r1.7.32.1 -r1.7.32.2 src/etc/named.conf cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h cvs rdiff -u -r1.5.2.5 -r1.5.2.6 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Mon Mar 11 17:25:20 UTC 2024
Modified Files:
src/etc [netbsd-10]: named.conf
src/external/mpl/bind/dist/lib/isc/netmgr [netbsd-10]: netmgr-int.h
src/usr.sbin/postinstall [netbsd-10]: postinstall.in
Log Message:
Pull up following revision(s) (requested by christos in ticket #622):
etc/named.conf: revision 1.11
usr.sbin/postinstall/postinstall.in: revision 1.59
external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h: revision 1.11
usr.sbin/postinstall/postinstall.in: revision 1.60
usr.sbin/postinstall/postinstall.in: revision 1.61
Make sure that the extra field is maximally aligned since it is used for
other struct storage.
- fix named.conf (remove dnssec-enable option)
- use proper local variables instead of adding _ or other prefixes.
- centralize rm use
- use grep -q instead of > /dev/null
- reduce constant duplication
no local in loops, simplify eval (thanks kre)
postinstall: fix endless loop (since 2024-03-07)
remove obsolete option "dnssec-enable"
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 src/etc/named.conf
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 \
src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h
cvs rdiff -u -r1.51.2.2 -r1.51.2.3 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.10 src/etc/named.conf:1.10.6.1
--- src/etc/named.conf:1.10 Sun Oct 11 22:14:55 2020
+++ src/etc/named.conf Mon Mar 11 17:25:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.10 2020/10/11 22:14:55 jnemeth Exp $
+# $NetBSD: named.conf,v 1.10.6.1 2024/03/11 17:25:20 martin Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -10,7 +10,6 @@
options {
directory "/etc/namedb";
- dnssec-enable yes;
dnssec-validation auto;
managed-keys-directory "keys";
bindkeys-file "bind.keys";
Index: src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.8.2.1 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.8.2.2
--- src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.8.2.1 Sun Feb 25 15:47:24 2024
+++ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h Mon Mar 11 17:25:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netmgr-int.h,v 1.8.2.1 2024/02/25 15:47:24 martin Exp $ */
+/* $NetBSD: netmgr-int.h,v 1.8.2.2 2024/03/11 17:25:20 martin Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -276,7 +276,7 @@ struct isc_nmhandle {
LINK(isc_nmhandle_t) active_link;
#endif
void *opaque;
- char extra[];
+ max_align_t extra[];
};
typedef enum isc__netievent_type {
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.51.2.2 src/usr.sbin/postinstall/postinstall.in:1.51.2.3
--- src/usr.sbin/postinstall/postinstall.in:1.51.2.2 Sat Feb 3 14:15:00 2024
+++ src/usr.sbin/postinstall/postinstall.in Mon Mar 11 17:25:20 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.51.2.2 2024/02/03 14:15:00 martin Exp $
+# $NetBSD: postinstall.in,v 1.51.2.3 2024/03/11 17:25:20 martin Exp $
#
# Copyright (c) 2002-2022 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -60,6 +60,7 @@
: ${SED:=sed}
: ${SORT:=sort}
: ${STAT:=stat}
+: ${RM:=rm}
#
# helper functions
@@ -67,11 +68,11 @@
err()
{
- exitval=$1
+ local exitval=$1
shift
echo 1>&2 "${PROGNAME}: $*"
if [ -n "${SCRATCHDIR}" ]; then
- /bin/rm -rf "${SCRATCHDIR}"
+ ${RM} -rf "${SCRATCHDIR}"
fi
exit ${exitval}
}
@@ -92,15 +93,16 @@ mkdtemp()
[ -d /tmp ] || err 2 /tmp is not a directory
[ -w /tmp ] || err 2 /tmp is not writable
- _base="/tmp/_postinstall.$$"
- _serial=0
+ local base="/tmp/_postinstall.$$"
+ local serial=0
+ local dir
while true; do
- _dir="${_base}.${_serial}"
- mkdir -m 0700 "${_dir}" && break
- _serial=$((${_serial} + 1))
+ dir="${base}.${serial}"
+ mkdir -m 0700 "${dir}" && break
+ serial=$((${serial} + 1))
done
- echo "${_dir}"
+ echo "${dir}"
}
# Quote args to make them safe in the shell.
@@ -131,7 +133,7 @@ shell_quote()
# '\'''\'' sequences that result from multiple
# adjacent quotes in he input.
qarg="$(printf "%s\n" "$arg" | \
- ${SED:-sed} -e "s/'/'''/g" \
+ ${SED} -e "s/'/'''/g" \
-e "1s/^/'/" -e "\$s/\$/'/" \
-e "1s/^''//" -e "\$s/''\$//" \
-e "s/'''/'/g"
@@ -206,18 +208,18 @@ adddisableditem()
check_dir()
{
[ $# -eq 3 ] || err 3 "USAGE: check_dir op dir mode"
- _cdop="$1"
- _cddir="$2"
- _cdmode="$3"
- [ -d "${_cddir}" ] && return 0
- if [ "${_cdop}" = "check" ]; then
- msg "${_cddir} is not a directory"
+ local op="$1"
+ local dir="$2"
+ local mode="$3"
+ [ -d "${dir}" ] && return 0
+ if [ "${op}" = "check" ]; then
+ msg
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Mar 11 17:25:20 UTC 2024 Modified Files: src/etc [netbsd-10]: named.conf src/external/mpl/bind/dist/lib/isc/netmgr [netbsd-10]: netmgr-int.h src/usr.sbin/postinstall [netbsd-10]: postinstall.in Log Message: Pull up following revision(s) (requested by christos in ticket #622): etc/named.conf: revision 1.11 usr.sbin/postinstall/postinstall.in: revision 1.59 external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h: revision 1.11 usr.sbin/postinstall/postinstall.in: revision 1.60 usr.sbin/postinstall/postinstall.in: revision 1.61 Make sure that the extra field is maximally aligned since it is used for other struct storage. - fix named.conf (remove dnssec-enable option) - use proper local variables instead of adding _ or other prefixes. - centralize rm use - use grep -q instead of > /dev/null - reduce constant duplication no local in loops, simplify eval (thanks kre) postinstall: fix endless loop (since 2024-03-07) remove obsolete option "dnssec-enable" To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.6.1 src/etc/named.conf cvs rdiff -u -r1.8.2.1 -r1.8.2.2 \ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h cvs rdiff -u -r1.51.2.2 -r1.51.2.3 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/certctl
Module Name:src
Committed By: martin
Date: Mon Mar 11 17:12:53 UTC 2024
Modified Files:
src/usr.sbin/certctl [netbsd-10]: certctl.sh
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #621):
usr.sbin/certctl/certctl.sh: revision 1.6
certctl(8): Avoid basename(1).
Saves some time running subprocesses. Since this is only used for
non-directories (i.e., there's never trailing / on the inputs), it
suffices to delete the longest prefix matching glob `*/' with shell
parameter expansion -- much cheaper than spawning a subprocess.
Shaves off about 1/3 of the time spent in `certctl list' on an
aarch64 VM in qemu.
PR bin/57993
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.3 -r1.4.2.4 src/usr.sbin/certctl/certctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/certctl/certctl.sh
diff -u src/usr.sbin/certctl/certctl.sh:1.4.2.3 src/usr.sbin/certctl/certctl.sh:1.4.2.4
--- src/usr.sbin/certctl/certctl.sh:1.4.2.3 Wed Sep 6 15:04:33 2023
+++ src/usr.sbin/certctl/certctl.sh Mon Mar 11 17:12:53 2024
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: certctl.sh,v 1.4.2.3 2023/09/06 15:04:33 martin Exp $
+# $NetBSD: certctl.sh,v 1.4.2.4 2024/03/11 17:12:53 martin Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@
set -o pipefail
set -Ceu
-progname=$(basename -- "$0")
+progname=${0##*/}
### Options and arguments
@@ -276,8 +276,7 @@ list_default_trusted()
# Print the vis-encoded absolute path to the
# certificate and base name on a single line.
- vbase=$(basename -- "$vcert.")
- vbase=${vbase%.}
+ vbase=${vcert##*/}
printf '%s %s\n' "$vcert" "$vbase"
done
done
@@ -339,8 +338,7 @@ list_distrusted()
# Print the vis-encoded absolute path to the
# certificate and base name on a single line.
vcert=$(printf '%s' "$cert" | vis -M)
- vbase=$(basename -- "$vcert.")
- vbase=${vbase%.}
+ vbase=${vcert##*/}
printf '%s %s\n' "$vcert" "$vbase"
done
@@ -562,8 +560,7 @@ cmd_trust()
fi
# Verify we currently distrust a certificate by this base name.
- certbase=$(basename -- "$cert.")
- certbase=${certbase%.}
+ certbase=${cert##*/}
if [ ! -h "$distrustdir/$certbase" ]; then
error "not currently distrusted: $vcert"
return 1
@@ -574,7 +571,7 @@ cmd_trust()
target=$(readlink -n -- "$distrustdir/$certbase" && printf .)
target=${target%.}
if [ "$cert" != "$target" ]; then
- vcertbase=$(basename -- "$vcert")
+ vcertbase=${vcert##*/}
error "distrusted $vcertbase does not point to $vcert"
return 1
fi
@@ -617,8 +614,7 @@ cmd_untrust()
# Check whether this certificate is already distrusted.
# - If the same base name points to the same path, stop here.
# - Otherwise, fail noisily.
- certbase=$(basename "$cert.")
- certbase=${certbase%.}
+ certbase=${cert##*/}
if [ -h "$distrustdir/$certbase" ]; then
target=$(readlink -n -- "$distrustdir/$certbase" && printf .)
target=${target%.}
CVS commit: [netbsd-10] src/usr.sbin/certctl
Module Name:src Committed By: martin Date: Mon Mar 11 17:12:53 UTC 2024 Modified Files: src/usr.sbin/certctl [netbsd-10]: certctl.sh Log Message: Pull up following revision(s) (requested by riastradh in ticket #621): usr.sbin/certctl/certctl.sh: revision 1.6 certctl(8): Avoid basename(1). Saves some time running subprocesses. Since this is only used for non-directories (i.e., there's never trailing / on the inputs), it suffices to delete the longest prefix matching glob `*/' with shell parameter expansion -- much cheaper than spawning a subprocess. Shaves off about 1/3 of the time spent in `certctl list' on an aarch64 VM in qemu. PR bin/57993 To generate a diff of this commit: cvs rdiff -u -r1.4.2.3 -r1.4.2.4 src/usr.sbin/certctl/certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Mar 11 17:09:43 UTC 2024 Modified Files: src/distrib/sets/lists/base [netbsd-10]: mi src/doc [netbsd-10]: 3RDPARTY src/external/mpl/mozilla-certdata/dist [netbsd-10]: certdata.txt src/external/mpl/mozilla-certdata/share [netbsd-10]: Makefile certdata.awk email.trust server.trust src/external/mpl/mozilla-certdata/share/certs [netbsd-10]: Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem Added Files: src/external/mpl/mozilla-certdata/share/certs [netbsd-10]: CommScope_Public_Trust_ECC_Root-01.pem CommScope_Public_Trust_ECC_Root-02.pem CommScope_Public_Trust_RSA_Root-01.pem CommScope_Public_Trust_RSA_Root-02.pem D-Trust_SBR_Root_CA_1_2022.pem D-Trust_SBR_Root_CA_2_2022.pem Telekom_Security_SMIME_ECC_Root_2021.pem Telekom_Security_SMIME_RSA_Root_2023.pem Telekom_Security_TLS_ECC_Root_2020.pem Telekom_Security_TLS_RSA_Root_2023.pem TrustAsia_Global_Root_CA_G3.pem TrustAsia_Global_Root_CA_G4.pem Removed Files: src/external/mpl/mozilla-certdata/share/certs [netbsd-10]: Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem Chambers_of_Commerce_Root_-_2008.pem Global_Chambersign_Root_-_2008.pem Security_Communication_Root_CA.pem Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem TrustCor_ECA-1.pem TrustCor_RootCert_CA-1.pem TrustCor_RootCert_CA-2.pem Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem Log Message: Pull up following revision(s) (requested by riastradh in ticket #620): external/mpl/mozilla-certdata/dist/certdata.txt up to 1.1.1.2 external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-2.pem: file removal external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-01.pem: revision 1.1 distrib/sets/lists/base/mi: revision 1.1334 external/mpl/mozilla-certdata/share/certs/Global_Chambersign_Root_-_2008.pem: file removal external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_ECC_Root_2021.pem: revision 1.1 doc/3RDPARTY: revision 1.1994 external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G3.pem: revision 1.1 external/mpl/mozilla-certdata/share/email.trust: revision 1.2 external/mpl/mozilla-certdata/share/certs/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem: file removal external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-01.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem: file removal external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_2_2022.pem: revision 1.1 external/mpl/mozilla-certdata/share/server.trust: revision 1.2 external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_1_2022.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_ECC_Root_2020.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-1.pem: file removal external/mpl/mozilla-certdata/share/certs/Security_Communication_Root_CA.pem: file removal external/mpl/mozilla-certdata/share/certs/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem: file removal doc/3RDPARTY: revision 1.1982 external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_RSA_Root_2023.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem: file removal external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-02.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_RSA_Root_2023.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/Chambers_of_Commerce_Root_-_2008.pem: file removal external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem: revision 1.2 external/mpl/mozilla-certdata/share/certs/TrustCor_ECA-1.pem: file removal external/mpl/mozilla-certdata/share/Makefile: revision 1.4 external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G4.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-02.pem: revision 1.1 external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem: file removal
