CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: christos Date: Thu Oct 10 03:44:00 UTC 2019 Modified Files: src/sys/dev/raidframe: raidframevar.h rf_callback.c rf_callback.h rf_copyback.c rf_dag.h rf_dagdegrd.c rf_dagdegrd.h rf_dagdegwr.c rf_dagdegwr.h rf_dagffrd.c rf_dagffwr.c rf_dagffwr.h rf_dagfuncs.c rf_dagfuncs.h rf_dagutils.c rf_dagutils.h rf_desc.h rf_diskqueue.c rf_diskqueue.h rf_driver.c rf_engine.c rf_engine.h rf_evenodd_dagfuncs.c rf_evenodd_dagfuncs.h rf_evenodd_dags.c rf_netbsd.h rf_paritylog.c rf_paritylog.h rf_paritylogDiskMgr.c rf_paritylogDiskMgr.h rf_parityloggingdags.c rf_parityloggingdags.h rf_parityscan.c rf_parityscan.h rf_pq.c rf_pq.h rf_psstatus.c rf_psstatus.h rf_raid.h rf_raid1.c rf_reconbuffer.c rf_reconstruct.c rf_reconstruct.h rf_states.c rf_states.h rf_stripelocks.h Log Message: fix the function pointer and callback mess: - callback functions return 0 and their result is not checked; make them void. - there are two types of callbacks and they used to overload their parameters and the callback structure; separate them into "function" and "value" callbacks. - make the wait function signature consistent. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/raidframe/raidframevar.h \ src/sys/dev/raidframe/rf_dagffrd.c src/sys/dev/raidframe/rf_dagutils.h \ src/sys/dev/raidframe/rf_desc.h cvs rdiff -u -r1.23 -r1.24 src/sys/dev/raidframe/rf_callback.c \ src/sys/dev/raidframe/rf_evenodd_dagfuncs.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/raidframe/rf_callback.h \ src/sys/dev/raidframe/rf_dagdegwr.h src/sys/dev/raidframe/rf_engine.h \ src/sys/dev/raidframe/rf_parityloggingdags.h cvs rdiff -u -r1.51 -r1.52 src/sys/dev/raidframe/rf_copyback.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/raidframe/rf_dag.h \ src/sys/dev/raidframe/rf_paritylog.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/raidframe/rf_dagdegrd.c \ src/sys/dev/raidframe/rf_dagfuncs.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/raidframe/rf_dagdegrd.h \ src/sys/dev/raidframe/rf_parityscan.h \ src/sys/dev/raidframe/rf_stripelocks.h cvs rdiff -u -r1.34 -r1.35 src/sys/dev/raidframe/rf_dagdegwr.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/raidframe/rf_dagffwr.c \ src/sys/dev/raidframe/rf_parityscan.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/raidframe/rf_dagffwr.h cvs rdiff -u -r1.10 -r1.11 src/sys/dev/raidframe/rf_dagfuncs.h cvs rdiff -u -r1.56 -r1.57 src/sys/dev/raidframe/rf_dagutils.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/raidframe/rf_diskqueue.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/raidframe/rf_diskqueue.h cvs rdiff -u -r1.135 -r1.136 src/sys/dev/raidframe/rf_driver.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/raidframe/rf_engine.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/raidframe/rf_evenodd_dagfuncs.h \ src/sys/dev/raidframe/rf_pq.h cvs rdiff -u -r1.4 -r1.5 src/sys/dev/raidframe/rf_evenodd_dags.c \ src/sys/dev/raidframe/rf_paritylogDiskMgr.h \ src/sys/dev/raidframe/rf_states.h cvs rdiff -u -r1.33 -r1.34 src/sys/dev/raidframe/rf_netbsd.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/raidframe/rf_paritylog.h cvs rdiff -u -r1.29 -r1.30 src/sys/dev/raidframe/rf_paritylogDiskMgr.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/raidframe/rf_parityloggingdags.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/raidframe/rf_pq.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/raidframe/rf_psstatus.c \ src/sys/dev/raidframe/rf_raid1.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/raidframe/rf_psstatus.h cvs rdiff -u -r1.47 -r1.48 src/sys/dev/raidframe/rf_raid.h cvs rdiff -u -r1.25 -r1.26 src/sys/dev/raidframe/rf_reconbuffer.c cvs rdiff -u -r1.122 -r1.123 src/sys/dev/raidframe/rf_reconstruct.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/raidframe/rf_reconstruct.h cvs rdiff -u -r1.50 -r1.51 src/sys/dev/raidframe/rf_states.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/raidframe/raidframevar.h diff -u src/sys/dev/raidframe/raidframevar.h:1.20 src/sys/dev/raidframe/raidframevar.h:1.21 --- src/sys/dev/raidframe/raidframevar.h:1.20 Wed Sep 25 21:36:10 2019 +++ src/sys/dev/raidframe/raidframevar.h Wed Oct 9 23:43:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: raidframevar.h,v 1.20 2019/09/26 01:36:10 christos Exp $ */ +/* $NetBSD: raidframevar.h,v 1.21 2019/10/10 03:43:59 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -210,7 +210,8 @@ typedef RF_uint32 RF_RaidAccessFlags_t; typedef struct RF_AccessStripeMap_s RF_AccessStripeMap_t; typedef struct RF_AccessStripeMapHeader_s RF_AccessStripeMapHeader_t; typedef struct RF_AllocListElem_s RF_AllocListElem_t; -typedef struct RF_CallbackDesc_s RF_CallbackDesc_t; +typedef struct RF_CallbackFuncDesc_s RF_CallbackFuncDesc_t; +typedef struct RF_CallbackValueDesc_s RF_CallbackValueDesc_t; typedef
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: christos Date: Thu Oct 10 03:44:00 UTC 2019 Modified Files: src/sys/dev/raidframe: raidframevar.h rf_callback.c rf_callback.h rf_copyback.c rf_dag.h rf_dagdegrd.c rf_dagdegrd.h rf_dagdegwr.c rf_dagdegwr.h rf_dagffrd.c rf_dagffwr.c rf_dagffwr.h rf_dagfuncs.c rf_dagfuncs.h rf_dagutils.c rf_dagutils.h rf_desc.h rf_diskqueue.c rf_diskqueue.h rf_driver.c rf_engine.c rf_engine.h rf_evenodd_dagfuncs.c rf_evenodd_dagfuncs.h rf_evenodd_dags.c rf_netbsd.h rf_paritylog.c rf_paritylog.h rf_paritylogDiskMgr.c rf_paritylogDiskMgr.h rf_parityloggingdags.c rf_parityloggingdags.h rf_parityscan.c rf_parityscan.h rf_pq.c rf_pq.h rf_psstatus.c rf_psstatus.h rf_raid.h rf_raid1.c rf_reconbuffer.c rf_reconstruct.c rf_reconstruct.h rf_states.c rf_states.h rf_stripelocks.h Log Message: fix the function pointer and callback mess: - callback functions return 0 and their result is not checked; make them void. - there are two types of callbacks and they used to overload their parameters and the callback structure; separate them into "function" and "value" callbacks. - make the wait function signature consistent. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/raidframe/raidframevar.h \ src/sys/dev/raidframe/rf_dagffrd.c src/sys/dev/raidframe/rf_dagutils.h \ src/sys/dev/raidframe/rf_desc.h cvs rdiff -u -r1.23 -r1.24 src/sys/dev/raidframe/rf_callback.c \ src/sys/dev/raidframe/rf_evenodd_dagfuncs.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/raidframe/rf_callback.h \ src/sys/dev/raidframe/rf_dagdegwr.h src/sys/dev/raidframe/rf_engine.h \ src/sys/dev/raidframe/rf_parityloggingdags.h cvs rdiff -u -r1.51 -r1.52 src/sys/dev/raidframe/rf_copyback.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/raidframe/rf_dag.h \ src/sys/dev/raidframe/rf_paritylog.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/raidframe/rf_dagdegrd.c \ src/sys/dev/raidframe/rf_dagfuncs.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/raidframe/rf_dagdegrd.h \ src/sys/dev/raidframe/rf_parityscan.h \ src/sys/dev/raidframe/rf_stripelocks.h cvs rdiff -u -r1.34 -r1.35 src/sys/dev/raidframe/rf_dagdegwr.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/raidframe/rf_dagffwr.c \ src/sys/dev/raidframe/rf_parityscan.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/raidframe/rf_dagffwr.h cvs rdiff -u -r1.10 -r1.11 src/sys/dev/raidframe/rf_dagfuncs.h cvs rdiff -u -r1.56 -r1.57 src/sys/dev/raidframe/rf_dagutils.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/raidframe/rf_diskqueue.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/raidframe/rf_diskqueue.h cvs rdiff -u -r1.135 -r1.136 src/sys/dev/raidframe/rf_driver.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/raidframe/rf_engine.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/raidframe/rf_evenodd_dagfuncs.h \ src/sys/dev/raidframe/rf_pq.h cvs rdiff -u -r1.4 -r1.5 src/sys/dev/raidframe/rf_evenodd_dags.c \ src/sys/dev/raidframe/rf_paritylogDiskMgr.h \ src/sys/dev/raidframe/rf_states.h cvs rdiff -u -r1.33 -r1.34 src/sys/dev/raidframe/rf_netbsd.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/raidframe/rf_paritylog.h cvs rdiff -u -r1.29 -r1.30 src/sys/dev/raidframe/rf_paritylogDiskMgr.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/raidframe/rf_parityloggingdags.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/raidframe/rf_pq.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/raidframe/rf_psstatus.c \ src/sys/dev/raidframe/rf_raid1.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/raidframe/rf_psstatus.h cvs rdiff -u -r1.47 -r1.48 src/sys/dev/raidframe/rf_raid.h cvs rdiff -u -r1.25 -r1.26 src/sys/dev/raidframe/rf_reconbuffer.c cvs rdiff -u -r1.122 -r1.123 src/sys/dev/raidframe/rf_reconstruct.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/raidframe/rf_reconstruct.h cvs rdiff -u -r1.50 -r1.51 src/sys/dev/raidframe/rf_states.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/modules/pam_lastlog
Module Name:src Committed By: kre Date: Thu Oct 10 02:39:07 UTC 2019 Modified Files: src/lib/libpam/modules/pam_lastlog: Makefile Log Message: Only exclude gcc-8 warnings if the gcc we're using is gcc>=8 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libpam/modules/pam_lastlog/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/modules/pam_lastlog
Module Name:src
Committed By: kre
Date: Thu Oct 10 02:39:07 UTC 2019
Modified Files:
src/lib/libpam/modules/pam_lastlog: Makefile
Log Message:
Only exclude gcc-8 warnings if the gcc we're using is gcc>=8
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libpam/modules/pam_lastlog/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_lastlog/Makefile
diff -u src/lib/libpam/modules/pam_lastlog/Makefile:1.9 src/lib/libpam/modules/pam_lastlog/Makefile:1.10
--- src/lib/libpam/modules/pam_lastlog/Makefile:1.9 Wed Oct 9 22:05:35 2019
+++ src/lib/libpam/modules/pam_lastlog/Makefile Thu Oct 10 02:39:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/10/09 22:05:35 christos Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/10 02:39:07 kre Exp $
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -35,6 +35,6 @@ LIBDPLIBS+= util ${.CURDIR}/../../../lib
.include "${.CURDIR}/../mod.mk"
-.if ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
COPTS.pam_lastlog.c += -Wno-stringop-truncation
.endif
CVS commit: src/lib/libpam/libpam
Module Name:src Committed By: kre Date: Thu Oct 10 02:37:40 UTC 2019 Modified Files: src/lib/libpam/libpam: Makefile Log Message: Only exclude gcc-8 warnings when the gcc we're using is gcc>=8 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libpam/libpam/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/libpam
Module Name:src
Committed By: kre
Date: Thu Oct 10 02:37:40 UTC 2019
Modified Files:
src/lib/libpam/libpam: Makefile
Log Message:
Only exclude gcc-8 warnings when the gcc we're using is gcc>=8
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libpam/libpam/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/libpam/Makefile
diff -u src/lib/libpam/libpam/Makefile:1.20 src/lib/libpam/libpam/Makefile:1.21
--- src/lib/libpam/libpam/Makefile:1.20 Wed Oct 9 22:05:09 2019
+++ src/lib/libpam/libpam/Makefile Thu Oct 10 02:37:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/10/09 22:05:09 christos Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/10 02:37:40 kre Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -204,7 +204,7 @@ openpam_static_modules.o: openpam_static
openpam_static.o ${STATIC_MODULE_LIBS}
CWARNFLAGS.clang+= -Wno-error=tautological-pointer-compare
-.if ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
COPTS.openpam_dynamic.c += -Wno-error=cast-function-type
.endif
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src
Committed By: kre
Date: Thu Oct 10 02:35:45 UTC 2019
Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile
Log Message:
Only exclude gcc-8 warnings when the gcc we're using is gcc>=8
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/cddl/osnet/lib/libdtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.22 src/external/cddl/osnet/lib/libdtrace/Makefile:1.23
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.22 Wed Oct 9 21:49:50 2019
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Thu Oct 10 02:35:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/10/09 21:49:50 christos Exp $
+# $NetBSD: Makefile,v 1.23 2019/10/10 02:35:45 kre Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -85,7 +85,7 @@ COPTS.dt_printf.c += -Wno-stack-protecto
COPTS.dt_program.c += -Wno-stack-protector
COPTS.dt_provider.c += -Wno-stack-protector
COPTS.dt_subr.c += -Wno-stack-protector
-.if ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
COPTS.dt_lex.c += -Wno-error=stringop-truncation
COPTS.dt_pid.c += -Wno-error=stringop-truncation
.endif
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src Committed By: kre Date: Thu Oct 10 02:35:45 UTC 2019 Modified Files: src/external/cddl/osnet/lib/libdtrace: Makefile Log Message: Only exclude gcc-8 warnings when the gcc we're using is gcc>=8 To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/cddl/osnet/lib/libdtrace/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/fetch/lib
Module Name:src
Committed By: kre
Date: Thu Oct 10 02:30:43 UTC 2019
Modified Files:
src/external/bsd/fetch/lib: Makefile
Log Message:
Only exclude ggc-8 warnings when the gcc we're using is gcc 8 or more.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/fetch/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.13 src/external/bsd/fetch/lib/Makefile:1.14
--- src/external/bsd/fetch/lib/Makefile:1.13 Wed Oct 9 21:19:28 2019
+++ src/external/bsd/fetch/lib/Makefile Thu Oct 10 02:30:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/10/09 21:19:28 christos Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/10 02:30:43 kre Exp $
LIB= fetch
SRCS= fetch.c common.c ftp.c http.c file.c
@@ -36,7 +36,7 @@ httperr.h: ${LIBFETCHDIR}/http.errors ${
CFLAGS+= -Wno-macro-redefined # _REENTRANT redefined
.endif
-.if ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
COPTS.http.c += -Wno-error=stringop-truncation
.endif
CVS commit: src/external/bsd/fetch/lib
Module Name:src Committed By: kre Date: Thu Oct 10 02:30:43 UTC 2019 Modified Files: src/external/bsd/fetch/lib: Makefile Log Message: Only exclude ggc-8 warnings when the gcc we're using is gcc 8 or more. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/fetch/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Wed Oct 9 23:39:20 UTC 2019 Modified Files: src/lib/libc/net: Makefile.inc src/lib/libc/resolv: Makefile.inc src/lib/libc/rpc: Makefile.inc Log Message: Add -Wno-error for gcc-8 warnings To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/lib/libc/net/Makefile.inc cvs rdiff -u -r1.5 -r1.6 src/lib/libc/resolv/Makefile.inc cvs rdiff -u -r1.23 -r1.24 src/lib/libc/rpc/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/citrus
Module Name:src
Committed By: christos
Date: Wed Oct 9 23:23:42 UTC 2019
Modified Files:
src/lib/libc/citrus: citrus_csmapper.c
Log Message:
bump size
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/citrus/citrus_csmapper.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/citrus/citrus_csmapper.c
diff -u src/lib/libc/citrus/citrus_csmapper.c:1.11 src/lib/libc/citrus/citrus_csmapper.c:1.12
--- src/lib/libc/citrus/citrus_csmapper.c:1.11 Sun Nov 20 02:43:52 2011
+++ src/lib/libc/citrus/citrus_csmapper.c Wed Oct 9 19:23:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $ */
+/* $NetBSD: citrus_csmapper.c,v 1.12 2019/10/09 23:23:41 christos Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_csmapper.c,v 1.12 2019/10/09 23:23:41 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -305,7 +305,7 @@ open_serial_mapper(struct _citrus_mapper
struct _citrus_mapper * __restrict * __restrict rcm,
const char *src, const char *pivot, const char *dst)
{
- char buf[PATH_MAX];
+ char buf[4 * PATH_MAX];
snprintf(buf, sizeof(buf), "%s/%s,%s/%s", src, pivot, pivot, dst);
CVS commit: src/lib/libc/citrus
Module Name:src
Committed By: christos
Date: Wed Oct 9 23:24:00 UTC 2019
Modified Files:
src/lib/libc/citrus: citrus_iconv.c
Log Message:
bump size
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/citrus/citrus_iconv.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/citrus/citrus_iconv.c
diff -u src/lib/libc/citrus/citrus_iconv.c:1.10 src/lib/libc/citrus/citrus_iconv.c:1.11
--- src/lib/libc/citrus/citrus_iconv.c:1.10 Sat Nov 19 13:34:21 2011
+++ src/lib/libc/citrus/citrus_iconv.c Wed Oct 9 19:24:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $ */
+/* $NetBSD: citrus_iconv.c,v 1.11 2019/10/09 23:24:00 christos Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_iconv.c,v 1.11 2019/10/09 23:24:00 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -262,7 +262,7 @@ get_shared(struct _citrus_iconv_shared *
int ret = 0;
int hashval;
struct _citrus_iconv_shared * ci;
- char convname[PATH_MAX];
+ char convname[2 * PATH_MAX];
snprintf(convname, sizeof(convname), "%s/%s", src, dst);
CVS commit: src/lib/libc/citrus
Module Name:src Committed By: christos Date: Wed Oct 9 23:24:00 UTC 2019 Modified Files: src/lib/libc/citrus: citrus_iconv.c Log Message: bump size To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/citrus/citrus_iconv.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/citrus
Module Name:src Committed By: christos Date: Wed Oct 9 23:23:42 UTC 2019 Modified Files: src/lib/libc/citrus: citrus_csmapper.c Log Message: bump size To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/citrus/citrus_csmapper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 23:04:33 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: new named.cache To generate a diff of this commit: cvs rdiff -u -r1.1658 -r1.1659 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1658 src/doc/3RDPARTY:1.1659 --- src/doc/3RDPARTY:1.1658 Wed Oct 9 22:50:14 2019 +++ src/doc/3RDPARTY Wed Oct 9 23:04:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1658 2019/10/09 22:50:14 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1659 2019/10/09 23:04:33 sevan Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1249,12 +1249,12 @@ TDB code as found in 2.4.x, x>1 is under using the version found in 2.4.1. Package: root.cache -Version: 2018111402 (November 14, 2018) -Current Vers: 2018111402 (November 14, 2018) +Version: 2019093001 (September 30, 2019) +Current Vers: 2019093001 (September 30, 2019) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root Home Page: ftp://ftp.internic.net/domain/named.root -Date: 2019-01-09 +Date: 2019-10-09 Mailing List: Responsible: thorpej License: Public domain
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 23:04:33 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: new named.cache To generate a diff of this commit: cvs rdiff -u -r1.1658 -r1.1659 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/namedb
Module Name:src Committed By: sevan Date: Wed Oct 9 22:58:39 UTC 2019 Modified Files: src/etc/namedb: root.cache Log Message: Update to 2019093001 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.24 src/etc/namedb/root.cache:1.25 --- src/etc/namedb/root.cache:1.24 Sat Jan 5 21:47:40 2019 +++ src/etc/namedb/root.cache Wed Oct 9 22:58:39 2019 @@ -1,90 +1,90 @@ -; $NetBSD: root.cache,v 1.24 2019/01/05 21:47:40 christos Exp $ -; This file holds the information on root name servers needed to +; $NetBSD: root.cache,v 1.25 2019/10/09 22:58:39 sevan Exp $ +; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " -; configuration file of BIND domain name servers). -; -; This file is made available by InterNIC +; configuration file of BIND domain name servers). +; +; This file is made available by InterNIC ; under anonymous FTP as -; file/domain/named.cache +; file/domain/named.cache ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET -; -; last update: November 14, 2018 -; related version of root zone: 2018111402 -; -; FORMERLY NS.INTERNIC.NET +; +; last update: September 30, 2019 +; related version of root zone: 2019093001 +; +; FORMERLY NS.INTERNIC.NET ; .360 NSA.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 360 A 198.41.0.4 A.ROOT-SERVERS.NET. 360 2001:503:ba3e::2:30 -; -; FORMERLY NS1.ISI.EDU +; +; FORMERLY NS1.ISI.EDU ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 199.9.14.201 B.ROOT-SERVERS.NET. 360 2001:500:200::b -; -; FORMERLY C.PSI.NET +; +; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 C.ROOT-SERVERS.NET. 360 2001:500:2::c -; -; FORMERLY TERP.UMD.EDU +; +; FORMERLY TERP.UMD.EDU ; .360 NSD.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 360 A 199.7.91.13 D.ROOT-SERVERS.NET. 360 2001:500:2d::d -; +; ; FORMERLY NS.NASA.GOV ; .360 NSE.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 360 A 192.203.230.10 E.ROOT-SERVERS.NET. 360 2001:500:a8::e -; +; ; FORMERLY NS.ISC.ORG ; .360 NSF.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 360 A 192.5.5.241 F.ROOT-SERVERS.NET. 360 2001:500:2f::f -; +; ; FORMERLY NS.NIC.DDN.MIL ; .360 NSG.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 360 A 192.112.36.4 G.ROOT-SERVERS.NET. 360 2001:500:12::d0d -; +; ; FORMERLY AOS.ARL.ARMY.MIL ; .360 NSH.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 360 A 198.97.190.53 H.ROOT-SERVERS.NET. 360 2001:500:1::53 -; +; ; FORMERLY NIC.NORDU.NET ; .360 NSI.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 360 A 192.36.148.17 I.ROOT-SERVERS.NET. 360 2001:7fe::53 -; +; ; OPERATED BY VERISIGN, INC. ; .360 NSJ.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 360 A 192.58.128.30 J.ROOT-SERVERS.NET. 360 2001:503:c27::2:30 -; +; ; OPERATED BY RIPE NCC ; .360 NSK.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 360 A 193.0.14.129 K.ROOT-SERVERS.NET. 360 2001:7fd::1 -; +; ; OPERATED BY ICANN ; .360 NSL.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 360 A 199.7.83.42 L.ROOT-SERVERS.NET. 360 2001:500:9f::42 -; +; ; OPERATED BY WIDE ; .360 NSM.ROOT-SERVERS.NET.
CVS commit: src/etc/namedb
Module Name:src Committed By: sevan Date: Wed Oct 9 22:58:39 UTC 2019 Modified Files: src/etc/namedb: root.cache Log Message: Update to 2019093001 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 22:50:14 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: services(5) update To generate a diff of this commit: cvs rdiff -u -r1.1657 -r1.1658 src/doc/3RDPARTY cvs rdiff -u -r1.2590 -r1.2591 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 22:50:14 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: services(5) update To generate a diff of this commit: cvs rdiff -u -r1.1657 -r1.1658 src/doc/3RDPARTY cvs rdiff -u -r1.2590 -r1.2591 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1657 src/doc/3RDPARTY:1.1658 --- src/doc/3RDPARTY:1.1657 Wed Oct 9 22:13:50 2019 +++ src/doc/3RDPARTY Wed Oct 9 22:50:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1657 2019/10/09 22:13:50 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1658 2019/10/09 22:50:14 sevan Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1448,8 +1448,8 @@ Imported to src/common/dist/zlib and sha Remember to run cleantags Package: services, protocols -Version: 2018-12-19 (services), 2017-10-13 (protocols) -Current Vers: 2018-12-19 (services), 2017-10-13 (protocols) +Version: 2019-10-09 (services), 2017-10-13 (protocols) +Current Vers: 2019-10-09 (services), 2017-10-13 (protocols) Maintainer: IANA Archive Site: http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt (services) Archive Site: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.txt (protocols) Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2590 src/doc/CHANGES:1.2591 --- src/doc/CHANGES:1.2590 Tue Oct 8 02:47:07 2019 +++ src/doc/CHANGES Wed Oct 9 22:50:14 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2590 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2591 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -52,3 +52,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: rescue(8): Moved into a separate, rescue-only set. [maya 20191001] byacc: Update to 20190617. [christos 20191006] tzdata updates from 2019a to 2019c (incl 2019b) [kre 20191008] + services(5): Update to version 2019-10-04 from IANA. + [sevan 20191009]
Re: CVS commit: src/sys/kern
Le 30/09/2019 à 20:51, Nick Hudson a écrit : On 30 Sep 2019, at 18:06, Tobias Nygren wrote: On Mon, 23 Sep 2019 05:39:59 + Nick Hudson wrote: Modified Files: src/sys/kern: subr_pool.c Log Message: Enable POOL_REDZONE with DIAGNOSTIC. The bug in the arm pmap was fixed long ago. To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/sys/kern/subr_pool.c Hi, I see 30% packet loss on my BananaPi evbarm system with -current. I bisected it to the above change. It may have had unintended side effects. This is maxv’s change really - feel free to revert Sounds like it corrupts pool allocated memory in some cases I have rarely seen a memory corruption that cleanly drops packets. Rather, it just seems to me that the board has limited ram, the redzone adds a 2-byte overhead, in the specific case of mbufs that means we lose one item per page, and the limit on the pool is reached as a result. Perhaps a useful change would be to drop the redzone if the 2-byte poison turns out to cost (too much) more than two bytes.
CVS commit: src/etc
Module Name:src Committed By: sevan Date: Wed Oct 9 22:42:15 UTC 2019 Modified Files: src/etc: services Log Message: sync with latest from IANA To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/etc
Module Name:src Committed By: sevan Date: Wed Oct 9 22:42:15 UTC 2019 Modified Files: src/etc: services Log Message: sync with latest from IANA To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 22:13:50 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: New acpica, ath-hal, bind, unbound, nsd, bozohttpd, expat, gcc, gdb, jemalloc, less, libdevmapper, libevent, mDNSResponder, ntp, OpenPAM, OpenSSL, sqlite, tmux. Adjust byacc version. To generate a diff of this commit: cvs rdiff -u -r1.1656 -r1.1657 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1656 src/doc/3RDPARTY:1.1657 --- src/doc/3RDPARTY:1.1656 Wed Oct 9 21:05:43 2019 +++ src/doc/3RDPARTY Wed Oct 9 22:13:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1656 2019/10/09 21:05:43 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1657 2019/10/09 22:13:50 sevan Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -42,11 +42,11 @@ Package: acpica Version: 20190405 -Current Vers: 20190405 +Current Vers: 20190816 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Home Page: http://www.acpica.org/ -Date: 2019-04-28 +Date: 2019-10-09 Mailing List: de...@acpica.org License: BSD-like Responsible: jruoho @@ -61,7 +61,7 @@ Current Vers: 6.2 Maintainer: Erez Zadok Archive Site: ftp://ftp.am-utils.org/pub/am-utils/ Home Page: http://www.am-utils.org/ -Date: 2019-01-09 +Date: 2019-10-09 Mailing List: am-utils Responsible: christos License: BSD (4-clause) @@ -78,7 +78,7 @@ Current Vers: 0.21 Maintainer: Julio Merino Archive site: https://github.com/jmmv/atf/releases Home page: https://github.com/jmmv/atf -Date: 2019-01-09 +Date: 2019-10-09 Mailing List: atf-de...@netbsd.org Responsible: jmmv License: The NetBSD Foundation's license (BSD 2-clause) @@ -94,11 +94,11 @@ upfront. Package: ath-hal Version: FreeBSD SVN revision number 185521 -Current Vers: FreeBSD SVN revision number 334197 +Current Vers: FreeBSD SVN revision number 348331 Maintainer: Sam Leffler Archive Site: none Home Page: https://svnweb.freebsd.org/base/head/sys/dev/ath/ath_hal/ -Date: 2019-01-09 +Date: 2019-10-09 Mailing List: none Responsible: sam, alc License: BSD-like (2-clause), ISC @@ -111,7 +111,7 @@ Current Vers: 1.07.1 Maintainer: Phil Nelson Archive Site: ftp://ftp.gnu.org/gnu/bc/ Home Page: http://www.gnu.org/software/bc/ -Date: 2019-01-09 +Date: 2019-10-09 Mailing List: bug...@gnu.org Responsible: phil, simonb License: GPLv2, LGPGv2.1 @@ -121,11 +121,11 @@ bc includes dc, both of which are in the Package: bind [named and utils] Version: 9.14.5/MPL -Current Vers: 9.14.5/MPL +Current Vers: 9.14.6/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ -Date: 2019-09-05 +Date: 2019-10-09 Mailing List: https://lists.isc.org/mailman/listinfo/bind-announce Mailing List: https://lists.isc.org/mailman/listinfo/bind-users Responsible: christos @@ -140,11 +140,11 @@ The libc and include parts of the resolv Package: unbound Version: 1.9.1 -Current Vers: 1.9.1 +Current Vers: 1.9.4 Maintainer: Nlnetlabs Archive Site: https://www.unbound.net/downloads/unbound-latest.tar.gz Home Page: https://www.unbound.net/ -Date: 2019-05-23 +Date: 2019-10-09 Mailing List: https://unbound.nlnetlabs.nl/mailman/listinfo/unbound-users Responsible: christos License: BSD-like @@ -155,11 +155,11 @@ run configure and update config files in Package: nsd Version: 4.1.27 -Current Vers: 4.1.27 +Current Vers: 4.2.2 Maintainer: Nlnetlabs Archive Site: https://www.nlnetlabs.nl/svn/nsd/ Home Page: https://www.nlnetlabs.nl/projects/nsd/ -Date: 2019-05-25 +Date: 2019-10-09 Mailing List: https://open.nlnetlabs.nl/mailman/listinfo/nsd-users/ Responsible: christos License: BSD-like @@ -172,8 +172,8 @@ Package: libbind [libc resolver and incl Version: libbind-6.0-rc1 Current Vers: libbind-6.0 Maintainer: ISC -Archive Site: ftp://ftp.isc.org/isc/libbind/ -Home Page: http://www.isc.org/software/libbind/ +Archive Site: https://downloads.isc.org/isc/libbind/cur/ +Home Page: https://www.isc.org/othersoftware/#libbind Date: 2019-01-09 Mailing List: https://lists.isc.org/mailman/listinfo/bind-workers Responsible: christos @@ -195,8 +195,8 @@ Todo[4]: Re-entrant functions of net/* Todo[5]: Reconcile the doc directory. Package: bozohttpd -Version: 20170201 -Current Vers: 20170201 +Version: 20190228 +Current Vers: 20190228 Maintainer: m...@eterna.com.au Archive Site: ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ Home Page: http://eterna.com.au/bozohttpd/ @@ -214,7 +214,7 @@ Current Vers: 349295 Maintainer: The FreeBSD Project Archive Site: https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree Home Page: https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree -Date: 2019-06-22 +Date: 2019-10-09 Mailing List: Responsible: License:
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 22:13:50 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: New acpica, ath-hal, bind, unbound, nsd, bozohttpd, expat, gcc, gdb, jemalloc, less, libdevmapper, libevent, mDNSResponder, ntp, OpenPAM, OpenSSL, sqlite, tmux. Adjust byacc version. To generate a diff of this commit: cvs rdiff -u -r1.1656 -r1.1657 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/modules/pam_lastlog
Module Name:src
Committed By: christos
Date: Wed Oct 9 22:05:36 UTC 2019
Modified Files:
src/lib/libpam/modules/pam_lastlog: Makefile
Log Message:
don't warn for strncpy wtmp fields, they are not NUL terminated.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/pam_lastlog/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_lastlog/Makefile
diff -u src/lib/libpam/modules/pam_lastlog/Makefile:1.8 src/lib/libpam/modules/pam_lastlog/Makefile:1.9
--- src/lib/libpam/modules/pam_lastlog/Makefile:1.8 Mon Oct 27 03:57:41 2008
+++ src/lib/libpam/modules/pam_lastlog/Makefile Wed Oct 9 18:05:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/10/27 07:57:41 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2019/10/09 22:05:35 christos Exp $
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -34,3 +34,7 @@ CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
LIBDPLIBS+= util ${.CURDIR}/../../../libutil
.include "${.CURDIR}/../mod.mk"
+
+.if ${ACTIVE_CC} == "gcc"
+COPTS.pam_lastlog.c += -Wno-stringop-truncation
+.endif
CVS commit: src/lib/libpam/modules/pam_lastlog
Module Name:src Committed By: christos Date: Wed Oct 9 22:05:36 UTC 2019 Modified Files: src/lib/libpam/modules/pam_lastlog: Makefile Log Message: don't warn for strncpy wtmp fields, they are not NUL terminated. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/pam_lastlog/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/libpam
Module Name:src
Committed By: christos
Date: Wed Oct 9 22:05:10 UTC 2019
Modified Files:
src/lib/libpam/libpam: Makefile
Log Message:
no error for function cast
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libpam/libpam/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/libpam/Makefile
diff -u src/lib/libpam/libpam/Makefile:1.19 src/lib/libpam/libpam/Makefile:1.20
--- src/lib/libpam/libpam/Makefile:1.19 Sun May 21 11:28:41 2017
+++ src/lib/libpam/libpam/Makefile Wed Oct 9 18:05:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/05/21 15:28:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2019/10/09 22:05:09 christos Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -204,6 +204,9 @@ openpam_static_modules.o: openpam_static
openpam_static.o ${STATIC_MODULE_LIBS}
CWARNFLAGS.clang+= -Wno-error=tautological-pointer-compare
+.if ${ACTIVE_CC} == "gcc"
+COPTS.openpam_dynamic.c += -Wno-error=cast-function-type
+.endif
.include
.PATH.h: ${DIST}/include
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src Committed By: christos Date: Wed Oct 9 21:49:50 UTC 2019 Modified Files: src/external/cddl/osnet/lib/libdtrace: Makefile Log Message: no error for string truncation To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/cddl/osnet/lib/libdtrace/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/lib/libdtrace
Module Name:src
Committed By: christos
Date: Wed Oct 9 21:49:50 UTC 2019
Modified Files:
src/external/cddl/osnet/lib/libdtrace: Makefile
Log Message:
no error for string truncation
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/cddl/osnet/lib/libdtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.21 src/external/cddl/osnet/lib/libdtrace/Makefile:1.22
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.21 Mon Feb 11 12:49:37 2019
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Wed Oct 9 17:49:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/02/11 17:49:37 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2019/10/09 21:49:50 christos Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -85,6 +85,10 @@ COPTS.dt_printf.c += -Wno-stack-protecto
COPTS.dt_program.c += -Wno-stack-protector
COPTS.dt_provider.c += -Wno-stack-protector
COPTS.dt_subr.c += -Wno-stack-protector
+.if ${ACTIVE_CC} == "gcc"
+COPTS.dt_lex.c += -Wno-error=stringop-truncation
+COPTS.dt_pid.c += -Wno-error=stringop-truncation
+.endif
COPTS.dt_consume.c += -Wno-parentheses
COPTS.dt_consume.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
CVS commit: src/external/bsd/fetch/lib
Module Name:src Committed By: christos Date: Wed Oct 9 21:19:28 UTC 2019 Modified Files: src/external/bsd/fetch/lib: Makefile Log Message: No error for stringop truncation. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/fetch/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/fetch/lib
Module Name:src
Committed By: christos
Date: Wed Oct 9 21:19:28 UTC 2019
Modified Files:
src/external/bsd/fetch/lib: Makefile
Log Message:
No error for stringop truncation.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/fetch/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.12 src/external/bsd/fetch/lib/Makefile:1.13
--- src/external/bsd/fetch/lib/Makefile:1.12 Tue Aug 27 18:48:53 2019
+++ src/external/bsd/fetch/lib/Makefile Wed Oct 9 17:19:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/27 22:48:53 kamil Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/09 21:19:28 christos Exp $
LIB= fetch
SRCS= fetch.c common.c ftp.c http.c file.c
@@ -36,4 +36,8 @@ httperr.h: ${LIBFETCHDIR}/http.errors ${
CFLAGS+= -Wno-macro-redefined # _REENTRANT redefined
.endif
+.if ${ACTIVE_CC} == "gcc"
+COPTS.http.c += -Wno-error=stringop-truncation
+.endif
+
.include
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 21:05:43 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: new OpenSSH To generate a diff of this commit: cvs rdiff -u -r1.1655 -r1.1656 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1655 src/doc/3RDPARTY:1.1656 --- src/doc/3RDPARTY:1.1655 Tue Oct 8 02:47:07 2019 +++ src/doc/3RDPARTY Wed Oct 9 21:05:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1655 2019/10/08 02:47:07 kre Exp $ +# $NetBSD: 3RDPARTY,v 1.1656 2019/10/09 21:05:43 sevan Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1059,11 +1059,11 @@ Patch applied after OpenSSH import. Package: OpenSSH Version: 8.0 -Current Vers: 8.0 / portable 8.0p1 +Current Vers: 8.1 / portable 8.1p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html -Date: 2019-04-20 +Date: 2019-10-09 Mailing List: openssh-unix-annou...@mindrot.org Responsible: thorpej, christos, elric License: BSD. See src/crypto/external/bsd/openssh/dist/LICENSE
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Wed Oct 9 21:05:43 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: new OpenSSH To generate a diff of this commit: cvs rdiff -u -r1.1655 -r1.1656 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Wed Oct 9 20:59:26 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: hostfile.c sshkey.c
Log Message:
bump buffer sizes
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/hostfile.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/sshkey.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/openssh/dist/hostfile.c
diff -u src/crypto/external/bsd/openssh/dist/hostfile.c:1.13 src/crypto/external/bsd/openssh/dist/hostfile.c:1.14
--- src/crypto/external/bsd/openssh/dist/hostfile.c:1.13 Sat Jan 26 21:08:33 2019
+++ src/crypto/external/bsd/openssh/dist/hostfile.c Wed Oct 9 16:59:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hostfile.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $ */
+/* $NetBSD: hostfile.c,v 1.14 2019/10/09 20:59:26 christos Exp $ */
/* $OpenBSD: hostfile.c,v 1.73 2018/07/16 03:09:13 djm Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: hostfile.c,v 1.13 2019/01/27 02:08:33 pgoyette Exp $");
+__RCSID("$NetBSD: hostfile.c,v 1.14 2019/10/09 20:59:26 christos Exp $");
#include
#include
@@ -124,7 +124,7 @@ host_hash(const char *host, const char *
struct ssh_hmac_ctx *ctx;
u_char salt[256], result[256];
char uu_salt[512], uu_result[512];
- static char encoded[1024];
+ static char encoded[2048];
u_int len;
len = ssh_digest_bytes(SSH_DIGEST_SHA1);
Index: src/crypto/external/bsd/openssh/dist/sshkey.c
diff -u src/crypto/external/bsd/openssh/dist/sshkey.c:1.19 src/crypto/external/bsd/openssh/dist/sshkey.c:1.20
--- src/crypto/external/bsd/openssh/dist/sshkey.c:1.19 Sat Apr 20 13:16:40 2019
+++ src/crypto/external/bsd/openssh/dist/sshkey.c Wed Oct 9 16:59:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sshkey.c,v 1.19 2019/04/20 17:16:40 christos Exp $ */
+/* $NetBSD: sshkey.c,v 1.20 2019/10/09 20:59:26 christos Exp $ */
/* $OpenBSD: sshkey.c,v 1.73 2019/01/21 09:54:11 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-__RCSID("$NetBSD: sshkey.c,v 1.19 2019/04/20 17:16:40 christos Exp $");
+__RCSID("$NetBSD: sshkey.c,v 1.20 2019/10/09 20:59:26 christos Exp $");
#include
#include
@@ -2665,7 +2665,7 @@ sshkey_cert_check_authority(const struct
size_t
sshkey_format_cert_validity(const struct sshkey_cert *cert, char *s, size_t l)
{
- char from[32], to[32], ret[64];
+ char from[32], to[32], ret[128];
time_t tt;
struct tm *tm;
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Wed Oct 9 20:59:26 UTC 2019 Modified Files: src/crypto/external/bsd/openssh/dist: hostfile.c sshkey.c Log Message: bump buffer sizes To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/hostfile.c cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/sshkey.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/microcode/run
Module Name:src Committed By: mlelstv Date: Wed Oct 9 19:58:51 UTC 2019 Modified Files: src/sys/dev/microcode/run: run-rt2870 run-rt3071 Log Message: Update firmware from version 0.17 to 0.33. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/run/run-rt2870 \ src/sys/dev/microcode/run/run-rt3071 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/microcode/run/run-rt2870 Binary files are different Index: src/sys/dev/microcode/run/run-rt3071 Binary files are different
CVS commit: src/sys/dev/microcode/run
Module Name:src Committed By: mlelstv Date: Wed Oct 9 19:58:51 UTC 2019 Modified Files: src/sys/dev/microcode/run: run-rt2870 run-rt3071 Log Message: Update firmware from version 0.17 to 0.33. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/run/run-rt2870 \ src/sys/dev/microcode/run/run-rt3071 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: chs
Date: Wed Oct 9 17:47:13 UTC 2019
Modified Files:
src/sys/kern: sysv_shm.c
Log Message:
simpler fix for the race between shmat() and shmdt():
change shmat() to hold shm_lock until it is completely done.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 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.140 src/sys/kern/sysv_shm.c:1.141
--- src/sys/kern/sysv_shm.c:1.140 Wed Oct 9 17:44:45 2019
+++ src/sys/kern/sysv_shm.c Wed Oct 9 17:47:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_shm.c,v 1.140 2019/10/09 17:44:45 chs Exp $ */
+/* $NetBSD: sysv_shm.c,v 1.141 2019/10/09 17:47:13 chs Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.140 2019/10/09 17:44:45 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.141 2019/10/09 17:47:13 chs Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -437,42 +437,30 @@ sys_shmat(struct lwp *l, const struct sy
/*
* Create a map entry, add it to the list and increase the counters.
- * The lock will be dropped before the mapping, disable reallocation.
*/
shmmap_s = shmmap_getprivate(p);
SLIST_INSERT_HEAD(_s->entries, shmmap_se, next);
shmmap_s->nitems++;
shmseg->shm_lpid = p->p_pid;
shmseg->shm_nattch++;
- shm_realloc_disable++;
/*
- * Add a reference to the uvm object while we hold the
- * shm_lock.
+ * Map the segment into the address space.
*/
uobj = shmseg->_shm_internal;
uao_reference(uobj);
- mutex_exit(_lock);
-
- /*
- * Drop the shm_lock to map it into the address space, and lock
- * the memory, if needed (XXX where does this lock memory?).
- */
error = uvm_map(>vm_map, _va, size, uobj, 0, 0,
UVM_MAPFLAG(prot, prot, UVM_INH_SHARE, UVM_ADV_RANDOM, flags));
if (error)
goto err_detach;
/* Set the new address, and update the time */
- mutex_enter(_lock);
shmmap_se->va = attach_va;
shmseg->shm_atime = time_second;
- shm_realloc_disable--;
retval[0] = attach_va;
SHMPRINTF(("shmat: vm %p: add %d @%lx\n",
p->p_vmspace, shmmap_se->shmid, attach_va));
err:
- cv_broadcast(_realloc_cv);
mutex_exit(_lock);
if (error && shmmap_se) {
kmem_free(shmmap_se, sizeof(struct shmmap_entry));
@@ -481,10 +469,7 @@ err:
err_detach:
uao_detach(uobj);
- mutex_enter(_lock);
uobj = shm_delete_mapping(shmmap_s, shmmap_se);
- shm_realloc_disable--;
- cv_broadcast(_realloc_cv);
mutex_exit(_lock);
if (uobj != NULL) {
uao_detach(uobj);
CVS commit: src/sys/kern
Module Name:src Committed By: chs Date: Wed Oct 9 17:47:13 UTC 2019 Modified Files: src/sys/kern: sysv_shm.c Log Message: simpler fix for the race between shmat() and shmdt(): change shmat() to hold shm_lock until it is completely done. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 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: src/sys/kern
Module Name:src
Committed By: chs
Date: Wed Oct 9 17:44:45 UTC 2019
Modified Files:
src/sys/kern: sysv_shm.c
Log Message:
revert rev 1.139 (fixing a race between shmat() and shmdt())
that approach turned out to be too complicated.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 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.139 src/sys/kern/sysv_shm.c:1.140
--- src/sys/kern/sysv_shm.c:1.139 Tue Oct 1 16:36:58 2019
+++ src/sys/kern/sysv_shm.c Wed Oct 9 17:44:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_shm.c,v 1.139 2019/10/01 16:36:58 chs Exp $ */
+/* $NetBSD: sysv_shm.c,v 1.140 2019/10/09 17:44:45 chs Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.139 2019/10/01 16:36:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.140 2019/10/09 17:44:45 chs Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -87,7 +87,6 @@ struct shmmap_entry {
SLIST_ENTRY(shmmap_entry) next;
vaddr_t va;
int shmid;
- bool busy;
};
int shm_nused __cacheline_aligned;
@@ -314,10 +313,8 @@ sys_shmdt(struct lwp *l, const struct sy
struct uvm_object *uobj;
struct shmid_ds *shmseg;
size_t size;
- int segnum;
mutex_enter(_lock);
-restart:
/* In case of reallocation, we will wait for completion */
while (__predict_false(shm_realloc_state))
cv_wait(_realloc_cv, _lock);
@@ -349,18 +346,12 @@ restart:
}
}
- segnum = IPCID_TO_IX(shmmap_se->shmid);
- if (shmmap_se->busy) {
- cv_wait(_cv[segnum], _lock);
- goto restart;
- }
-
SHMPRINTF(("shmdt: vm %p: remove %d @%lx\n",
p->p_vmspace, shmmap_se->shmid, shmmap_se->va));
/* Delete the entry from shm map */
uobj = shm_delete_mapping(shmmap_s, shmmap_se);
- shmseg = [segnum];
+ shmseg = [IPCID_TO_IX(shmmap_se->shmid)];
size = (shmseg->shm_segsz + PGOFSET) & ~PGOFSET;
mutex_exit(_lock);
@@ -395,13 +386,10 @@ sys_shmat(struct lwp *l, const struct sy
vaddr_t attach_va;
vm_prot_t prot;
vsize_t size;
- int segnum;
/* Allocate a new map entry and set it */
shmmap_se = kmem_alloc(sizeof(struct shmmap_entry), KM_SLEEP);
shmmap_se->shmid = SCARG(uap, shmid);
- shmmap_se->busy = true;
- segnum = IPCID_TO_IX(shmmap_se->shmid);
mutex_enter(_lock);
/* In case of reallocation, we will wait for completion */
@@ -478,13 +466,11 @@ sys_shmat(struct lwp *l, const struct sy
/* Set the new address, and update the time */
mutex_enter(_lock);
shmmap_se->va = attach_va;
- shmmap_se->busy = false;
shmseg->shm_atime = time_second;
shm_realloc_disable--;
retval[0] = attach_va;
SHMPRINTF(("shmat: vm %p: add %d @%lx\n",
p->p_vmspace, shmmap_se->shmid, attach_va));
- cv_broadcast(_cv[segnum]);
err:
cv_broadcast(_realloc_cv);
mutex_exit(_lock);
@@ -498,7 +484,6 @@ err_detach:
mutex_enter(_lock);
uobj = shm_delete_mapping(shmmap_s, shmmap_se);
shm_realloc_disable--;
- cv_broadcast(_cv[segnum]);
cv_broadcast(_realloc_cv);
mutex_exit(_lock);
if (uobj != NULL) {
CVS commit: src/sys/kern
Module Name:src Committed By: chs Date: Wed Oct 9 17:44:45 UTC 2019 Modified Files: src/sys/kern: sysv_shm.c Log Message: revert rev 1.139 (fixing a race between shmat() and shmdt()) that approach turned out to be too complicated. To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 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: src/sys/arch/x86/include
Module Name:src Committed By: maxv Date: Wed Oct 9 17:28:46 UTC 2019 Modified Files: src/sys/arch/x86/include: pte.h Log Message: Add new bits. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/include/pte.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/pte.h diff -u src/sys/arch/x86/include/pte.h:1.2 src/sys/arch/x86/include/pte.h:1.3 --- src/sys/arch/x86/include/pte.h:1.2 Sat Oct 5 07:30:03 2019 +++ src/sys/arch/x86/include/pte.h Wed Oct 9 17:28:46 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.2 2019/10/05 07:30:03 maxv Exp $ */ +/* $NetBSD: pte.h,v 1.3 2019/10/09 17:28:46 maxv Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -39,12 +39,14 @@ #define PGC_UC (PTE_PWT | PTE_PCD) /* hard UC */ /* - * page protection exception bits + * Page protection exception bits */ - -#define PGEX_P 0x01 /* protection violation (vs. no mapping) */ -#define PGEX_W 0x02 /* exception during a write cycle */ -#define PGEX_U 0x04 /* exception while in user mode (upl) */ -#define PGEX_X 0x10 /* exception during instruction fetch */ +#define PGEX_P 0x0001 /* the page was present */ +#define PGEX_W 0x0002 /* exception during a write cycle */ +#define PGEX_U 0x0004 /* exception while in user mode */ +#define PGEX_RSVD 0x0008 /* a reserved bit was set in the page tables */ +#define PGEX_X 0x0010 /* exception during instruction fetch */ +#define PGEX_PK 0x0020 /* access disallowed by protection key */ +#define PGEX_SGX 0x8000 /* violation of sgx-specific access rights */ #endif /* _X86_PTE_H */
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: maxv Date: Wed Oct 9 17:28:46 UTC 2019 Modified Files: src/sys/arch/x86/include: pte.h Log Message: Add new bits. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/include/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/kern
On Sun, Oct 06, 2019 at 08:41:35AM +0200, Maxime Villard wrote:
> Le 01/10/2019 à 18:36, Chuck Silvers a écrit :
> > Module Name:src
> > Committed By: chs
> > Date: Tue Oct 1 16:36:58 UTC 2019
> >
> > Modified Files:
> > src/sys/kern: sysv_shm.c
> >
> > Log Message:
> > in shmdt(), wait until shmat() completes before detaching.
> >
> > Reported-by: syzbot+8f470a1bf36b47ae0...@syzkaller.appspotmail.com
> > Reported-by: syzbot+45810b4c41ed65d91...@syzkaller.appspotmail.com
> >
> >
> > To generate a diff of this commit:
> > cvs rdiff -u -r1.138 -r1.139 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.
>
> Looks like this line is missing
>
> diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
> index b090d1bc4262..c52cb65ec768 100644
> --- a/sys/kern/sysv_shm.c
> +++ b/sys/kern/sysv_shm.c
> @@ -259,6 +259,7 @@ shmmap_getprivate(struct proc *p)
> shmmap_se = kmem_alloc(sizeof(struct shmmap_entry), KM_SLEEP);
> shmmap_se->va = oshmmap_se->va;
> shmmap_se->shmid = oshmmap_se->shmid;
> + shmmap_se->busy = oshmmap_se->busy;
> SLIST_INSERT_HEAD(_s->entries, shmmap_se, next);
> }
> shmmap_s->nitems = oshmmap_s->nitems;
>
> The access made from the caller is not initialized
>
> 353 if (shmmap_se->busy) {
You are right that my change left the new field uninitialized in this case,
but unfortunately fixing it is not as simple as that.
if the shmmap_s is unshared while one of the entries is busy
then that entry would stay busy forever in the copy that is not updated
by the thread that dropped shm_lock in the middle of shmat().
I'm going to take the simple way out for now and undo the previous change
and instead change shmat() to just hold shm_lock until it is completely done.
-Chuck
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Wed Oct 9 14:31:07 UTC 2019
Modified Files:
src/lib/libedit: filecomplete.c readline.c
Log Message:
add +1 to strlcpy's (Patrick Welche)
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.158 -r1.159 src/lib/libedit/readline.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/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.60 src/lib/libedit/filecomplete.c:1.61
--- src/lib/libedit/filecomplete.c:1.60 Tue Oct 8 15:21:40 2019
+++ src/lib/libedit/filecomplete.c Wed Oct 9 10:31:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.60 2019/10/08 19:21:40 christos Exp $ */
+/* $NetBSD: filecomplete.c,v 1.61 2019/10/09 14:31:07 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.60 2019/10/08 19:21:40 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.61 2019/10/09 14:31:07 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -86,7 +86,7 @@ fn_tilde_expand(const char *txt)
temp = el_calloc(len, sizeof(*temp));
if (temp == NULL)
return NULL;
- (void)strlcpy(temp, txt + 1, len - 2);
+ (void)strlcpy(temp, txt + 1, len - 1);
}
if (temp[0] == 0) {
#ifdef HAVE_GETPW_R_POSIX
@@ -353,7 +353,7 @@ fn_filename_completion_function(const ch
return NULL;
}
dirname = nptr;
- (void)strlcpy(dirname, text, len);
+ (void)strlcpy(dirname, text, len + 1);
} else {
el_free(filename);
if (*text == 0)
@@ -507,7 +507,7 @@ completion_matches(const char *text, cha
el_free(match_list);
return NULL;
}
- (void)strlcpy(retstr, match_list[1], max_equal);
+ (void)strlcpy(retstr, match_list[1], max_equal + 1);
match_list[0] = retstr;
/* add NULL as last pointer to the array */
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.158 src/lib/libedit/readline.c:1.159
--- src/lib/libedit/readline.c:1.158 Tue Oct 8 15:17:57 2019
+++ src/lib/libedit/readline.c Wed Oct 9 10:31:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.158 2019/10/08 19:17:57 christos Exp $ */
+/* $NetBSD: readline.c,v 1.159 2019/10/09 14:31:07 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.158 2019/10/08 19:17:57 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.159 2019/10/09 14:31:07 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -607,7 +607,7 @@ get_history_event(const char *cmd, int *
else {
if ((pat = el_calloc(len + 1, sizeof(*pat))) == NULL)
return NULL;
- (void)strlcpy(pat, cmd + begin, len);
+ (void)strlcpy(pat, cmd + begin, len + 1);
}
if (history(h, , H_CURR) != 0) {
@@ -701,7 +701,7 @@ _history_expand_command(const char *comm
if ((aptr = el_calloc(offs + 1, sizeof(*aptr)))
== NULL)
return -1;
- strlcpy(aptr, command, offs);
+ (void)strlcpy(aptr, command, offs + 1);
idx = 1;
} else {
int qchar;
@@ -958,7 +958,7 @@ history_expand(char *str, char **output)
} \
result = nresult;\
} \
- (void)strlcpy([idx], what, len); \
+ (void)strlcpy([idx], what, len + 1); \
idx += len; \
}
@@ -1147,7 +1147,7 @@ history_tokenize(const char *str)
el_free(result);
return NULL;
}
- (void)strlcpy(temp, [start], len);
+ (void)strlcpy(temp, [start], len + 1);
result[idx++] = temp;
result[idx] = NULL;
if (str[i])
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Wed Oct 9 14:31:07 UTC 2019 Modified Files: src/lib/libedit: filecomplete.c readline.c Log Message: add +1 to strlcpy's (Patrick Welche) To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/lib/libedit/filecomplete.c cvs rdiff -u -r1.158 -r1.159 src/lib/libedit/readline.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/sys
Module Name:src Committed By: wiz Date: Wed Oct 9 14:20:47 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Fix xref. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/lib/libc/sys/ptrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Wed Oct 9 14:20:47 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Fix xref. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/lib/libc/sys/ptrace.2 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/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.81 src/lib/libc/sys/ptrace.2:1.82 --- src/lib/libc/sys/ptrace.2:1.81 Wed Oct 9 13:42:37 2019 +++ src/lib/libc/sys/ptrace.2 Wed Oct 9 14:20:47 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ptrace.2,v 1.81 2019/10/09 13:42:37 kamil Exp $ +.\" $NetBSD: ptrace.2,v 1.82 2019/10/09 14:20:47 wiz Exp $ .\" .\" This file is in the public domain. .Dd October 9, 2019 @@ -263,7 +263,7 @@ and arguments are ignored. .It Dv PT_STOP The traced process stops, as if -.Xr kill +.Xr kill 2 has been used with .Dv SIGSTOP given as the signal to be delivered.
CVS commit: src/sys/netatalk
Module Name:src Committed By: maxv Date: Wed Oct 9 14:15:40 UTC 2019 Modified Files: src/sys/netatalk: at_var.h Log Message: Memset to prevent stack info leak. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/netatalk/at_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netatalk
Module Name:src
Committed By: maxv
Date: Wed Oct 9 14:15:40 UTC 2019
Modified Files:
src/sys/netatalk: at_var.h
Log Message:
Memset to prevent stack info leak.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/netatalk/at_var.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/netatalk/at_var.h
diff -u src/sys/netatalk/at_var.h:1.8 src/sys/netatalk/at_var.h:1.9
--- src/sys/netatalk/at_var.h:1.8 Thu Apr 19 21:50:10 2018
+++ src/sys/netatalk/at_var.h Wed Oct 9 14:15:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: at_var.h,v 1.8 2018/04/19 21:50:10 christos Exp $ */
+/* $NetBSD: at_var.h,v 1.9 2019/10/09 14:15:40 maxv Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -75,13 +75,13 @@ sockaddr_at_init1(struct sockaddr_at *sa
{
sat->sat_port = port;
sat->sat_addr = *addr;
- memset(>sat_range, 0, sizeof(sat->sat_range));
}
static __inline void
sockaddr_at_init(struct sockaddr_at *sat, const struct at_addr *addr,
uint8_t port)
{
+ memset(sat, 0, sizeof(*sat));
sat->sat_family = AF_APPLETALK;
sat->sat_len = sizeof(*sat);
sockaddr_at_init1(sat, addr, port);
@@ -92,7 +92,8 @@ sockaddr_at_alloc(const struct at_addr *
{
struct sockaddr *sa;
- sa = sockaddr_alloc(AF_APPLETALK, sizeof(struct sockaddr_at), flags);
+ sa = sockaddr_alloc(AF_APPLETALK, sizeof(struct sockaddr_at),
+ flags | M_ZERO);
if (sa == NULL)
return NULL;
CVS commit: src/sys/dev
Module Name:src Committed By: maxv Date: Wed Oct 9 14:03:58 UTC 2019 Modified Files: src/sys/dev/acpi: tpm_acpi.c src/sys/dev/ic: tpm.c tpmvar.h src/sys/dev/isa: tpm_isa.c Log Message: Provide a better abstraction for the TPM interface. Report it in the ioctl. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/tpm_acpi.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/tpm.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/tpmvar.h cvs rdiff -u -r1.6 -r1.7 src/sys/dev/isa/tpm_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: maxv
Date: Wed Oct 9 14:03:58 UTC 2019
Modified Files:
src/sys/dev/acpi: tpm_acpi.c
src/sys/dev/ic: tpm.c tpmvar.h
src/sys/dev/isa: tpm_isa.c
Log Message:
Provide a better abstraction for the TPM interface. Report it in the ioctl.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/tpm_acpi.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/tpm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/tpmvar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/isa/tpm_isa.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/acpi/tpm_acpi.c
diff -u src/sys/dev/acpi/tpm_acpi.c:1.10 src/sys/dev/acpi/tpm_acpi.c:1.11
--- src/sys/dev/acpi/tpm_acpi.c:1.10 Wed Oct 9 07:30:58 2019
+++ src/sys/dev/acpi/tpm_acpi.c Wed Oct 9 14:03:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_acpi.c,v 1.10 2019/10/09 07:30:58 maxv Exp $ */
+/* $NetBSD: tpm_acpi.c,v 1.11 2019/10/09 14:03:57 maxv Exp $ */
/*
* Copyright (c) 2012, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.10 2019/10/09 07:30:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.11 2019/10/09 14:03:57 maxv Exp $");
#include
#include
@@ -118,33 +118,26 @@ tpm_acpi_attach(device_t parent, device_
(uint64_t)mem->ar_length, TPM_SPACE_SIZE);
goto out;
}
+ base = mem->ar_base;
+ size = mem->ar_length;
sc->sc_dev = self;
sc->sc_ver = TPM_2_0;
mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
sc->sc_busy = false;
- sc->sc_init = tpm_tis12_init;
- sc->sc_start = tpm_tis12_start;
- sc->sc_read = tpm_tis12_read;
- sc->sc_write = tpm_tis12_write;
- sc->sc_end = tpm_tis12_end;
+ sc->sc_intf = _intf_tis12;
sc->sc_bt = aa->aa_memt;
-
- base = mem->ar_base;
- size = mem->ar_length;
-
if (bus_space_map(sc->sc_bt, base, size, 0, >sc_bh)) {
aprint_error_dev(sc->sc_dev, "cannot map registers\n");
goto out;
}
- if (!tpm_tis12_probe(sc->sc_bt, sc->sc_bh)) {
- aprint_error_dev(sc->sc_dev, "TIS1.2 probe failed\n");
+ if ((rv = (*sc->sc_intf->probe)(sc->sc_bt, sc->sc_bh)) != 0) {
+ aprint_error_dev(sc->sc_dev, "probe failed, rv=%d\n", rv);
goto out1;
}
-
- if ((*sc->sc_init)(sc) != 0) {
- aprint_error_dev(sc->sc_dev, "cannot init device %d\n", rv);
+ if ((rv = (*sc->sc_intf->init)(sc)) != 0) {
+ aprint_error_dev(sc->sc_dev, "cannot init device, rv=%d\n", rv);
goto out1;
}
Index: src/sys/dev/ic/tpm.c
diff -u src/sys/dev/ic/tpm.c:1.15 src/sys/dev/ic/tpm.c:1.16
--- src/sys/dev/ic/tpm.c:1.15 Wed Oct 9 07:30:58 2019
+++ src/sys/dev/ic/tpm.c Wed Oct 9 14:03:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm.c,v 1.15 2019/10/09 07:30:58 maxv Exp $ */
+/* $NetBSD: tpm.c,v 1.16 2019/10/09 14:03:58 maxv Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.15 2019/10/09 07:30:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.16 2019/10/09 14:03:58 maxv Exp $");
#include
#include
@@ -93,42 +93,6 @@ tpm_tmotohz(int tmo)
}
static int
-tpm_request_locality(struct tpm_softc *sc, int l)
-{
- uint32_t r;
- int to, rv;
-
- if (l != 0)
- return EINVAL;
-
- if ((bus_space_read_1(sc->sc_bt, sc->sc_bh, TPM_ACCESS) &
- (TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY)) ==
- (TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY))
- return 0;
-
- bus_space_write_1(sc->sc_bt, sc->sc_bh, TPM_ACCESS,
- TPM_ACCESS_REQUEST_USE);
-
- to = tpm_tmotohz(TPM_ACCESS_TMO);
-
- while ((r = bus_space_read_1(sc->sc_bt, sc->sc_bh, TPM_ACCESS) &
- (TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY)) !=
- (TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY) && to--) {
- rv = tsleep(sc->sc_init, PCATCH, "tpm_locality", 1);
- if (rv && rv != EWOULDBLOCK) {
- return rv;
- }
- }
-
- if ((r & (TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY)) !=
- (TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY)) {
- return EBUSY;
- }
-
- return 0;
-}
-
-static int
tpm_getburst(struct tpm_softc *sc)
{
int burst, to, rv;
@@ -174,9 +138,9 @@ tpm12_suspend(struct tpm_softc *sc)
};
struct tpm_header response;
- if ((*sc->sc_write)(sc, , sizeof(command)) != 0)
+ if ((*sc->sc_intf->write)(sc, , sizeof(command)) != 0)
return false;
- if ((*sc->sc_read)(sc, , sizeof(response), NULL, 0) != 0)
+ if ((*sc->sc_intf->read)(sc, , sizeof(response), NULL, 0) != 0)
return false;
if (TPM_BE32(response.code) != 0)
return false;
@@ -195,9 +159,9 @@ tpm20_suspend(struct tpm_softc *sc)
};
struct tpm_header response;
- if ((*sc->sc_write)(sc, , sizeof(command)) != 0)
+ if ((*sc->sc_intf->write)(sc, , sizeof(command)) != 0)
return false;
- if ((*sc->sc_read)(sc, , sizeof(response), NULL, 0) != 0)
+ if ((*sc->sc_intf->read)(sc, , sizeof(response), NULL, 0) != 0)
return false;
if (TPM_BE32(response.code) != 0)
return false;
@@ -286,10 +250,46 @@
CVS commit: src/lib/libc/sys
Module Name:src Committed By: kamil Date: Wed Oct 9 13:42:37 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Document PT_STOP, update PT_KILL in the ptrace(2) man-page Formatting by To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/lib/libc/sys/ptrace.2 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/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.80 src/lib/libc/sys/ptrace.2:1.81 --- src/lib/libc/sys/ptrace.2:1.80 Tue Jul 30 20:18:11 2019 +++ src/lib/libc/sys/ptrace.2 Wed Oct 9 13:42:37 2019 @@ -1,7 +1,7 @@ -.\" $NetBSD: ptrace.2,v 1.80 2019/07/30 20:18:11 mgorny Exp $ +.\" $NetBSD: ptrace.2,v 1.81 2019/10/09 13:42:37 kamil Exp $ .\" .\" This file is in the public domain. -.Dd July 11, 2019 +.Dd October 9, 2019 .Dt PTRACE 2 .Os .Sh NAME @@ -249,9 +249,37 @@ ID of the thread to be resumed, and only .It Dv PT_KILL The traced process terminates, as if .Dv PT_CONTINUE -had been used with +has been used with .Dv SIGKILL given as the signal to be delivered. +However, unlike +.Dv PT_CONTINUE , +.Dv PT_KILL +can be used on a non-stopped tracee. +The +.Fa addr +and +.Fa data +arguments are ignored. +.It Dv PT_STOP +The traced process stops, as if +.Xr kill +has been used with +.Dv SIGSTOP +given as the signal to be delivered. +.Xr wait 2 +will report the child (again) as stopped even if it was stopped before. +The +.Fa addr +and +.Fa data +arguments are ignored. +Unlike +.Dv PT_CONTINUE +call with +.Dv SIGSTOP , +.Dv PT_STOP +works both on running and stopped processes. .It Dv PT_ATTACH This request allows a process to gain control of an otherwise unrelated process and begin tracing it.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: kamil Date: Wed Oct 9 13:42:37 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Document PT_STOP, update PT_KILL in the ptrace(2) man-page Formatting by To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/lib/libc/sys/ptrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/argon2/dist/phc-winner-argon2/man
Module Name:src Committed By: wiz Date: Wed Oct 9 13:25:21 UTC 2019 Modified Files: src/external/apache2/argon2/dist/phc-winner-argon2/man: argon2.1 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/argon2/dist/phc-winner-argon2/man
Module Name:src Committed By: wiz Date: Wed Oct 9 13:25:21 UTC 2019 Modified Files: src/external/apache2/argon2/dist/phc-winner-argon2/man: argon2.1 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1 diff -u src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1:1.1 src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1:1.2 --- src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1:1.1 Wed Oct 9 13:13:09 2019 +++ src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1 Wed Oct 9 13:25:20 2019 @@ -1,4 +1,4 @@ -.TH ARGON2 "1" "April 2016" "argon2 " "User Commands" +.TH ARGON2 "1" "April 1, 2016" "argon2 " "User Commands" .SH NAME argon2 \- generate argon2 hashes
CVS commit: src/sys
Module Name:src
Committed By: kamil
Date: Wed Oct 9 13:19:43 UTC 2019
Modified Files:
src/sys/kern: sys_ptrace_common.c
src/sys/sys: ptrace.h
Log Message:
Introduce new ptrace(2) operation PT_STOP
It works like:
- kill(SIGSTOP) for unstopped tracee
- ptrace(PT_CONTINUE,SIGSTOP) for stopped tracee
The child will be stopped and always possible to be waited (with wait(2)
like calls).
For stopped traccee kill(SIGSTOP) has no effect. PT_CONTINUE+SIGSTOP cannot
be used on an unstopped process (EBUSY).
This operation is modeled after PT_KILL that is similar for the SIGKILL
call. While there, allow PT_KILL on unstopped traced child.
This operation is useful in an abnormal exit of a debugger from a signal
handler, usually followed by waitpid(2) and ptrace(PT_DETACH).
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/kern/sys_ptrace_common.c
cvs rdiff -u -r1.65 -r1.66 src/sys/sys/ptrace.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/kern/sys_ptrace_common.c
diff -u src/sys/kern/sys_ptrace_common.c:1.65 src/sys/kern/sys_ptrace_common.c:1.66
--- src/sys/kern/sys_ptrace_common.c:1.65 Tue Oct 8 12:29:57 2019
+++ src/sys/kern/sys_ptrace_common.c Wed Oct 9 13:19:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_ptrace_common.c,v 1.65 2019/10/08 12:29:57 kamil Exp $ */
+/* $NetBSD: sys_ptrace_common.c,v 1.66 2019/10/09 13:19:43 kamil Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.65 2019/10/08 12:29:57 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.66 2019/10/09 13:19:43 kamil Exp $");
#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
@@ -286,6 +286,7 @@ ptrace_listener_cb(kauth_cred_t cred, ka
case PT_DUMPCORE:
case PT_RESUME:
case PT_SUSPEND:
+ case PT_STOP:
result = KAUTH_RESULT_ALLOW;
break;
@@ -493,6 +494,7 @@ ptrace_allowed(struct lwp *l, int req, s
case PT_GET_PROCESS_STATE:
case PT_RESUME:
case PT_SUSPEND:
+ case PT_STOP:
/*
* You can't do what you want to the process if:
* (1) It's not being traced at all,
@@ -511,8 +513,11 @@ ptrace_allowed(struct lwp *l, int req, s
/*
* (3) it's not currently stopped.
+ *
+ * As an exception allow PT_KILL and PT_STOP here.
*/
- if (t->p_stat != SSTOP || !t->p_waited /* XXXSMP */) {
+ if (req != PT_KILL && req != PT_STOP &&
+ (t->p_stat != SSTOP || !t->p_waited /* XXXSMP */)) {
DPRINTF(("stat %d flag %d\n", t->p_stat,
!t->p_waited));
return EBUSY;
@@ -540,6 +545,7 @@ ptrace_needs_hold(int req)
case PT_TRACE_ME:
case PT_GET_SIGINFO:
case PT_SET_SIGINFO:
+ case PT_STOP:
return 1;
default:
return 0;
@@ -891,7 +897,7 @@ ptrace_regs(struct lwp *l, struct lwp **
#endif
static int
-ptrace_sendsig(struct proc *t, struct lwp *lt, int signo, int resume_all)
+ptrace_sendsig(struct lwp *l, int req, struct proc *t, struct lwp *lt, int signo, int resume_all)
{
ksiginfo_t ksi;
@@ -919,23 +925,20 @@ ptrace_sendsig(struct proc *t, struct lw
return 0;
}
- KSI_INIT_EMPTY();
- if (t->p_sigctx.ps_faked) {
- if (signo != t->p_sigctx.ps_info._signo)
- return EINVAL;
- t->p_sigctx.ps_faked = false;
- ksi.ksi_info = t->p_sigctx.ps_info;
- ksi.ksi_lid = t->p_sigctx.ps_lwp;
- } else if (signo == 0) {
- return 0;
- } else {
- ksi.ksi_signo = signo;
- }
+ KASSERT(req == PT_KILL || req == PT_STOP || req == PT_ATTACH);
+
+ KSI_INIT();
+ ksi.ksi_signo = signo;
+ ksi.ksi_code = SI_USER;
+ ksi.ksi_pid = l->l_proc->p_pid;
+ ksi.ksi_uid = kauth_cred_geteuid(l->l_cred);
+
+ t->p_sigctx.ps_faked = false;
+
DPRINTF(("%s: pid=%d.%d signal=%d resume_all=%d\n", __func__, t->p_pid,
- t->p_sigctx.ps_lwp, signo, resume_all));
+ lt->l_lid, signo, resume_all));
- kpsignal2(t, );
- return 0;
+ return kpsignal2(t, );
}
static int
@@ -1328,7 +1331,7 @@ do_ptrace(struct ptrace_methods *ptm, st
CLR(lt->l_pflag, LP_SINGLESTEP);
}
sendsig:
- error = ptrace_sendsig(t, lt, signo, resume_all);
+ error = ptrace_sendsig(l, req, t, lt, signo, resume_all);
break;
case PT_SYSCALLEMU:
@@ -1361,6 +1364,11 @@ do_ptrace(struct ptrace_methods *ptm, st
signo = SIGKILL;
goto sendsig; /* in PT_CONTINUE, above. */
+ case PT_STOP:
+ /* just send the process a STOP signal. */
+ signo = SIGSTOP;
+ goto sendsig; /* in PT_CONTINUE, above. */
+
case PT_ATTACH:
/*
* Go ahead and set the trace flag.
Index: src/sys/sys/ptrace.h
diff -u src/sys/sys/ptrace.h:1.65 src/sys/sys/ptrace.h:1.66
--- src/sys/sys/ptrace.h:1.65 Tue Jun 11 23:18:55 2019
+++ src/sys/sys/ptrace.h Wed Oct 9 13:19:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.65 2019/06/11 23:18:55 kamil Exp $ */
+/* $NetBSD: ptrace.h,v 1.66 2019/10/09 13:19:43 kamil Exp $ */
/*-
* Copyright (c) 1984, 1993
@@ -57,6 +57,7 @@
#define PT_GET_SIGINFO
CVS commit: src/sys
Module Name:src Committed By: kamil Date: Wed Oct 9 13:19:43 UTC 2019 Modified Files: src/sys/kern: sys_ptrace_common.c src/sys/sys: ptrace.h Log Message: Introduce new ptrace(2) operation PT_STOP It works like: - kill(SIGSTOP) for unstopped tracee - ptrace(PT_CONTINUE,SIGSTOP) for stopped tracee The child will be stopped and always possible to be waited (with wait(2) like calls). For stopped traccee kill(SIGSTOP) has no effect. PT_CONTINUE+SIGSTOP cannot be used on an unstopped process (EBUSY). This operation is modeled after PT_KILL that is similar for the SIGKILL call. While there, allow PT_KILL on unstopped traced child. This operation is useful in an abnormal exit of a debugger from a signal handler, usually followed by waitpid(2) and ptrace(PT_DETACH). To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/kern/sys_ptrace_common.c cvs rdiff -u -r1.65 -r1.66 src/sys/sys/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jhigh Date: Wed Oct 9 13:13:10 UTC 2019 Modified Files: src/external/apache2: Makefile src/share/mk: bsd.own.mk Added Files: src/external/apache2/argon2: Makefile src/external/apache2/argon2/dist/phc-winner-argon2: CHANGELOG.md LICENSE README.md src/external/apache2/argon2/dist/phc-winner-argon2/include: argon2.h src/external/apache2/argon2/dist/phc-winner-argon2/kats: argon2d argon2d.shasum argon2d_v16 argon2d_v16.shasum argon2i argon2i.shasum argon2i_v16 argon2i_v16.shasum argon2id argon2id.shasum argon2id_v16 argon2id_v16.shasum check-sums.ps1 check-sums.sh test.ps1 test.sh src/external/apache2/argon2/dist/phc-winner-argon2/man: argon2.1 src/external/apache2/argon2/dist/phc-winner-argon2/src: argon2.c bench.c core.c core.h encoding.c encoding.h genkat.c genkat.h opt.c ref.c run.c test.c thread.c thread.h src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2: blake2-impl.h blake2.h blake2b.c blamka-round-opt.h blamka-round-ref.h src/external/apache2/argon2/lib: Makefile src/external/apache2/argon2/lib/libargon2: Makefile src/external/apache2/argon2/usr.bin: Makefile src/external/apache2/argon2/usr.bin/argon2: Makefile Log Message: added backend support for argon2 password scheme To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/apache2/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/CHANGELOG.md \ src/external/apache2/argon2/dist/phc-winner-argon2/LICENSE \ src/external/apache2/argon2/dist/phc-winner-argon2/README.md cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/include/argon2.h cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d_v16 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d_v16.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i_v16 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i_v16.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id_v16 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id_v16.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/check-sums.ps1 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/check-sums.sh \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/test.ps1 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/test.sh cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1 cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/src/argon2.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/bench.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/core.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/encoding.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/encoding.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/genkat.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/genkat.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/opt.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/ref.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/run.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/test.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blake2-impl.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blake2.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blake2b.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blamka-round-opt.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blamka-round-ref.h cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/lib/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/lib/libargon2/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/usr.bin/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/usr.bin/argon2/Makefile cvs rdiff -u -r1.1153
CVS commit: src
Module Name:src Committed By: jhigh Date: Wed Oct 9 13:13:10 UTC 2019 Modified Files: src/external/apache2: Makefile src/share/mk: bsd.own.mk Added Files: src/external/apache2/argon2: Makefile src/external/apache2/argon2/dist/phc-winner-argon2: CHANGELOG.md LICENSE README.md src/external/apache2/argon2/dist/phc-winner-argon2/include: argon2.h src/external/apache2/argon2/dist/phc-winner-argon2/kats: argon2d argon2d.shasum argon2d_v16 argon2d_v16.shasum argon2i argon2i.shasum argon2i_v16 argon2i_v16.shasum argon2id argon2id.shasum argon2id_v16 argon2id_v16.shasum check-sums.ps1 check-sums.sh test.ps1 test.sh src/external/apache2/argon2/dist/phc-winner-argon2/man: argon2.1 src/external/apache2/argon2/dist/phc-winner-argon2/src: argon2.c bench.c core.c core.h encoding.c encoding.h genkat.c genkat.h opt.c ref.c run.c test.c thread.c thread.h src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2: blake2-impl.h blake2.h blake2b.c blamka-round-opt.h blamka-round-ref.h src/external/apache2/argon2/lib: Makefile src/external/apache2/argon2/lib/libargon2: Makefile src/external/apache2/argon2/usr.bin: Makefile src/external/apache2/argon2/usr.bin/argon2: Makefile Log Message: added backend support for argon2 password scheme To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/apache2/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/CHANGELOG.md \ src/external/apache2/argon2/dist/phc-winner-argon2/LICENSE \ src/external/apache2/argon2/dist/phc-winner-argon2/README.md cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/include/argon2.h cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d_v16 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2d_v16.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i_v16 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2i_v16.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id_v16 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/argon2id_v16.shasum \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/check-sums.ps1 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/check-sums.sh \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/test.ps1 \ src/external/apache2/argon2/dist/phc-winner-argon2/kats/test.sh cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/man/argon2.1 cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/src/argon2.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/bench.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/core.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/encoding.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/encoding.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/genkat.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/genkat.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/opt.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/ref.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/run.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/test.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h cvs rdiff -u -r0 -r1.1 \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blake2-impl.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blake2.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blake2b.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blamka-round-opt.h \ src/external/apache2/argon2/dist/phc-winner-argon2/src/blake2/blamka-round-ref.h cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/lib/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/lib/libargon2/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/usr.bin/Makefile cvs rdiff -u -r0 -r1.1 src/external/apache2/argon2/usr.bin/argon2/Makefile cvs rdiff -u -r1.1153
CVS commit: src/sys/dev
Module Name:src Committed By: maxv Date: Wed Oct 9 07:30:58 UTC 2019 Modified Files: src/sys/dev/acpi: tpm_acpi.c src/sys/dev/ic: tpm.c tpmreg.h tpmvar.h src/sys/dev/isa: tpm_isa.c Log Message: Add suspend support for TPM 2.0 chips. Check the TPM response also for 1.2 chips. Unfortunately I cannot really test this change since ACPI suspend does not work on any of my laptops. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/tpm_acpi.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/tpm.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/tpmreg.h src/sys/dev/ic/tpmvar.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/tpm_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: maxv
Date: Wed Oct 9 07:30:58 UTC 2019
Modified Files:
src/sys/dev/acpi: tpm_acpi.c
src/sys/dev/ic: tpm.c tpmreg.h tpmvar.h
src/sys/dev/isa: tpm_isa.c
Log Message:
Add suspend support for TPM 2.0 chips. Check the TPM response also for 1.2
chips. Unfortunately I cannot really test this change since ACPI suspend
does not work on any of my laptops.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/tpm_acpi.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/tpm.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/tpmreg.h src/sys/dev/ic/tpmvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/tpm_isa.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/acpi/tpm_acpi.c
diff -u src/sys/dev/acpi/tpm_acpi.c:1.9 src/sys/dev/acpi/tpm_acpi.c:1.10
--- src/sys/dev/acpi/tpm_acpi.c:1.9 Tue Oct 8 18:43:02 2019
+++ src/sys/dev/acpi/tpm_acpi.c Wed Oct 9 07:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_acpi.c,v 1.9 2019/10/08 18:43:02 maxv Exp $ */
+/* $NetBSD: tpm_acpi.c,v 1.10 2019/10/09 07:30:58 maxv Exp $ */
/*
* Copyright (c) 2012, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.9 2019/10/08 18:43:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.10 2019/10/09 07:30:58 maxv Exp $");
#include
#include
@@ -148,6 +148,8 @@ tpm_acpi_attach(device_t parent, device_
goto out1;
}
+ if (!pmf_device_register(self, tpm_suspend, tpm_resume))
+ aprint_error_dev(self, "couldn't establish power handler\n");
acpi_resource_cleanup();
return;
Index: src/sys/dev/ic/tpm.c
diff -u src/sys/dev/ic/tpm.c:1.14 src/sys/dev/ic/tpm.c:1.15
--- src/sys/dev/ic/tpm.c:1.14 Tue Oct 8 18:43:02 2019
+++ src/sys/dev/ic/tpm.c Wed Oct 9 07:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm.c,v 1.14 2019/10/08 18:43:02 maxv Exp $ */
+/* $NetBSD: tpm.c,v 1.15 2019/10/09 07:30:58 maxv Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.14 2019/10/08 18:43:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.15 2019/10/09 07:30:58 maxv Exp $");
#include
#include
@@ -65,8 +65,9 @@ __KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.14
#include "ioconf.h"
+CTASSERT(sizeof(struct tpm_header) == 10);
+
#define TPM_BUFSIZ 1024
-#define TPM_HDRSIZE 10
#define TPM_PARAM_SIZE 0x0001 /* that's a flag */
@@ -163,31 +164,69 @@ tpm_status(struct tpm_softc *sc)
/* -- */
-/*
- * Save TPM state on suspend. On resume we don't do anything, since the BIOS
- * is supposed to restore the previously saved state.
- */
+static bool
+tpm12_suspend(struct tpm_softc *sc)
+{
+ static const uint8_t command[10] = {
+ 0x00, 0xC1, /* TPM_TAG_RQU_COMMAND */
+ 0x00, 0x00, 0x00, 10, /* Length in bytes */
+ 0x00, 0x00, 0x00, 0x98 /* TPM_ORD_SaveState */
+ };
+ struct tpm_header response;
-bool
-tpm12_suspend(device_t dev, const pmf_qual_t *qual)
+ if ((*sc->sc_write)(sc, , sizeof(command)) != 0)
+ return false;
+ if ((*sc->sc_read)(sc, , sizeof(response), NULL, 0) != 0)
+ return false;
+ if (TPM_BE32(response.code) != 0)
+ return false;
+
+ return true;
+}
+
+static bool
+tpm20_suspend(struct tpm_softc *sc)
{
- struct tpm_softc *sc = device_private(dev);
- static const uint8_t command[] = {
- 0, 0xC1, /* TPM_TAG_RQU_COMMAND */
- 0, 0, 0, 10, /* Length in bytes */
- 0, 0, 0, 0x98 /* TPM_ORD_SaveState */
+ static const uint8_t command[12] = {
+ 0x80, 0x01, /* TPM_ST_NO_SESSIONS */
+ 0x00, 0x00, 0x00, 12, /* Length in bytes */
+ 0x00, 0x00, 0x01, 0x45, /* TPM_CC_Shutdown */
+ 0x00, 0x01 /* TPM_SU_STATE */
};
- uint8_t scratch[sizeof(command)];
+ struct tpm_header response;
- (*sc->sc_write)(sc, , sizeof(command));
- (*sc->sc_read)(sc, , sizeof(scratch), NULL, 0);
+ if ((*sc->sc_write)(sc, , sizeof(command)) != 0)
+ return false;
+ if ((*sc->sc_read)(sc, , sizeof(response), NULL, 0) != 0)
+ return false;
+ if (TPM_BE32(response.code) != 0)
+ return false;
return true;
}
bool
-tpm12_resume(device_t dev, const pmf_qual_t *qual)
+tpm_suspend(device_t dev, const pmf_qual_t *qual)
{
+ struct tpm_softc *sc = device_private(dev);
+
+ switch (sc->sc_ver) {
+ case TPM_1_2:
+ return tpm12_suspend(sc);
+ case TPM_2_0:
+ return tpm20_suspend(sc);
+ default:
+ panic("%s: impossible", __func__);
+ }
+}
+
+bool
+tpm_resume(device_t dev, const pmf_qual_t *qual)
+{
+ /*
+ * Don't do anything, the BIOS is supposed to restore the previously
+ * saved state.
+ */
return true;
}
@@ -508,6 +547,7 @@ static int
tpmread(dev_t dev, struct uio *uio, int flags)
{
struct tpm_softc *sc = device_lookup_private(_cd, minor(dev));
+ struct tpm_header hdr;
uint8_t buf[TPM_BUFSIZ];
size_t cnt, len, n;
int rv;
@@ -519,11 +559,11 @@
CVS commit: src/sys/kern
Module Name:src Committed By: skrll Date: Wed Oct 9 05:59:51 UTC 2019 Modified Files: src/sys/kern: kern_history.c Log Message: Traiing whitespace To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/kern/kern_history.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/kern_history.c diff -u src/sys/kern/kern_history.c:1.18 src/sys/kern/kern_history.c:1.19 --- src/sys/kern/kern_history.c:1.18 Mon Sep 3 16:29:35 2018 +++ src/sys/kern/kern_history.c Wed Oct 9 05:59:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_history.c,v 1.18 2018/09/03 16:29:35 riastradh Exp $ */ +/* $NetBSD: kern_history.c,v 1.19 2019/10/09 05:59:51 skrll Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_history.c,v 1.18 2018/09/03 16:29:35 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_history.c,v 1.19 2019/10/09 05:59:51 skrll Exp $"); #include "opt_ddb.h" #include "opt_kernhist.h" @@ -483,7 +483,7 @@ sysctl_kernhist_helper(SYSCTLFN_ARGS) } /* Total buffer size includes header, events, and string table */ - bufsize = sizeof(struct sysctl_history) + + bufsize = sizeof(struct sysctl_history) + h->n * sizeof(struct sysctl_history_event) + xlate_t[xlate_c].offset; buf = kmem_alloc(bufsize, KM_SLEEP); @@ -539,7 +539,7 @@ sysctl_kernhist_helper(SYSCTLFN_ARGS) "entry %d at wrong offset %"PRIu32, i, xlt->offset); memcpy(next, xlt->addr, xlt->len); next += xlt->len; - *next++ = '\0'; + *next++ = '\0'; } /* Copy data to userland */
CVS commit: src/sys/kern
Module Name:src Committed By: skrll Date: Wed Oct 9 05:59:51 UTC 2019 Modified Files: src/sys/kern: kern_history.c Log Message: Traiing whitespace To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/kern/kern_history.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
