CVS commit: src/share/man/man4
Module Name:src Committed By: pgoyette Date: Wed Jul 12 05:26:42 UTC 2017 Modified Files: src/share/man/man4: wbsio.4 Log Message: Add space before left-paren To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/wbsio.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/wbsio.4 diff -u src/share/man/man4/wbsio.4:1.4 src/share/man/man4/wbsio.4:1.5 --- src/share/man/man4/wbsio.4:1.4 Wed Jul 12 04:38:40 2017 +++ src/share/man/man4/wbsio.4 Wed Jul 12 05:26:42 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: wbsio.4,v 1.4 2017/07/12 04:38:40 msaitoh Exp $ +.\" $NetBSD: wbsio.4,v 1.5 2017/07/12 05:26:42 pgoyette Exp $ .\" $OpenBSD: wbsio.4,v 1.2 2008/02/17 16:48:47 jmc Exp $ .\" .\" Copyright (c) 2008 Mark Kettenis @@ -28,7 +28,7 @@ .Sh DESCRIPTION The .Nm -driver provides support for the Winbond(was spun off as Nuvoton) LPC Super I/O +driver provides support for the Winbond (was spun off as Nuvoton) LPC Super I/O ICs. Only the hardware monitoring function is currently supported. .Pp
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Wed Jul 12 04:39:25 UTC 2017 Modified Files: src/share/man/man4: lm.4 Log Message: - Add new Nuvoton devices. - Add CAVEATS section from OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/lm.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/lm.4 diff -u src/share/man/man4/lm.4:1.32 src/share/man/man4/lm.4:1.33 --- src/share/man/man4/lm.4:1.32 Sun Feb 21 05:16:29 2010 +++ src/share/man/man4/lm.4 Wed Jul 12 04:39:25 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: lm.4,v 1.32 2010/02/21 05:16:29 cnst Exp $ +.\" $NetBSD: lm.4,v 1.33 2017/07/12 04:39:25 msaitoh Exp $ .\" .\" Copyright (c) 2000 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 February 16, 2010 +.Dd July 12, 2017 .Dt LM 4 .Os .Sh NAME @@ -51,7 +51,7 @@ the .Xr envsys 4 API. .Pp -Most supported devices possess 11 sensors: +The original LM78 hardware monitor supports 11 sensors: .Bl -column "Sensor" "Units" "Typical" -offset indent .It Sy "Sensor" Ta Sy "Units" Ta Sy "Typical Use" .It Li "IN0" Ta "uV DC" Ta "Core voltage" @@ -66,8 +66,7 @@ Most supported devices possess 11 sensor .It Li "Fan1" Ta "RPM" Ta "Chassis Fan" .It Li "Fan2" Ta "RPM" Ta "Fan" .El -for some devices (most Winbond devices) sensor names and numbers will be -different. +For other devices, sensors' names and numbers will be different. .Pp Due to hardware limitations, fresh sensor data is only available every 2 seconds. @@ -85,6 +84,19 @@ driver include: and .Em LM81 . .It +.Tn Nuvoton +.Em NCT5104D , +.Em NCT6775F , +.Em NCT6776F , +.Em NCT6102D , +.Em NCT6104D , +.Em NCT6106D , +.Em NCT6779D , +.Em NCT6791D , +.Em NCT6792D , +.Em NCT6793D , +.Em NCT6795D . +.It .Tn Winbond .Em W83627HF* , .Em W83627THF* , @@ -124,6 +136,10 @@ The .Nm device appeared in .Nx 1.5 . +.Sh CAVEATS +Some vendors connect these chips to non-standard thermal diodes and +resistors. +This will result in bogus sensor values. .Sh BUGS Interrupt support is unimplemented. .Pp
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Wed Jul 12 04:38:40 UTC 2017 Modified Files: src/share/man/man4: wbsio.4 Log Message: Add note about Nuvoton. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/wbsio.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/wbsio.4 diff -u src/share/man/man4/wbsio.4:1.3 src/share/man/man4/wbsio.4:1.4 --- src/share/man/man4/wbsio.4:1.3 Tue Mar 18 18:20:39 2014 +++ src/share/man/man4/wbsio.4 Wed Jul 12 04:38:40 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: wbsio.4,v 1.3 2014/03/18 18:20:39 riastradh Exp $ +.\" $NetBSD: wbsio.4,v 1.4 2017/07/12 04:38:40 msaitoh Exp $ .\" $OpenBSD: wbsio.4,v 1.2 2008/02/17 16:48:47 jmc Exp $ .\" .\" Copyright (c) 2008 Mark Kettenis @@ -15,12 +15,12 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd February 16, 2010 +.Dd July 12, 2017 .Dt WBSIO 4 .Os .Sh NAME .Nm wbsio -.Nd Winbond LPC Super I/O +.Nd Winbond(Nuvoton) LPC Super I/O .Sh SYNOPSIS .Cd "wbsio* at isa? port 0x2e" .Cd "wbsio* at isa? port 0x4e" @@ -28,7 +28,8 @@ .Sh DESCRIPTION The .Nm -driver provides support for the Winbond LPC Super I/O ICs. +driver provides support for the Winbond(was spun off as Nuvoton) LPC Super I/O +ICs. Only the hardware monitoring function is currently supported. .Pp Support for the hardware monitor function is provided through the
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 12 03:59:32 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Omit NULL checks for sav->lft_c
sav->lft_c can be NULL only when initializing or destroying sav.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.177 src/sys/netipsec/key.c:1.178
--- src/sys/netipsec/key.c:1.177 Wed Jul 12 03:53:55 2017
+++ src/sys/netipsec/key.c Wed Jul 12 03:59:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.177 2017/07/12 03:53:55 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.178 2017/07/12 03:59:32 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.177 2017/07/12 03:53:55 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.178 2017/07/12 03:59:32 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -3461,8 +3461,7 @@ key_setdumpsa(struct secasvar *sav, u_in
break;
case SADB_EXT_LIFETIME_CURRENT:
- if (!sav->lft_c)
-continue;
+ KASSERT(sav->lft_c != NULL);
l = PFKEY_UNUNIT64(((struct sadb_ext *)sav->lft_c)->sadb_ext_len);
memcpy(<, sav->lft_c, sizeof(struct sadb_lifetime));
lt.sadb_lifetime_addtime =
@@ -4478,11 +4477,7 @@ key_timehandler_sad(time_t now)
continue;
/* sanity check */
- if (sav->lft_c == NULL) {
-IPSECLOG(LOG_DEBUG,
-"There is no CURRENT time, why?\n");
-continue;
- }
+ KASSERT(sav->lft_c != NULL);
/* check SOFT lifetime */
if (sav->lft_s->sadb_lifetime_addtime != 0 &&
@@ -4532,11 +4527,7 @@ key_timehandler_sad(time_t now)
continue;
/* sanity check */
- if (sav->lft_c == NULL) {
-IPSECLOG(LOG_DEBUG,
-"There is no CURRENT time, why?\n");
-continue;
- }
+ KASSERT(sav->lft_c != NULL);
if (sav->lft_h->sadb_lifetime_addtime != 0 &&
now - sav->created > sav->lft_h->sadb_lifetime_addtime) {
@@ -7780,9 +7771,8 @@ key_sa_recordxfer(struct secasvar *sav,
{
KASSERT(sav != NULL);
+ KASSERT(sav->lft_c != NULL);
KASSERT(m != NULL);
- if (!sav->lft_c)
- return;
/*
* XXX Currently, there is a difference of bytes size
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 12 03:53:55 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Simplify; remove unnecessary zero-clears
key_freesaval is used only when a target sav is being destroyed.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.176 src/sys/netipsec/key.c:1.177
--- src/sys/netipsec/key.c:1.176 Tue Jul 11 10:06:07 2017
+++ src/sys/netipsec/key.c Wed Jul 12 03:53:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.176 2017/07/11 10:06:07 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.177 2017/07/12 03:53:55 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.176 2017/07/11 10:06:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.177 2017/07/12 03:53:55 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -3099,33 +3099,20 @@ static void
key_freesaval(struct secasvar *sav)
{
- if (sav->replay != NULL) {
+ KASSERT(sav->refcnt == 0);
+
+ if (sav->replay != NULL)
kmem_intr_free(sav->replay, sav->replay_len);
- sav->replay = NULL;
- sav->replay_len = 0;
- }
- if (sav->key_auth != NULL) {
+ if (sav->key_auth != NULL)
kmem_intr_free(sav->key_auth, sav->key_auth_len);
- sav->key_auth = NULL;
- sav->key_auth_len = 0;
- }
- if (sav->key_enc != NULL) {
+ if (sav->key_enc != NULL)
kmem_intr_free(sav->key_enc, sav->key_enc_len);
- sav->key_enc = NULL;
- sav->key_enc_len = 0;
- }
- if (sav->lft_c != NULL) {
+ if (sav->lft_c != NULL)
kmem_intr_free(sav->lft_c, sizeof(*(sav->lft_c)));
- sav->lft_c = NULL;
- }
- if (sav->lft_h != NULL) {
+ if (sav->lft_h != NULL)
kmem_intr_free(sav->lft_h, sizeof(*(sav->lft_h)));
- sav->lft_h = NULL;
- }
- if (sav->lft_s != NULL) {
+ if (sav->lft_s != NULL)
kmem_intr_free(sav->lft_s, sizeof(*(sav->lft_s)));
- sav->lft_s = NULL;
- }
}
/*
CVS commit: src/usr.sbin/isdn/isdnd
Module Name:src Committed By: christos Date: Wed Jul 12 01:57:43 UTC 2017 Modified Files: src/usr.sbin/isdn/isdnd: isdnd.8 Log Message: PR/52396: Edgar Pettijohn: Spell daemon consistently. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/isdn/isdnd/isdnd.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/isdn/isdnd/isdnd.8 diff -u src/usr.sbin/isdn/isdnd/isdnd.8:1.15 src/usr.sbin/isdn/isdnd/isdnd.8:1.16 --- src/usr.sbin/isdn/isdnd/isdnd.8:1.15 Mon Jul 3 17:35:30 2017 +++ src/usr.sbin/isdn/isdnd/isdnd.8 Tue Jul 11 21:57:43 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: isdnd.8,v 1.15 2017/07/03 21:35:30 wiz Exp $ +.\" $NetBSD: isdnd.8,v 1.16 2017/07/12 01:57:43 christos Exp $ .\" .\" Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved. .\" @@ -23,13 +23,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: isdnd.8,v 1.15 2017/07/03 21:35:30 wiz Exp $ +.\" $Id: isdnd.8,v 1.16 2017/07/12 01:57:43 christos Exp $ .\" .\" $FreeBSD$ .\" .\" last edit-date: [Tue May 2 13:45:12 2000] .\" -.Dd April 5, 2012 +.Dd July 11, 2017 .Dt ISDND 8 .Os .Sh NAME @@ -51,7 +51,7 @@ .Op Fl m .Sh DESCRIPTION .Nm -is the isdn4bsd package demon which manages all ISDN related connection +is the isdn4bsd package daemon which manages all ISDN related connection and disconnection of ISDN devices supported by the package. .Pp The options are as follows:
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Tue Jul 11 21:52:55 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c
Log Message:
fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3 Tue Jul 11 13:45:31 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c Tue Jul 11 17:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ticket.c,v 1.3 2017/07/11 17:45:31 christos Exp $ */
+/* $NetBSD: ticket.c,v 1.4 2017/07/11 21:52:54 christos Exp $ */
/*
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -708,7 +708,7 @@ _krb5_extract_ticket(krb5_context contex
ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
rep->enc_part.sname,
- rep->enc_part.realm);
+ rep->enc_part.srealm);
if (ret)
goto out;
if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Tue Jul 11 21:29:39 UTC 2017 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1421, 1424, 1447, 1459 To generate a diff of this commit: cvs rdiff -u -r1.1.2.288 -r1.1.2.289 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.288 src/doc/CHANGES-6.2:1.1.2.289 --- src/doc/CHANGES-6.2:1.1.2.288 Thu Jul 6 15:30:16 2017 +++ src/doc/CHANGES-6.2 Tue Jul 11 21:29:39 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.288 2017/07/06 15:30:16 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.289 2017/07/11 21:29:39 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -17926,3 +17926,28 @@ sys/miscfs/procfs/procfs_map.c 1.45 up and do what linux does (support reading from an offset). [tsutsui, ticket #1434] +common/lib/libc/stdlib/_strtoul.h 1.10 + + Set *endptr in all paths out of strtoul and family. + [riastradh, ticket #1421] + +sbin/ping/ping.c1.113 via patch + + PR bin/36997 Zafer Aydogan: ping doesn't validate numeric inputs + enough. + [dholland, ticket #1424] + +etc/ssh/ssh_known_hosts1.10 + + add ssh-ed25519 keys + verify keys (split vir functions off from mollari) + [spz, ticket #1447] + +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/dix/events.c patch +xsrc/external/mit/xorg-server/dist/dix/swapreq.c patch +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c patch + + Fix CVE-2017-10971 and CVE-2017-10972. + [mrg, ticket #1459] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Tue Jul 11 21:29:14 UTC 2017 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1421, 1424, 1447, 1459 To generate a diff of this commit: cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-6.1.6 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-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.95 src/doc/CHANGES-6.1.6:1.1.2.96 --- src/doc/CHANGES-6.1.6:1.1.2.95 Thu Jul 6 15:19:22 2017 +++ src/doc/CHANGES-6.1.6 Tue Jul 11 21:29:14 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.95 2017/07/06 15:19:22 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.96 2017/07/11 21:29:14 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -11945,3 +11945,28 @@ sys/kern/subr_xcall.c1.19 Fix a race condition of low priority xcall. PR kern/51632. [ozaki-r, ticket #1419] +common/lib/libc/stdlib/_strtoul.h 1.10 + + Set *endptr in all paths out of strtoul and family. + [riastradh, ticket #1421] + +sbin/ping/ping.c1.113 via patch + + PR bin/36997 Zafer Aydogan: ping doesn't validate numeric inputs + enough. + [dholland, ticket #1424] + +etc/ssh/ssh_known_hosts1.10 + + add ssh-ed25519 keys + verify keys (split vir functions off from mollari) + [spz, ticket #1447] + +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/dix/events.c patch +xsrc/external/mit/xorg-server/dist/dix/swapreq.c patch +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c patch + + Fix CVE-2017-10971 and CVE-2017-10972. + [mrg, ticket #1459] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Tue Jul 11 21:28:11 UTC 2017 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1421, 1424, 1447, 1459 To generate a diff of this commit: cvs rdiff -u -r1.1.2.97 -r1.1.2.98 src/doc/CHANGES-6.0.7 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-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.97 src/doc/CHANGES-6.0.7:1.1.2.98 --- src/doc/CHANGES-6.0.7:1.1.2.97 Thu Jul 6 15:18:44 2017 +++ src/doc/CHANGES-6.0.7 Tue Jul 11 21:28:11 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.97 2017/07/06 15:18:44 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.98 2017/07/11 21:28:11 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -12246,3 +12246,28 @@ sys/kern/subr_xcall.c1.19 Fix a race condition of low priority xcall. PR kern/51632. [ozaki-r, ticket #1419] +common/lib/libc/stdlib/_strtoul.h 1.10 + + Set *endptr in all paths out of strtoul and family. + [riastradh, ticket #1421] + +sbin/ping/ping.c1.113 via patch + + PR bin/36997 Zafer Aydogan: ping doesn't validate numeric inputs + enough. + [dholland, ticket #1424] + +etc/ssh/ssh_known_hosts1.10 + + add ssh-ed25519 keys + verify keys (split vir functions off from mollari) + [spz, ticket #1447] + +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/dix/events.c patch +xsrc/external/mit/xorg-server/dist/dix/swapreq.c patch +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c patch + + Fix CVE-2017-10971 and CVE-2017-10972. + [mrg, ticket #1459] +
CVS commit: [netbsd-6] xsrc
Module Name:xsrc
Committed By: snj
Date: Tue Jul 11 21:25:37 UTC 2017
Modified Files:
xsrc/external/mit/xorg-server/dist/Xi [netbsd-6]: sendexev.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-6]: events.c swapreq.c
xsrc/xfree/xc/programs/Xserver/Xi [netbsd-6]: sendexev.c
Log Message:
Apply patch (requested by mrg in ticket #1459):
Fix CVE-2017-10971 and CVE-2017-10972.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \
xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
xsrc/external/mit/xorg-server/dist/dix/swapreq.c
cvs rdiff -u -r1.1.1.4.28.1 -r1.1.1.4.28.2 \
xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
diff -u xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.2.1 xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.2.2
--- xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.2.1 Tue Dec 9 19:43:12 2014
+++ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c Tue Jul 11 21:25:37 2017
@@ -79,7 +79,7 @@ SProcXSendExtensionEvent(ClientPtr clien
char n;
CARD32 *p;
int i;
-xEvent eventT;
+xEvent eventT = { .u.u.type = 0 };
xEvent *eventP;
EventSwapPtr proc;
@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr clien
eventP = (xEvent *) & stuff[1];
for (i = 0; i < stuff->num_events; i++, eventP++) {
+if (eventP->u.u.type == GenericEvent) {
+client->errorValue = eventP->u.u.type;
+return BadValue;
+}
+
proc = EventSwapVector[eventP->u.u.type & 0177];
- if (proc == NotImplemented) /* no swapping proc; invalid event type? */
+/* no swapping proc; invalid event type? */
+if (proc == NotImplemented) {
+client->errorValue = eventP->u.u.type;
return BadValue;
+}
(*proc) (eventP, &eventT);
*eventP = eventT;
}
@@ -117,7 +125,7 @@ SProcXSendExtensionEvent(ClientPtr clien
int
ProcXSendExtensionEvent(ClientPtr client)
{
-int ret;
+int ret, i;
DeviceIntPtr dev;
xEvent *first;
XEventClass *list;
@@ -140,10 +148,12 @@ ProcXSendExtensionEvent(ClientPtr client
/* The client's event type must be one defined by an extension. */
first = ((xEvent *) & stuff[1]);
-if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
- (first->u.u.type < lastEvent))) {
- client->errorValue = first->u.u.type;
- return BadValue;
+for (i = 0; i < stuff->num_events; i++) {
+if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) &&
+(first[i].u.u.type < lastEvent))) {
+client->errorValue = first[i].u.u.type;
+return BadValue;
+}
}
list = (XEventClass *) (first + stuff->num_events);
Index: xsrc/external/mit/xorg-server/dist/dix/events.c
diff -u xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7 xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7.2.1
--- xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7 Tue Aug 2 06:56:45 2011
+++ xsrc/external/mit/xorg-server/dist/dix/events.c Tue Jul 11 21:25:37 2017
@@ -5009,6 +5009,12 @@ ProcSendEvent(ClientPtr client)
client->errorValue = stuff->event.u.u.type;
return BadValue;
}
+/* Generic events can have variable size, but SendEvent request holds
+ exactly 32B of event data. */
+if (stuff->event.u.u.type == GenericEvent) {
+client->errorValue = stuff->event.u.u.type;
+return BadValue;
+}
if (stuff->event.u.u.type == ClientMessage &&
stuff->event.u.u.detail != 8 &&
stuff->event.u.u.detail != 16 &&
Index: xsrc/external/mit/xorg-server/dist/dix/swapreq.c
diff -u xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2.2.1
--- xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2 Tue Nov 23 05:21:00 2010
+++ xsrc/external/mit/xorg-server/dist/dix/swapreq.c Tue Jul 11 21:25:37 2017
@@ -315,6 +315,13 @@ SProcSendEvent(ClientPtr client)
swapl(&stuff->destination, n);
swapl(&stuff->eventMask, n);
+/* Generic events can have variable size, but SendEvent request holds
+ exactly 32B of event data. */
+if (stuff->event.u.u.type == GenericEvent) {
+client->errorValue = stuff->event.u.u.type;
+return BadValue;
+}
+
/* Swap event */
proc = EventSwapVector[stuff->event.u.u.type & 0177];
if (!proc || proc == NotImplemented)/* no swapping proc; invalid event type? */
Index: xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
diff -u xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.1.1.4.28.1 xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.1.1.4.28.2
--- xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.1.1.4.
CVS commit: [netbsd-6-1] xsrc
Module Name:xsrc
Committed By: snj
Date: Tue Jul 11 21:25:22 UTC 2017
Modified Files:
xsrc/external/mit/xorg-server/dist/Xi [netbsd-6-1]: sendexev.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-6-1]: events.c swapreq.c
xsrc/xfree/xc/programs/Xserver/Xi [netbsd-6-1]: sendexev.c
Log Message:
Apply patch (requested by mrg in ticket #1459):
Fix CVE-2017-10971 and CVE-2017-10972.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.6.1 -r1.1.1.3.6.2 \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.6.1 \
xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
xsrc/external/mit/xorg-server/dist/dix/swapreq.c
cvs rdiff -u -r1.1.1.4.34.1 -r1.1.1.4.34.2 \
xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
diff -u xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.6.1 xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.6.2
--- xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.6.1 Tue Dec 9 19:46:20 2014
+++ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c Tue Jul 11 21:25:22 2017
@@ -79,7 +79,7 @@ SProcXSendExtensionEvent(ClientPtr clien
char n;
CARD32 *p;
int i;
-xEvent eventT;
+xEvent eventT = { .u.u.type = 0 };
xEvent *eventP;
EventSwapPtr proc;
@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr clien
eventP = (xEvent *) & stuff[1];
for (i = 0; i < stuff->num_events; i++, eventP++) {
+if (eventP->u.u.type == GenericEvent) {
+client->errorValue = eventP->u.u.type;
+return BadValue;
+}
+
proc = EventSwapVector[eventP->u.u.type & 0177];
- if (proc == NotImplemented) /* no swapping proc; invalid event type? */
+/* no swapping proc; invalid event type? */
+if (proc == NotImplemented) {
+client->errorValue = eventP->u.u.type;
return BadValue;
+}
(*proc) (eventP, &eventT);
*eventP = eventT;
}
@@ -117,7 +125,7 @@ SProcXSendExtensionEvent(ClientPtr clien
int
ProcXSendExtensionEvent(ClientPtr client)
{
-int ret;
+int ret, i;
DeviceIntPtr dev;
xEvent *first;
XEventClass *list;
@@ -140,10 +148,12 @@ ProcXSendExtensionEvent(ClientPtr client
/* The client's event type must be one defined by an extension. */
first = ((xEvent *) & stuff[1]);
-if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
- (first->u.u.type < lastEvent))) {
- client->errorValue = first->u.u.type;
- return BadValue;
+for (i = 0; i < stuff->num_events; i++) {
+if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) &&
+(first[i].u.u.type < lastEvent))) {
+client->errorValue = first[i].u.u.type;
+return BadValue;
+}
}
list = (XEventClass *) (first + stuff->num_events);
Index: xsrc/external/mit/xorg-server/dist/dix/events.c
diff -u xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7 xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7.6.1
--- xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7 Tue Aug 2 06:56:45 2011
+++ xsrc/external/mit/xorg-server/dist/dix/events.c Tue Jul 11 21:25:22 2017
@@ -5009,6 +5009,12 @@ ProcSendEvent(ClientPtr client)
client->errorValue = stuff->event.u.u.type;
return BadValue;
}
+/* Generic events can have variable size, but SendEvent request holds
+ exactly 32B of event data. */
+if (stuff->event.u.u.type == GenericEvent) {
+client->errorValue = stuff->event.u.u.type;
+return BadValue;
+}
if (stuff->event.u.u.type == ClientMessage &&
stuff->event.u.u.detail != 8 &&
stuff->event.u.u.detail != 16 &&
Index: xsrc/external/mit/xorg-server/dist/dix/swapreq.c
diff -u xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2.6.1
--- xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2 Tue Nov 23 05:21:00 2010
+++ xsrc/external/mit/xorg-server/dist/dix/swapreq.c Tue Jul 11 21:25:22 2017
@@ -315,6 +315,13 @@ SProcSendEvent(ClientPtr client)
swapl(&stuff->destination, n);
swapl(&stuff->eventMask, n);
+/* Generic events can have variable size, but SendEvent request holds
+ exactly 32B of event data. */
+if (stuff->event.u.u.type == GenericEvent) {
+client->errorValue = stuff->event.u.u.type;
+return BadValue;
+}
+
/* Swap event */
proc = EventSwapVector[stuff->event.u.u.type & 0177];
if (!proc || proc == NotImplemented)/* no swapping proc; invalid event type? */
Index: xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
diff -u xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.1.1.4.34.1 xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.1.1.4.34.2
--- xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.
CVS commit: [netbsd-6-0] xsrc
Module Name:xsrc
Committed By: snj
Date: Tue Jul 11 21:24:02 UTC 2017
Modified Files:
xsrc/external/mit/xorg-server/dist/Xi [netbsd-6-0]: sendexev.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-6-0]: events.c swapreq.c
xsrc/xfree/xc/programs/Xserver/Xi [netbsd-6-0]: sendexev.c
Log Message:
Apply patch (requested by mrg in ticket #1459):
Fix CVE-2017-10971 and CVE-2017-10972.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.4.1 -r1.1.1.3.4.2 \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \
xsrc/external/mit/xorg-server/dist/dix/swapreq.c
cvs rdiff -u -r1.1.1.4.30.1 -r1.1.1.4.30.2 \
xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
diff -u xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.4.1 xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.4.2
--- xsrc/external/mit/xorg-server/dist/Xi/sendexev.c:1.1.1.3.4.1 Tue Dec 9 19:44:40 2014
+++ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c Tue Jul 11 21:24:01 2017
@@ -79,7 +79,7 @@ SProcXSendExtensionEvent(ClientPtr clien
char n;
CARD32 *p;
int i;
-xEvent eventT;
+xEvent eventT = { .u.u.type = 0 };
xEvent *eventP;
EventSwapPtr proc;
@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr clien
eventP = (xEvent *) & stuff[1];
for (i = 0; i < stuff->num_events; i++, eventP++) {
+if (eventP->u.u.type == GenericEvent) {
+client->errorValue = eventP->u.u.type;
+return BadValue;
+}
+
proc = EventSwapVector[eventP->u.u.type & 0177];
- if (proc == NotImplemented) /* no swapping proc; invalid event type? */
+/* no swapping proc; invalid event type? */
+if (proc == NotImplemented) {
+client->errorValue = eventP->u.u.type;
return BadValue;
+}
(*proc) (eventP, &eventT);
*eventP = eventT;
}
@@ -117,7 +125,7 @@ SProcXSendExtensionEvent(ClientPtr clien
int
ProcXSendExtensionEvent(ClientPtr client)
{
-int ret;
+int ret, i;
DeviceIntPtr dev;
xEvent *first;
XEventClass *list;
@@ -140,10 +148,12 @@ ProcXSendExtensionEvent(ClientPtr client
/* The client's event type must be one defined by an extension. */
first = ((xEvent *) & stuff[1]);
-if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
- (first->u.u.type < lastEvent))) {
- client->errorValue = first->u.u.type;
- return BadValue;
+for (i = 0; i < stuff->num_events; i++) {
+if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) &&
+(first[i].u.u.type < lastEvent))) {
+client->errorValue = first[i].u.u.type;
+return BadValue;
+}
}
list = (XEventClass *) (first + stuff->num_events);
Index: xsrc/external/mit/xorg-server/dist/dix/events.c
diff -u xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7 xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7.4.1
--- xsrc/external/mit/xorg-server/dist/dix/events.c:1.1.1.7 Tue Aug 2 06:56:45 2011
+++ xsrc/external/mit/xorg-server/dist/dix/events.c Tue Jul 11 21:24:02 2017
@@ -5009,6 +5009,12 @@ ProcSendEvent(ClientPtr client)
client->errorValue = stuff->event.u.u.type;
return BadValue;
}
+/* Generic events can have variable size, but SendEvent request holds
+ exactly 32B of event data. */
+if (stuff->event.u.u.type == GenericEvent) {
+client->errorValue = stuff->event.u.u.type;
+return BadValue;
+}
if (stuff->event.u.u.type == ClientMessage &&
stuff->event.u.u.detail != 8 &&
stuff->event.u.u.detail != 16 &&
Index: xsrc/external/mit/xorg-server/dist/dix/swapreq.c
diff -u xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2.4.1
--- xsrc/external/mit/xorg-server/dist/dix/swapreq.c:1.1.1.2 Tue Nov 23 05:21:00 2010
+++ xsrc/external/mit/xorg-server/dist/dix/swapreq.c Tue Jul 11 21:24:02 2017
@@ -315,6 +315,13 @@ SProcSendEvent(ClientPtr client)
swapl(&stuff->destination, n);
swapl(&stuff->eventMask, n);
+/* Generic events can have variable size, but SendEvent request holds
+ exactly 32B of event data. */
+if (stuff->event.u.u.type == GenericEvent) {
+client->errorValue = stuff->event.u.u.type;
+return BadValue;
+}
+
/* Swap event */
proc = EventSwapVector[stuff->event.u.u.type & 0177];
if (!proc || proc == NotImplemented)/* no swapping proc; invalid event type? */
Index: xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
diff -u xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.1.1.4.30.1 xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.1.1.4.30.2
--- xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c:1.
CVS commit: src/external/gpl3/binutils/usr.sbin/dbsym
Module Name:src
Committed By: joerg
Date: Tue Jul 11 21:19:42 UTC 2017
Modified Files:
src/external/gpl3/binutils/usr.sbin/dbsym: dbsym.c
Log Message:
Allocate enough memory.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/usr.sbin/dbsym/dbsym.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/gpl3/binutils/usr.sbin/dbsym/dbsym.c
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/dbsym.c:1.5 src/external/gpl3/binutils/usr.sbin/dbsym/dbsym.c:1.6
--- src/external/gpl3/binutils/usr.sbin/dbsym/dbsym.c:1.5 Thu Jul 6 02:34:00 2017
+++ src/external/gpl3/binutils/usr.sbin/dbsym/dbsym.c Tue Jul 11 21:19:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dbsym.c,v 1.5 2017/07/06 02:34:00 chs Exp $ */
+/* $NetBSD: dbsym.c,v 1.6 2017/07/11 21:19:42 joerg Exp $ */
/*
* Copyright (c) 2001 Simon Burge (for Wasabi Systems)
@@ -39,7 +39,7 @@
__COPYRIGHT("@(#) Copyright (c) 1996 Christopher G. Demetriou.\
Copyright 2001 Simon Burge.\
All rights reserved.");
-__RCSID("$NetBSD: dbsym.c,v 1.5 2017/07/06 02:34:00 chs Exp $");
+__RCSID("$NetBSD: dbsym.c,v 1.6 2017/07/11 21:19:42 joerg Exp $");
#endif /* not lint */
#include
@@ -426,7 +426,7 @@ load_symtab(bfd *abfd, int fd, char **sy
shstridx = (ISELF64
? bfd_get_16(abfd, e64_hdr.e_shstrndx)
: bfd_get_16(abfd, e32_hdr.e_shstrndx));
- shstrtab = malloc(shstridx);
+ shstrtab = malloc(SH_SIZE(shstridx));
if (shstrtab == NULL)
goto out;
if (pread(fd, shstrtab, SH_SIZE(shstridx), SH_OFFSET(shstridx)) !=
CVS commit: [netbsd-6] src/etc/ssh
Module Name:src Committed By: snj Date: Tue Jul 11 21:18:32 UTC 2017 Modified Files: src/etc/ssh [netbsd-6]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #1447): etc/ssh/ssh_known_hosts: revision 1.10 add ssh-ed25519 keys verify keys (split vir functions off from mollari) To generate a diff of this commit: cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.6.2 src/etc/ssh/ssh_known_hosts:1.7.6.3 --- src/etc/ssh/ssh_known_hosts:1.7.6.2 Fri May 6 18:37:38 2016 +++ src/etc/ssh/ssh_known_hosts Tue Jul 11 21:18:32 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.6.2 2016/05/06 18:37:38 snj Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.6.3 2017/07/11 21:18:32 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -6,49 +6,85 @@ anoncvs.netbsd.org ecdsa-sha2-nistp521 A # cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IKs9vV7cSDdIw8hFUiIA+T9QIaZeLi963yuwe8zoCnsJ + cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q== # ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + +morden.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== morden.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== # mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= +mail.netbsd.org,homeworld.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IFnVCBKDY0sNBJM4ip5Ql0KPsDAmQ+URkOelrQPO1ojv + mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ== # pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= +pkgbuild.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IINkiJ9FjD7QWexC7bssHKVe+ZbMYMWnltwzgZmloZKz + pkgbuild.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ== # build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= +build.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ICUM7QeCYsh/mqacK2ZARQrmYtTeB+PWg5FiMruS+xhz + build.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAHYkX/uBJWozv+YkhVu4lvyPw8vlmD8oElKC3jNi2fWiW
CVS commit: [netbsd-6-1] src/etc/ssh
Module Name:src Committed By: snj Date: Tue Jul 11 21:18:03 UTC 2017 Modified Files: src/etc/ssh [netbsd-6-1]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #1447): etc/ssh/ssh_known_hosts: revision 1.10 add ssh-ed25519 keys verify keys (split vir functions off from mollari) To generate a diff of this commit: cvs rdiff -u -r1.7.20.2 -r1.7.20.3 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.20.2 src/etc/ssh/ssh_known_hosts:1.7.20.3 --- src/etc/ssh/ssh_known_hosts:1.7.20.2 Fri May 6 18:37:59 2016 +++ src/etc/ssh/ssh_known_hosts Tue Jul 11 21:18:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.20.2 2016/05/06 18:37:59 snj Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.20.3 2017/07/11 21:18:03 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -6,49 +6,85 @@ anoncvs.netbsd.org ecdsa-sha2-nistp521 A # cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IKs9vV7cSDdIw8hFUiIA+T9QIaZeLi963yuwe8zoCnsJ + cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q== # ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + +morden.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== morden.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== # mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= +mail.netbsd.org,homeworld.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IFnVCBKDY0sNBJM4ip5Ql0KPsDAmQ+URkOelrQPO1ojv + mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ== # pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= +pkgbuild.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IINkiJ9FjD7QWexC7bssHKVe+ZbMYMWnltwzgZmloZKz + pkgbuild.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ== # build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= +build.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ICUM7QeCYsh/mqacK2ZARQrmYtTeB+PWg5FiMruS+xhz + build.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAHYkX/uBJWozv+YkhVu4lvyPw8vlmD8oElKC
CVS commit: [netbsd-6-0] src/etc/ssh
Module Name:src Committed By: snj Date: Tue Jul 11 21:17:37 UTC 2017 Modified Files: src/etc/ssh [netbsd-6-0]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #1447): etc/ssh/ssh_known_hosts: revision 1.10 add ssh-ed25519 keys verify keys (split vir functions off from mollari) To generate a diff of this commit: cvs rdiff -u -r1.7.12.2 -r1.7.12.3 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.7.12.2 src/etc/ssh/ssh_known_hosts:1.7.12.3 --- src/etc/ssh/ssh_known_hosts:1.7.12.2 Fri May 6 18:38:26 2016 +++ src/etc/ssh/ssh_known_hosts Tue Jul 11 21:17:37 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ssh_known_hosts,v 1.7.12.2 2016/05/06 18:38:26 snj Exp $ +# $NetBSD: ssh_known_hosts,v 1.7.12.3 2017/07/11 21:17:37 snj Exp $ # anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= @@ -6,49 +6,85 @@ anoncvs.netbsd.org ecdsa-sha2-nistp521 A # cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IKs9vV7cSDdIw8hFUiIA+T9QIaZeLi963yuwe8zoCnsJ + cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q== # ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + +morden.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh + ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== morden.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A== # mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= +mail.netbsd.org,homeworld.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IFnVCBKDY0sNBJM4ip5Ql0KPsDAmQ+URkOelrQPO1ojv + mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ== # pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= +pkgbuild.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IINkiJ9FjD7QWexC7bssHKVe+ZbMYMWnltwzgZmloZKz + pkgbuild.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ== # build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= +build.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ICUM7QeCYsh/mqacK2ZARQrmYtTeB+PWg5FiMruS+xhz + build.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAHYkX/uBJWozv+YkhVu4lvyPw8vlmD8oElKC
CVS commit: [netbsd-6] src/sbin/ping
Module Name:src
Committed By: snj
Date: Tue Jul 11 21:16:07 UTC 2017
Modified Files:
src/sbin/ping [netbsd-6]: ping.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1424):
sbin/ping/ping.c: revision 1.113 via patch
PR bin/36997 Zafer Aydogan: ping doesn't validate numeric inputs enough.
Check for values between INT_MAX and LONG_MAX (if they're different)
when using strtol to get an int. This applies to the -c and -l options;
the other uses were already checked.
Also limit the inter-packet interval given with -i to values that
don't cause integer overflow calling poll() with milliseconds.
Really large intervals (the number is read as floating point) can
produce positive poll() values but negative integers when converted to
struct timespec; this produces behavior akin to using -l at first and
could be construed as a local DoS vulnerability.
To generate a diff of this commit:
cvs rdiff -u -r1.102.2.1 -r1.102.2.2 src/sbin/ping/ping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.102.2.1 src/sbin/ping/ping.c:1.102.2.2
--- src/sbin/ping/ping.c:1.102.2.1 Tue Oct 23 19:44:44 2012
+++ src/sbin/ping/ping.c Tue Jul 11 21:16:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $ */
+/* $NetBSD: ping.c,v 1.102.2.2 2017/07/11 21:16:07 snj Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $");
+__RCSID("$NetBSD: ping.c,v 1.102.2.2 2017/07/11 21:16:07 snj Exp $");
#endif
#include
@@ -291,9 +291,17 @@ main(int argc, char *argv[])
compat = 1;
break;
case 'c':
- npackets = strtol(optarg, &p, 0);
- if (*p != '\0' || npackets <= 0)
-errx(1, "Bad/invalid number of packets");
+ l = strtol(optarg, &p, 0);
+ if (*p != '\0' || l <= 0)
+errx(EXIT_FAILURE,
+"Bad/invalid number of packets: %s",
+optarg);
+#if INT_MAX < LONG_MAX
+ if (l > INT_MAX)
+errx(EXIT_FAILURE,
+"Too many packets to count: %ld", l);
+#endif
+ npackets = l;
break;
case 'D':
pingflags |= F_DF;
@@ -310,13 +318,29 @@ main(int argc, char *argv[])
case 'i': /* wait between sending packets */
interval = strtod(optarg, &p);
if (*p != '\0' || interval <= 0)
-errx(1, "Bad/invalid interval %s", optarg);
+errx(EXIT_FAILURE, "Bad/invalid interval: %s",
+optarg);
+ /*
+ * In order to avoid overflowing the microseconds
+ * argument of poll() the interval must be less than
+ * INT_MAX/1000. Limit it to one second less than
+ * that to be safe.
+ */
+ if (interval >= INT_MAX/1000.0 - 1.0)
+errx(EXIT_FAILURE,
+"Timing interval %g too large", interval);
break;
case 'l':
- preload = strtol(optarg, &p, 0);
- if (*p != '\0' || preload < 0)
-errx(1, "Bad/invalid preload value %s",
- optarg);
+ l = strtol(optarg, &p, 0);
+ if (*p != '\0' || l < 0)
+errx(EXIT_FAILURE, "Bad/invalid preload value: "
+"%s", optarg);
+#if INT_MAX < LONG_MAX
+ if (l > INT_MAX)
+errx(EXIT_FAILURE,
+"Too many preload packets: %ld", l);
+#endif
+ preload = l;
break;
case 'n':
pingflags |= F_NUMERIC;
CVS commit: [netbsd-6-0] src/sbin/ping
Module Name:src
Committed By: snj
Date: Tue Jul 11 21:15:23 UTC 2017
Modified Files:
src/sbin/ping [netbsd-6-0]: ping.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1424):
sbin/ping/ping.c: revision 1.113 via patch
PR bin/36997 Zafer Aydogan: ping doesn't validate numeric inputs enough.
Check for values between INT_MAX and LONG_MAX (if they're different)
when using strtol to get an int. This applies to the -c and -l options;
the other uses were already checked.
Also limit the inter-packet interval given with -i to values that
don't cause integer overflow calling poll() with milliseconds.
Really large intervals (the number is read as floating point) can
produce positive poll() values but negative integers when converted to
struct timespec; this produces behavior akin to using -l at first and
could be construed as a local DoS vulnerability.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.102.8.1 src/sbin/ping/ping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.102 src/sbin/ping/ping.c:1.102.8.1
--- src/sbin/ping/ping.c:1.102 Wed Jan 4 16:09:42 2012
+++ src/sbin/ping/ping.c Tue Jul 11 21:15:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $ */
+/* $NetBSD: ping.c,v 1.102.8.1 2017/07/11 21:15:23 snj Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $");
+__RCSID("$NetBSD: ping.c,v 1.102.8.1 2017/07/11 21:15:23 snj Exp $");
#endif
#include
@@ -291,9 +291,17 @@ main(int argc, char *argv[])
compat = 1;
break;
case 'c':
- npackets = strtol(optarg, &p, 0);
- if (*p != '\0' || npackets <= 0)
-errx(1, "Bad/invalid number of packets");
+ l = strtol(optarg, &p, 0);
+ if (*p != '\0' || l <= 0)
+errx(EXIT_FAILURE,
+"Bad/invalid number of packets: %s",
+optarg);
+#if INT_MAX < LONG_MAX
+ if (l > INT_MAX)
+errx(EXIT_FAILURE,
+"Too many packets to count: %ld", l);
+#endif
+ npackets = l;
break;
case 'D':
pingflags |= F_DF;
@@ -310,13 +318,29 @@ main(int argc, char *argv[])
case 'i': /* wait between sending packets */
interval = strtod(optarg, &p);
if (*p != '\0' || interval <= 0)
-errx(1, "Bad/invalid interval %s", optarg);
+errx(EXIT_FAILURE, "Bad/invalid interval: %s",
+optarg);
+ /*
+ * In order to avoid overflowing the microseconds
+ * argument of poll() the interval must be less than
+ * INT_MAX/1000. Limit it to one second less than
+ * that to be safe.
+ */
+ if (interval >= INT_MAX/1000.0 - 1.0)
+errx(EXIT_FAILURE,
+"Timing interval %g too large", interval);
break;
case 'l':
- preload = strtol(optarg, &p, 0);
- if (*p != '\0' || preload < 0)
-errx(1, "Bad/invalid preload value %s",
- optarg);
+ l = strtol(optarg, &p, 0);
+ if (*p != '\0' || l < 0)
+errx(EXIT_FAILURE, "Bad/invalid preload value: "
+"%s", optarg);
+#if INT_MAX < LONG_MAX
+ if (l > INT_MAX)
+errx(EXIT_FAILURE,
+"Too many preload packets: %ld", l);
+#endif
+ preload = l;
break;
case 'n':
pingflags |= F_NUMERIC;
CVS commit: [netbsd-6-1] src/sbin/ping
Module Name:src
Committed By: snj
Date: Tue Jul 11 21:15:43 UTC 2017
Modified Files:
src/sbin/ping [netbsd-6-1]: ping.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1424):
sbin/ping/ping.c: revision 1.113 via patch
PR bin/36997 Zafer Aydogan: ping doesn't validate numeric inputs enough.
Check for values between INT_MAX and LONG_MAX (if they're different)
when using strtol to get an int. This applies to the -c and -l options;
the other uses were already checked.
Also limit the inter-packet interval given with -i to values that
don't cause integer overflow calling poll() with milliseconds.
Really large intervals (the number is read as floating point) can
produce positive poll() values but negative integers when converted to
struct timespec; this produces behavior akin to using -l at first and
could be construed as a local DoS vulnerability.
To generate a diff of this commit:
cvs rdiff -u -r1.102.2.1 -r1.102.2.1.2.1 src/sbin/ping/ping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.102.2.1 src/sbin/ping/ping.c:1.102.2.1.2.1
--- src/sbin/ping/ping.c:1.102.2.1 Tue Oct 23 19:44:44 2012
+++ src/sbin/ping/ping.c Tue Jul 11 21:15:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $ */
+/* $NetBSD: ping.c,v 1.102.2.1.2.1 2017/07/11 21:15:43 snj Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $");
+__RCSID("$NetBSD: ping.c,v 1.102.2.1.2.1 2017/07/11 21:15:43 snj Exp $");
#endif
#include
@@ -291,9 +291,17 @@ main(int argc, char *argv[])
compat = 1;
break;
case 'c':
- npackets = strtol(optarg, &p, 0);
- if (*p != '\0' || npackets <= 0)
-errx(1, "Bad/invalid number of packets");
+ l = strtol(optarg, &p, 0);
+ if (*p != '\0' || l <= 0)
+errx(EXIT_FAILURE,
+"Bad/invalid number of packets: %s",
+optarg);
+#if INT_MAX < LONG_MAX
+ if (l > INT_MAX)
+errx(EXIT_FAILURE,
+"Too many packets to count: %ld", l);
+#endif
+ npackets = l;
break;
case 'D':
pingflags |= F_DF;
@@ -310,13 +318,29 @@ main(int argc, char *argv[])
case 'i': /* wait between sending packets */
interval = strtod(optarg, &p);
if (*p != '\0' || interval <= 0)
-errx(1, "Bad/invalid interval %s", optarg);
+errx(EXIT_FAILURE, "Bad/invalid interval: %s",
+optarg);
+ /*
+ * In order to avoid overflowing the microseconds
+ * argument of poll() the interval must be less than
+ * INT_MAX/1000. Limit it to one second less than
+ * that to be safe.
+ */
+ if (interval >= INT_MAX/1000.0 - 1.0)
+errx(EXIT_FAILURE,
+"Timing interval %g too large", interval);
break;
case 'l':
- preload = strtol(optarg, &p, 0);
- if (*p != '\0' || preload < 0)
-errx(1, "Bad/invalid preload value %s",
- optarg);
+ l = strtol(optarg, &p, 0);
+ if (*p != '\0' || l < 0)
+errx(EXIT_FAILURE, "Bad/invalid preload value: "
+"%s", optarg);
+#if INT_MAX < LONG_MAX
+ if (l > INT_MAX)
+errx(EXIT_FAILURE,
+"Too many preload packets: %ld", l);
+#endif
+ preload = l;
break;
case 'n':
pingflags |= F_NUMERIC;
CVS commit: [netbsd-6-0] src/common/lib/libc/stdlib
Module Name:src
Committed By: snj
Date: Tue Jul 11 21:09:12 UTC 2017
Modified Files:
src/common/lib/libc/stdlib [netbsd-6-0]: _strtoul.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1421):
common/lib/libc/stdlib/_strtoul.h: revision 1.10
Set *endptr in all paths out of strtoul and family.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.26.1 src/common/lib/libc/stdlib/_strtoul.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/stdlib/_strtoul.h
diff -u src/common/lib/libc/stdlib/_strtoul.h:1.1 src/common/lib/libc/stdlib/_strtoul.h:1.1.26.1
--- src/common/lib/libc/stdlib/_strtoul.h:1.1 Wed Aug 20 12:42:26 2008
+++ src/common/lib/libc/stdlib/_strtoul.h Tue Jul 11 21:09:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */
+/* $NetBSD: _strtoul.h,v 1.1.26.1 2017/07/11 21:09:12 snj Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -56,7 +56,10 @@ _FUNCNAME(const char *nptr, char **endpt
if (base && (base < 2 || base > 36)) {
#if !defined(_KERNEL) && !defined(_STANDALONE)
errno = EINVAL;
- return(0);
+ if (endptr != NULL)
+ /* LINTED interface specification */
+ *endptr = __UNCONST(nptr);
+ return 0;
#else
panic("%s: invalid base %d", __func__, base);
#endif
CVS commit: [netbsd-6] src/common/lib/libc/stdlib
Module Name:src
Committed By: snj
Date: Tue Jul 11 21:09:29 UTC 2017
Modified Files:
src/common/lib/libc/stdlib [netbsd-6]: _strtoul.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1421):
common/lib/libc/stdlib/_strtoul.h: revision 1.10
Set *endptr in all paths out of strtoul and family.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.22.1 src/common/lib/libc/stdlib/_strtoul.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/stdlib/_strtoul.h
diff -u src/common/lib/libc/stdlib/_strtoul.h:1.1 src/common/lib/libc/stdlib/_strtoul.h:1.1.22.1
--- src/common/lib/libc/stdlib/_strtoul.h:1.1 Wed Aug 20 12:42:26 2008
+++ src/common/lib/libc/stdlib/_strtoul.h Tue Jul 11 21:09:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */
+/* $NetBSD: _strtoul.h,v 1.1.22.1 2017/07/11 21:09:29 snj Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -56,7 +56,10 @@ _FUNCNAME(const char *nptr, char **endpt
if (base && (base < 2 || base > 36)) {
#if !defined(_KERNEL) && !defined(_STANDALONE)
errno = EINVAL;
- return(0);
+ if (endptr != NULL)
+ /* LINTED interface specification */
+ *endptr = __UNCONST(nptr);
+ return 0;
#else
panic("%s: invalid base %d", __func__, base);
#endif
CVS commit: [netbsd-6-1] src/common/lib/libc/stdlib
Module Name:src
Committed By: snj
Date: Tue Jul 11 21:09:21 UTC 2017
Modified Files:
src/common/lib/libc/stdlib [netbsd-6-1]: _strtoul.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1421):
common/lib/libc/stdlib/_strtoul.h: revision 1.10
Set *endptr in all paths out of strtoul and family.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.30.1 src/common/lib/libc/stdlib/_strtoul.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/stdlib/_strtoul.h
diff -u src/common/lib/libc/stdlib/_strtoul.h:1.1 src/common/lib/libc/stdlib/_strtoul.h:1.1.30.1
--- src/common/lib/libc/stdlib/_strtoul.h:1.1 Wed Aug 20 12:42:26 2008
+++ src/common/lib/libc/stdlib/_strtoul.h Tue Jul 11 21:09:21 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */
+/* $NetBSD: _strtoul.h,v 1.1.30.1 2017/07/11 21:09:21 snj Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -56,7 +56,10 @@ _FUNCNAME(const char *nptr, char **endpt
if (base && (base < 2 || base > 36)) {
#if !defined(_KERNEL) && !defined(_STANDALONE)
errno = EINVAL;
- return(0);
+ if (endptr != NULL)
+ /* LINTED interface specification */
+ *endptr = __UNCONST(nptr);
+ return 0;
#else
panic("%s: invalid base %d", __func__, base);
#endif
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src
Committed By: skrll
Date: Tue Jul 11 20:42:17 UTC 2017
Modified Files:
src/sys/arch/arm/include/arm32: pmap.h
Log Message:
Fix up L{1_S,2_L,2_S}_PROT for recent changes to the
L{1_S,2_L,2_S}_PROT_RO* values.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/arm/include/arm32/pmap.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/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.150 src/sys/arch/arm/include/arm32/pmap.h:1.151
--- src/sys/arch/arm/include/arm32/pmap.h:1.150 Thu Jul 6 15:17:47 2017
+++ src/sys/arch/arm/include/arm32/pmap.h Tue Jul 11 20:42:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.150 2017/07/06 15:17:47 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.151 2017/07/11 20:42:17 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -1043,13 +1043,16 @@ extern void (*pmap_zero_page_func)(paddr
* Note that the compiler will usually fold these at compile time.
*/
#define L1_S_PROT(ku, pr) ku) == PTE_USER) ? L1_S_PROT_U : 0) | \
- (((pr) & VM_PROT_WRITE) ? L1_S_PROT_W : L1_S_PROT_RO))
+ (((pr) & VM_PROT_WRITE) ? L1_S_PROT_W : \
+ (L1_S_PROT_W == L1_S_PROT_RO ? 0 : L1_S_PROT_RO)))
#define L2_L_PROT(ku, pr) ku) == PTE_USER) ? L2_L_PROT_U : 0) | \
- (((pr) & VM_PROT_WRITE) ? L2_L_PROT_W : L2_L_PROT_RO))
+ (((pr) & VM_PROT_WRITE) ? L2_L_PROT_W : \
+ (L2_L_PROT_W == L2_L_PROT_RO ? 0 : L2_L_PROT_RO)))
#define L2_S_PROT(ku, pr) ku) == PTE_USER) ? L2_S_PROT_U : 0) | \
- (((pr) & VM_PROT_WRITE) ? L2_S_PROT_W : L2_S_PROT_RO))
+ (((pr) & VM_PROT_WRITE) ? L2_S_PROT_W : \
+ (L2_S_PROT_W == L2_S_PROT_RO ? 0 : L2_S_PROT_RO)))
/*
* Macros to test if a mapping is mappable with an L1 SuperSection,
CVS commit: src/lib/libc/stdio
Module Name:src
Committed By: perseant
Date: Tue Jul 11 19:36:38 UTC 2017
Modified Files:
src/lib/libc/stdio: vfwprintf.c
Log Message:
A more correct fix for PR standards/52282.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/libc/stdio/vfwprintf.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/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.35 src/lib/libc/stdio/vfwprintf.c:1.36
--- src/lib/libc/stdio/vfwprintf.c:1.35 Mon Jul 10 22:49:40 2017
+++ src/lib/libc/stdio/vfwprintf.c Tue Jul 11 19:36:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.35 2017/07/10 22:49:40 perseant Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.36 2017/07/11 19:36:38 perseant Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.35 2017/07/10 22:49:40 perseant Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.36 2017/07/11 19:36:38 perseant Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -930,7 +930,7 @@ reswitch: switch (ch) {
flags |= GROUPING;
else {
thousands_sep = '\0';
-grouping = "";
+grouping = NULL;
}
goto rflag;
case '.':
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Tue Jul 11 17:45:32 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c
Log Message:
https://orpheus-lyre.info/design/index.html
https://github.com/heimdal/heimdal/commit/6dd3eb836bbb80a00ffced4ad57077a1cdf227ea
In _krb5_extract_ticket() the KDC-REP service name must be obtained from
encrypted version stored in 'enc_part' instead of the unencrypted version
stored in 'ticket'. Use of the unecrypted version provides an
opportunity for successful server impersonation and other attacks.
Identified by Jeffrey Altman, Viktor Duchovni and Nico Williams.
XXX: pullup 6, 7, 8.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.2 Sat Jan 28 16:31:49 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c Tue Jul 11 13:45:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ticket.c,v 1.2 2017/01/28 21:31:49 christos Exp $ */
+/* $NetBSD: ticket.c,v 1.3 2017/07/11 17:45:31 christos Exp $ */
/*
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -707,8 +707,8 @@ _krb5_extract_ticket(krb5_context contex
/* check server referral and save principal */
ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
- rep->kdc_rep.ticket.sname,
- rep->kdc_rep.ticket.realm);
+ rep->enc_part.sname,
+ rep->enc_part.realm);
if (ret)
goto out;
if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
CVS commit: src/sys/sys
Module Name:src Committed By: dholland Date: Tue Jul 11 15:39:31 UTC 2017 Modified Files: src/sys/sys: param.h Log Message: Typo. To generate a diff of this commit: cvs rdiff -u -r1.543 -r1.544 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/sys/sys/param.h diff -u src/sys/sys/param.h:1.543 src/sys/sys/param.h:1.544 --- src/sys/sys/param.h:1.543 Sun Jun 4 07:14:56 2017 +++ src/sys/sys/param.h Tue Jul 11 15:39:31 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.543 2017/06/04 07:14:56 snj Exp $ */ +/* $NetBSD: param.h,v 1.544 2017/07/11 15:39:31 dholland Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -361,7 +361,7 @@ * This is the maximum individual filename component length enforced by * namei. Filesystems cannot exceed this limit. The upper bound for that * limit is NAME_MAX. We don't bump it for now, for compatibility with - * old binaries during the time where MAXPATHLEN was 511 and NAME_MAX was + * old binaries during the time where MAXNAMLEN was 511 and NAME_MAX was * 255 */ #define KERNEL_NAME_MAX 255
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Jul 11 15:21:36 UTC 2017 Modified Files: src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/tests: mi shl.mi src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: c++config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: c++config.h src/include: dlfcn.h src/lib/libc/dlfcn: dlfcn_elf.c src/lib/libc/stdlib: Makefile.inc exit.c src/lib/libpthread: pthread.c src/libexec/ld.elf_so: rtld.c rtld.h symbols.map src/tests/lib/libpthread: Makefile src/tests/libexec/ld.elf_so: Makefile Added Files: src/lib/libc/include: atexit.h src/lib/libc/stdlib: cxa_thread_atexit.c src/tests/lib/libpthread: h_thread_local_dtor.cpp t_thread_local_dtor.sh src/tests/libexec/ld.elf_so: h_thread_local_dtor.c t_thread_local_dtor.sh src/tests/libexec/ld.elf_so/helper_dso3: Makefile h_helper_dso3.cpp Removed Files: src/lib/libc/stdlib: atexit.h Log Message: Implement __cxa_thread_atexit and __cxa_thread_atexit_impl. This functions are used for destructors of thread_local objects. If a pending destructor exists, prevent unloading of shared objects. Introduce __dl_cxa_refcount interface for this purpose. When the last reference is gone and the object has been dlclose'd before, the unloading is finalized. Ideally, __cxa_thread_atexit_impl wouldn't exist, but libstdc++ insists on providing __cxa_thread_atexit as direct wrapper without further patching. To generate a diff of this commit: cvs rdiff -u -r1.218 -r1.219 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.754 -r1.755 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/tests/shl.mi cvs rdiff -u -r1.18 -r1.19 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h cvs rdiff -u -r1.20 -r1.21 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h cvs rdiff -u -r1.20 -r1.21 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++config.h cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/c++config.h cvs rdiff -u -r1.18 -r1.19 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h cvs rdiff -u -r1.16 -r1.17 \ src/external/gpl3/gcc/
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: gson Date: Tue Jul 11 14:00:16 UTC 2017 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/arch/x86/include/specialreg.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/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.99 src/sys/arch/x86/include/specialreg.h:1.100 --- src/sys/arch/x86/include/specialreg.h:1.99 Wed Jun 14 08:45:42 2017 +++ src/sys/arch/x86/include/specialreg.h Tue Jul 11 14:00:15 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.99 2017/06/14 08:45:42 maxv Exp $ */ +/* $NetBSD: specialreg.h,v 1.100 2017/07/11 14:00:15 gson Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -130,7 +130,7 @@ #define CPUID_DE 0x0004 /* has debugging extension */ #define CPUID_PSE 0x0008 /* has 4MB page size extension */ #define CPUID_TSC 0x0010 /* has time stamp counter */ -#define CPUID_MSR 0x0020 /* has mode specific registers */ +#define CPUID_MSR 0x0020 /* has model specific registers */ #define CPUID_PAE 0x0040 /* has phys address extension */ #define CPUID_MCE 0x0080 /* has machine check exception */ #define CPUID_CX8 0x0100 /* has CMPXCHG8B instruction */
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Tue Jul 11 10:14:10 UTC 2017 Modified Files: src/doc: CHANGES Log Message: - Add some devices to lm(4). - Add NCT6795D to wbsio(4). To generate a diff of this commit: cvs rdiff -u -r1.2299 -r1.2300 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2299 src/doc/CHANGES:1.2300 --- src/doc/CHANGES:1.2299 Mon Jul 10 10:28:23 2017 +++ src/doc/CHANGES Tue Jul 11 10:14:10 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2299 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2300 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -41,3 +41,6 @@ Changes from NetBSD 8.0 to NetBSD 9.0: arm: Add support for Allwinner A83T SoC. [jmcneill 20170707] MAKEDEV(8): Regenerate, documenting lua, dk, plcom, wmcom, hdmicec, mfi, nvme, nvme ns, tpm, and dtrace devices. [sevan 20170710] + wbsio(4): Add support for NCT6795. [msaitoh 20170711] + lm(4): Add support for NCT5174D, NCT6775F, NCT6779D and NCT679[1235]D. + [msaitoh 20170711]
CVS commit: src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Tue Jul 11 10:10:51 UTC 2017
Modified Files:
src/sys/dev/ic: nslm7x.c nslm7xvar.h
src/sys/dev/isa: wbsio.c wbsioreg.h
Log Message:
lm(4): Add suport for NCT5174D, NCT6775F, NCT6779D and NCT679[1235]D.
wbsio(4): Add support for NCT6795D.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/nslm7xvar.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/wbsioreg.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/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.64 src/sys/dev/ic/nslm7x.c:1.65
--- src/sys/dev/ic/nslm7x.c:1.64 Wed Jun 1 08:06:38 2016
+++ src/sys/dev/ic/nslm7x.c Tue Jul 11 10:10:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.64 2016/06/01 08:06:38 pgoyette Exp $ */
+/* $NetBSD: nslm7x.c,v 1.65 2017/07/11 10:10:51 msaitoh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.64 2016/06/01 08:06:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.65 2017/07/11 10:10:51 msaitoh Exp $");
#include
#include
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1
#include
#include
+#include
#include
@@ -93,6 +94,8 @@ static void wb_refresh_temp(struct lm_so
static void wb_refresh_fanrpm(struct lm_softc *, int);
static void wb_w83792d_refresh_fanrpm(struct lm_softc *, int);
static void wb_nct6776f_refresh_fanrpm(struct lm_softc *, int);
+static const char * wm_nct67xx_id2str(uint8_t);
+
static void as_refresh_temp(struct lm_softc *, int);
struct lm_chip {
@@ -105,6 +108,20 @@ static struct lm_chip lm_chips[] = {
{ def_match } /* Must be last */
};
+static struct {
+ uint8_t id;
+ const char *str;
+} nct_chips[] = {
+ {WBSIO_ID_NCT6775F, "NCT6775F"},
+ {WBSIO_ID_NCT6776F, "NCT6776F"},
+ {WBSIO_ID_NCT5104D, "NCT5104D or 610[246]D"},
+ {WBSIO_ID_NCT6779D, "NCT6779D"},
+ {WBSIO_ID_NCT6791D, "NCT6791D"},
+ {WBSIO_ID_NCT6792D, "NCT6792D"},
+ {WBSIO_ID_NCT6793D, "NCT6793D"},
+ {WBSIO_ID_NCT6795D, "NCT6795D"},
+};
+
/* LM78/78J/79/81 */
static struct lm_sensor lm78_sensors[] = {
/* Voltage */
@@ -1619,7 +1636,7 @@ static struct lm_sensor as99127f_sensors
{ .desc = NULL }
};
-/* NCT6776F */
+/* NCT6776F */
static struct lm_sensor nct6776f_sensors[] = {
/* Voltage */
{
@@ -1767,6 +1784,225 @@ static struct lm_sensor nct6776f_sensors
{ .desc = NULL }
};
+/* NCT6779D */
+static struct lm_sensor nct6779d_sensors[] = {
+ /* Voltage */
+ {
+ .desc = "VCore",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x80,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE / 2
+ },
+ {
+ .desc = "VIN1",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x81,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT(56, 10) / 2
+ },
+ {
+ .desc = "AVCC",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x82,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT(34, 34) / 2
+ },
+ {
+ .desc = "+3.3V",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x83,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT(34, 34) / 2
+ },
+ {
+ .desc = "VIN0",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x84,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT(48600, 1)
+ },
+ {
+ .desc = "VIN8",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x85,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE / 2
+ },
+ {
+ .desc = "VIN4",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x86,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE
+ },
+ {
+ .desc = "+3.3VSB",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x87,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT(34, 34) / 2
+ },
+ {
+ .desc = "VBAT",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x88,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE
+ },
+ {
+ .desc = "VTT",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x89,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE
+ },
+ {
+ .desc = "VIN5",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x8a,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE
+ },
+ {
+ .desc = "VIN6",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x8b,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE
+ },
+ {
+ .desc = "VIN2",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x8c,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE
+ },
+ {
+ .desc = "VIN3",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x8d,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT(14414, 1)
+ },
+ {
+ .desc = "VIN7",
+ .type = ENVSYS_SVOLTS_DC,
+ .bank = 4,
+ .reg = 0x8e,
+ .refresh = lm_refresh_volt,
+ .rfact = RFACT_NONE / 2
+ },
+
+ /* Temperature */
+ {
+ .desc = "MB Temperature",
+ .type = ENVSYS_STEMP,
+ .bank = 4,
+ .reg = 0x
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Tue Jul 11 10:06:07 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Separate sending message routine (NFC)
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.175 src/sys/netipsec/key.c:1.176
--- src/sys/netipsec/key.c:1.175 Tue Jul 11 09:49:15 2017
+++ src/sys/netipsec/key.c Tue Jul 11 10:06:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.175 2017/07/11 09:49:15 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.176 2017/07/11 10:06:07 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.175 2017/07/11 09:49:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.176 2017/07/11 10:06:07 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -972,6 +972,60 @@ key_allocsa_policy(const struct secasind
return NULL;
}
+static void
+key_sendup_message_delete(struct secasvar *sav)
+{
+ struct mbuf *m, *result = 0;
+ uint8_t satype;
+
+ satype = key_proto2satype(sav->sah->saidx.proto);
+ if (satype == 0)
+ goto msgfail;
+
+ m = key_setsadbmsg(SADB_DELETE, 0, satype, 0, 0, sav->refcnt - 1);
+ if (m == NULL)
+ goto msgfail;
+ result = m;
+
+ /* set sadb_address for saidx's. */
+ m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, &sav->sah->saidx.src.sa,
+ sav->sah->saidx.src.sa.sa_len << 3, IPSEC_ULPROTO_ANY);
+ if (m == NULL)
+ goto msgfail;
+ m_cat(result, m);
+
+ /* set sadb_address for saidx's. */
+ m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, &sav->sah->saidx.src.sa,
+ sav->sah->saidx.src.sa.sa_len << 3, IPSEC_ULPROTO_ANY);
+ if (m == NULL)
+ goto msgfail;
+ m_cat(result, m);
+
+ /* create SA extension */
+ m = key_setsadbsa(sav);
+ if (m == NULL)
+ goto msgfail;
+ m_cat(result, m);
+
+ if (result->m_len < sizeof(struct sadb_msg)) {
+ result = m_pullup(result, sizeof(struct sadb_msg));
+ if (result == NULL)
+ goto msgfail;
+ }
+
+ result->m_pkthdr.len = 0;
+ for (m = result; m; m = m->m_next)
+ result->m_pkthdr.len += m->m_len;
+ mtod(result, struct sadb_msg *)->sadb_msg_len =
+ PFKEY_UNIT64(result->m_pkthdr.len);
+
+ key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
+ result = NULL;
+msgfail:
+ if (result)
+ m_freem(result);
+}
+
/*
* searching SAD with direction, protocol, mode and state.
* called by key_allocsa_policy().
@@ -1027,65 +1081,9 @@ key_do_allocsa_policy(struct secashead *
* permanent.
*/
if (d->lft_c->sadb_lifetime_addtime != 0) {
- struct mbuf *m, *result = 0;
- uint8_t satype;
-
key_sa_chgstate(d, SADB_SASTATE_DEAD);
-
KASSERT(d->refcnt > 0);
-
- satype = key_proto2satype(d->sah->saidx.proto);
- if (satype == 0)
-goto msgfail;
-
- m = key_setsadbmsg(SADB_DELETE, 0,
- satype, 0, 0, d->refcnt - 1);
- if (!m)
-goto msgfail;
- result = m;
-
- /* set sadb_address for saidx's. */
- m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC,
- &d->sah->saidx.src.sa,
- d->sah->saidx.src.sa.sa_len << 3,
- IPSEC_ULPROTO_ANY);
- if (!m)
-goto msgfail;
- m_cat(result, m);
-
- /* set sadb_address for saidx's. */
- m = key_setsadbaddr(SADB_EXT_ADDRESS_DST,
- &d->sah->saidx.src.sa,
- d->sah->saidx.src.sa.sa_len << 3,
- IPSEC_ULPROTO_ANY);
- if (!m)
-goto msgfail;
- m_cat(result, m);
-
- /* create SA extension */
- m = key_setsadbsa(d);
- if (!m)
-goto msgfail;
- m_cat(result, m);
-
- if (result->m_len < sizeof(struct sadb_msg)) {
-result = m_pullup(result,
-sizeof(struct sadb_msg));
-if (result == NULL)
- goto msgfail;
- }
-
- result->m_pkthdr.len = 0;
- for (m = result; m; m = m->m_next)
-result->m_pkthdr.len += m->m_len;
- mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
-
- key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
- result = 0;
- msgfail:
- if (result)
-m_freem(result);
+ key_sendup_message_delete(d);
KEY_FREESAV(&d);
}
}
CVS commit: src/sys/netipsec
Module Name:src Committed By: ozaki-r Date: Tue Jul 11 09:49:15 UTC 2017 Modified Files: src/sys/netipsec: key.c Log Message: Use time_mono_to_wall (NFC) To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/sys/netipsec/key.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/netipsec/key.c diff -u src/sys/netipsec/key.c:1.174 src/sys/netipsec/key.c:1.175 --- src/sys/netipsec/key.c:1.174 Tue Jul 11 04:55:39 2017 +++ src/sys/netipsec/key.c Tue Jul 11 09:49:15 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.174 2017/07/11 04:55:39 ozaki-r Exp $ */ +/* $NetBSD: key.c,v 1.175 2017/07/11 09:49:15 ozaki-r Exp $ */ /* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.174 2017/07/11 04:55:39 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.175 2017/07/11 09:49:15 ozaki-r Exp $"); /* * This code is referd to RFC 2367 @@ -2747,8 +2747,8 @@ key_spdexpire(struct secpolicy *sp) lt->sadb_lifetime_exttype = SADB_EXT_LIFETIME_CURRENT; lt->sadb_lifetime_allocations = 0; lt->sadb_lifetime_bytes = 0; - lt->sadb_lifetime_addtime = sp->created + time_second - time_uptime; - lt->sadb_lifetime_usetime = sp->lastused + time_second - time_uptime; + lt->sadb_lifetime_addtime = time_mono_to_wall(sp->created); + lt->sadb_lifetime_usetime = time_mono_to_wall(sp->lastused); lt = (struct sadb_lifetime *)(mtod(m, char *) + len / 2); lt->sadb_lifetime_len = PFKEY_UNIT64(sizeof(struct sadb_lifetime)); lt->sadb_lifetime_exttype = SADB_EXT_LIFETIME_HARD; @@ -3480,8 +3480,10 @@ key_setdumpsa(struct secasvar *sav, u_in continue; l = PFKEY_UNUNIT64(((struct sadb_ext *)sav->lft_c)->sadb_ext_len); memcpy(<, sav->lft_c, sizeof(struct sadb_lifetime)); - lt.sadb_lifetime_addtime += time_second - time_uptime; - lt.sadb_lifetime_usetime += time_second - time_uptime; + lt.sadb_lifetime_addtime = + time_mono_to_wall(lt.sadb_lifetime_addtime); + lt.sadb_lifetime_usetime = + time_mono_to_wall(lt.sadb_lifetime_usetime); p = < break;
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Tue Jul 11 08:32:17 UTC 2017 Modified Files: src/share/man/man7: sysctl.7 Log Message: Fix a macro. Fix two tables. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/share/man/man7/sysctl.7 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/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.115 src/share/man/man7/sysctl.7:1.116 --- src/share/man/man7/sysctl.7:1.115 Mon Jul 10 22:41:46 2017 +++ src/share/man/man7/sysctl.7 Tue Jul 11 08:32:17 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.115 2017/07/10 22:41:46 joerg Exp $ +.\" $NetBSD: sysctl.7,v 1.116 2017/07/11 08:32:17 wiz Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -315,7 +315,7 @@ privilege may change the value. .It kern.maxproc integer yes .It kern.maxptys integer yes .It kern.maxvnodes integer yes -.It kern.messages integer yes +.It kern.messages integer yes .It kern.mbuf node not applicable .It kern.memlock integer no .It kern.memlock_range integer no @@ -771,14 +771,14 @@ otherwise\ 0. .It Li kern.messages Kernel console message verbosity. See -.Sy \ +.Aq Pa sys/reboot.h .Bl -column "verbosity" "setting" -offset indent -.It Sy Verbosity Setting -.It \ \ \ \ 0 Silent Sy AB_SILENT -.It \ \ \ \ 1 Quiet Sy AB_QUIET -.It \ \ \ \ 2 Normal Sy AB_NORMAL -.It \ \ \ \ 3 Verbose Sy AB_VERBOSE -.It \ \ \ \ 4 Debug Sy AB_DEBUG +.It Sy Value Ta Sy Verbosity Ta Sy sys/reboot.h equivalent +.It 0 Ta Silent Ta Sy AB_SILENT +.It 1 Ta Quiet Ta Sy AB_QUIET +.It 2 Ta Normal Ta Sy AB_NORMAL +.It 3 Ta Verbose Ta Sy AB_VERBOSE +.It 4 Ta Debug Ta Sy AB_DEBUG .El .It Li kern.module Settings related to kernel modules. @@ -2428,7 +2428,7 @@ The returned data consists of a A flag which controls whether user processes can map virtual address\ 0. .It Li vm.proc.map ( Dv VM_PROC ) The third level is -.dv VM_PROC_MAP , +.Dv VM_PROC_MAP , the fourth is the pid of the process to display the vm object entries for, and the fifth is the size of .Vt struct kinfo_vmentry .
