CVS commit: src/usr.sbin/inetd
Module Name:src Committed By: dholland Date: Wed Aug 10 03:35:39 UTC 2022 Modified Files: src/usr.sbin/inetd: Makefile inetd.c parse.c Log Message: PR bin/56963 Mark Davies: inetd not configured for rpc Instead of using negative flags to turn on positive flags, set -DRPC in the makefile. Corrects a problem where the SunRPC code in parse.c was accidentally left disabled. This is a prime example of why we don't like negative flags... To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/inetd/Makefile cvs rdiff -u -r1.139 -r1.140 src/usr.sbin/inetd/inetd.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/inetd/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/inetd/Makefile diff -u src/usr.sbin/inetd/Makefile:1.30 src/usr.sbin/inetd/Makefile:1.31 --- src/usr.sbin/inetd/Makefile:1.30 Tue Oct 12 19:08:04 2021 +++ src/usr.sbin/inetd/Makefile Wed Aug 10 03:35:38 2022 @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $NetBSD: Makefile,v 1.30 2021/10/12 19:08:04 christos Exp $ +# $NetBSD: Makefile,v 1.31 2022/08/10 03:35:38 dholland Exp $ .include @@ -15,6 +15,9 @@ WARNS= 6 # Enables debug printouts when in debug mode CPPFLAGS+=-DDEBUG_ENABLE +# Enables SunRPC support +CPPFLAGS+=-DRPC + CPPFLAGS+=-DLIBWRAP # Use LIBWRAP_INTERNAL for libwrap checking of inetd's `internal' services. #CPPFLAGS+=-DLIBWRAP_INTERNAL Index: src/usr.sbin/inetd/inetd.c diff -u src/usr.sbin/inetd/inetd.c:1.139 src/usr.sbin/inetd/inetd.c:1.140 --- src/usr.sbin/inetd/inetd.c:1.139 Sun Oct 17 04:14:49 2021 +++ src/usr.sbin/inetd/inetd.c Wed Aug 10 03:35:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: inetd.c,v 1.139 2021/10/17 04:14:49 ryo Exp $ */ +/* $NetBSD: inetd.c,v 1.140 2022/08/10 03:35:38 dholland Exp $ */ /*- * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = "@(#)inetd.c 8.4 (Berkeley) 4/13/94"; #else -__RCSID("$NetBSD: inetd.c,v 1.139 2021/10/17 04:14:49 ryo Exp $"); +__RCSID("$NetBSD: inetd.c,v 1.140 2022/08/10 03:35:38 dholland Exp $"); #endif #endif /* not lint */ @@ -193,11 +193,6 @@ __RCSID("$NetBSD: inetd.c,v 1.139 2021/1 #include #include - -#ifndef NO_RPC -#define RPC -#endif - #include #ifdef RPC Index: src/usr.sbin/inetd/parse.c diff -u src/usr.sbin/inetd/parse.c:1.3 src/usr.sbin/inetd/parse.c:1.4 --- src/usr.sbin/inetd/parse.c:1.3 Sun May 22 11:27:37 2022 +++ src/usr.sbin/inetd/parse.c Wed Aug 10 03:35:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.3 2022/05/22 11:27:37 andvar Exp $ */ +/* $NetBSD: parse.c,v 1.4 2022/08/10 03:35:38 dholland Exp $ */ /*- * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ #if 0 static char sccsid[] = "@(#)inetd.c 8.4 (Berkeley) 4/13/94"; #else -__RCSID("$NetBSD: parse.c,v 1.3 2022/05/22 11:27:37 andvar Exp $"); +__RCSID("$NetBSD: parse.c,v 1.4 2022/08/10 03:35:38 dholland Exp $"); #endif #endif /* not lint */ @@ -91,6 +91,10 @@ __RCSID("$NetBSD: parse.c,v 1.3 2022/05/ #include #include +#ifdef RPC +#include +#endif + #include "inetd.h" static void config(void); @@ -321,7 +325,7 @@ config(void) if (sep->se_fd != -1) register_rpc(sep); } else -#endif +#endif /* RPC */ { if (sep->se_fd >= 0) close_sep(sep);
CVS commit: src/usr.sbin/inetd
Module Name:src Committed By: dholland Date: Wed Aug 10 03:35:39 UTC 2022 Modified Files: src/usr.sbin/inetd: Makefile inetd.c parse.c Log Message: PR bin/56963 Mark Davies: inetd not configured for rpc Instead of using negative flags to turn on positive flags, set -DRPC in the makefile. Corrects a problem where the SunRPC code in parse.c was accidentally left disabled. This is a prime example of why we don't like negative flags... To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/inetd/Makefile cvs rdiff -u -r1.139 -r1.140 src/usr.sbin/inetd/inetd.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/inetd/parse.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/raidframe
Module Name:src Committed By: mrg Date: Wed Aug 10 01:16:39 UTC 2022 Modified Files: src/sys/dev/raidframe: rf_disks.c rf_driver.c rf_netbsdkintf.c Log Message: raidframe: reject invalid values for numCol and numSpares numCol and numSpares are "int" so they can be "-1" internally, which means negative values need to be rejected, as well as values higher than RF_MAXCOL/RF_MAXSPARES. explicitly nul-terminate all strings coming from userland. some minor CSE that avoids signed arith. this fixes issues in the RAIDFRAME_ADD_HOT_SPARE, RAIDFRAME_CONFIGURE, RAIDFRAME_DELETE_COMPONENT, RAIDFRAME_INCORPORATE_HOT_SPARE, and RAIDFRAME_REBUILD_IN_PLACE ioctl commands. Reported-by: syzbot+b584943ad1f8ab9d4...@syzkaller.appspotmail.com https://syzkaller.appspot.com/bug?id=61e07e418261f8eec8a37a9226725fe31820edd0 https://syzkaller.appspot.com/bug?id=ca0c997b40de81c0f0b44790217731f142003149 https://syzkaller.appspot.com/bug?id=6fc452d228453494655a85264591dd9054cc0b08 https://syzkaller.appspot.com/bug?id=873f0271682713a27adc9a49dd7109c70b35fda3 XXX: pullup-8, pullup-9. ok oster@ riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/dev/raidframe/rf_disks.c cvs rdiff -u -r1.139 -r1.140 src/sys/dev/raidframe/rf_driver.c cvs rdiff -u -r1.407 -r1.408 src/sys/dev/raidframe/rf_netbsdkintf.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/rf_disks.c diff -u src/sys/dev/raidframe/rf_disks.c:1.92 src/sys/dev/raidframe/rf_disks.c:1.93 --- src/sys/dev/raidframe/rf_disks.c:1.92 Sun Dec 8 12:14:40 2019 +++ src/sys/dev/raidframe/rf_disks.c Wed Aug 10 01:16:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.92 2019/12/08 12:14:40 mlelstv Exp $ */ +/* $NetBSD: rf_disks.c,v 1.93 2022/08/10 01:16:38 mrg Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -60,7 +60,7 @@ ***/ #include -__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.92 2019/12/08 12:14:40 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.93 2022/08/10 01:16:38 mrg Exp $"); #include @@ -318,11 +318,12 @@ static int rf_AllocDiskStructures(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr) { int ret; + size_t entries = raidPtr->numCol + RF_MAXSPARE; /* We allocate RF_MAXSPARE on the first row so that we have room to do hot-swapping of spares */ - raidPtr->Disks = RF_MallocAndAdd((raidPtr->numCol + RF_MAXSPARE) * - sizeof(*raidPtr->Disks), raidPtr->cleanupList); + raidPtr->Disks = RF_MallocAndAdd( + entries * sizeof(*raidPtr->Disks), raidPtr->cleanupList); if (raidPtr->Disks == NULL) { ret = ENOMEM; goto fail; @@ -330,9 +331,7 @@ rf_AllocDiskStructures(RF_Raid_t *raidPt /* get space for device specific stuff.. */ raidPtr->raid_cinfo = RF_MallocAndAdd( - (raidPtr->numCol + RF_MAXSPARE) * sizeof(*raidPtr->raid_cinfo), - raidPtr->cleanupList); - + entries * sizeof(*raidPtr->raid_cinfo), raidPtr->cleanupList); if (raidPtr->raid_cinfo == NULL) { ret = ENOMEM; goto fail; @@ -607,7 +606,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, cha error = vn_bdev_openpath(pb, &vp, curlwp); pathbuf_destroy(pb); if (error) { - printf("open device: %s failed!\n", diskPtr->devname); + printf("open device: '%s' failed: %d\n", diskPtr->devname, error); if (error == ENXIO) { /* the component isn't there... must be dead :-( */ diskPtr->status = rf_ds_failed; Index: src/sys/dev/raidframe/rf_driver.c diff -u src/sys/dev/raidframe/rf_driver.c:1.139 src/sys/dev/raidframe/rf_driver.c:1.140 --- src/sys/dev/raidframe/rf_driver.c:1.139 Fri Jul 23 02:35:14 2021 +++ src/sys/dev/raidframe/rf_driver.c Wed Aug 10 01:16:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.139 2021/07/23 02:35:14 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.140 2022/08/10 01:16:38 mrg Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -66,7 +66,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.139 2021/07/23 02:35:14 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.140 2022/08/10 01:16:38 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_raid_diagnostic.h" @@ -341,6 +341,11 @@ rf_Configure(RF_Raid_t *raidPtr, RF_Conf (void (*) (void *)) rf_FreeAllocList, raidPtr->cleanupList); + KASSERT(cfgPtr->numCol < RF_MAXCOL); + KASSERT(cfgPtr->numCol >= 0); + KASSERT(cfgPtr->numSpare < RF_MAXSPARE); + KASSERT(cfgPtr->numSpare >= 0); + raidPtr->numCol = cfgPtr->numCol; raidPtr->numSpare = cfgPtr->numSpare; Index: src/sys/dev/raidframe/rf_netbsdkintf.c diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.407 src/sys/dev/raidframe/rf_netbsdkintf.c:1.408 --- src/sys/dev/raidframe/rf_netbsdkintf.c:1.407 Sat Apr 16 16:40:54 2022 +++ src/sys/dev/raidframe/rf_netbsdkintf.c Wed Aug 10 01:16:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD:
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: mrg Date: Wed Aug 10 01:16:39 UTC 2022 Modified Files: src/sys/dev/raidframe: rf_disks.c rf_driver.c rf_netbsdkintf.c Log Message: raidframe: reject invalid values for numCol and numSpares numCol and numSpares are "int" so they can be "-1" internally, which means negative values need to be rejected, as well as values higher than RF_MAXCOL/RF_MAXSPARES. explicitly nul-terminate all strings coming from userland. some minor CSE that avoids signed arith. this fixes issues in the RAIDFRAME_ADD_HOT_SPARE, RAIDFRAME_CONFIGURE, RAIDFRAME_DELETE_COMPONENT, RAIDFRAME_INCORPORATE_HOT_SPARE, and RAIDFRAME_REBUILD_IN_PLACE ioctl commands. Reported-by: syzbot+b584943ad1f8ab9d4...@syzkaller.appspotmail.com https://syzkaller.appspot.com/bug?id=61e07e418261f8eec8a37a9226725fe31820edd0 https://syzkaller.appspot.com/bug?id=ca0c997b40de81c0f0b44790217731f142003149 https://syzkaller.appspot.com/bug?id=6fc452d228453494655a85264591dd9054cc0b08 https://syzkaller.appspot.com/bug?id=873f0271682713a27adc9a49dd7109c70b35fda3 XXX: pullup-8, pullup-9. ok oster@ riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/dev/raidframe/rf_disks.c cvs rdiff -u -r1.139 -r1.140 src/sys/dev/raidframe/rf_driver.c cvs rdiff -u -r1.407 -r1.408 src/sys/dev/raidframe/rf_netbsdkintf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/db
Module Name:src Committed By: charlotte Date: Wed Aug 10 00:28:00 UTC 2022 Modified Files: src/usr.bin/db: db.c Log Message: db(1): Don't lie in the usage message re: `-q` To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/db/db.c diff -u src/usr.bin/db/db.c:1.27 src/usr.bin/db/db.c:1.28 --- src/usr.bin/db/db.c:1.27 Wed Aug 25 23:11:51 2021 +++ src/usr.bin/db/db.c Wed Aug 10 00:28:00 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: db.c,v 1.27 2021/08/25 23:11:51 rillig Exp $ */ +/* $NetBSD: db.c,v 1.28 2022/08/10 00:28:00 charlotte Exp $ */ /*- * Copyright (c) 2002-2009 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #include #ifndef lint #ifdef __RCSID -__RCSID("$NetBSD: db.c,v 1.27 2021/08/25 23:11:51 rillig Exp $"); +__RCSID("$NetBSD: db.c,v 1.28 2022/08/10 00:28:00 charlotte Exp $"); #endif /* __RCSID */ #endif /* not lint */ @@ -741,7 +741,7 @@ usage(void) " -N don't NUL terminate key\n" " -O outsepoutput field separator string [default: a tab]\n" " -P pagesize database page size [default: 4096]\n" -" -q quiet operation (missing keys aren't errors)\n" +" -q quiet operation\n" " -R replace existing keys\n" " -S visitem items to strvis(3) encode: 'k'ey, 'v'alue, 'b'oth\n" " -T visspec options to control -S and -U; like vis(1) options\n"
CVS commit: src/usr.bin/db
Module Name:src Committed By: charlotte Date: Wed Aug 10 00:28:00 UTC 2022 Modified Files: src/usr.bin/db: db.c Log Message: db(1): Don't lie in the usage message re: `-q` To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/mixerctl
Module Name:src Committed By: charlotte Date: Wed Aug 10 00:14:22 UTC 2022 Modified Files: src/tests/usr.bin/mixerctl: t_mixerctl.sh Log Message: Add a TNF copyright statement in t_mixerctl.sh To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/mixerctl/t_mixerctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/mixerctl/t_mixerctl.sh diff -u src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.11 src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.12 --- src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.11 Sat Dec 18 10:50:48 2021 +++ src/tests/usr.bin/mixerctl/t_mixerctl.sh Wed Aug 10 00:14:22 2022 @@ -1,4 +1,32 @@ -# $NetBSD: t_mixerctl.sh,v 1.11 2021/12/18 10:50:48 kre Exp $ +# $NetBSD: t_mixerctl.sh,v 1.12 2022/08/10 00:14:22 charlotte Exp $ +# +# Copyright (c) 2017 The NetBSD Foundation, Inc. +# All rights reserved. +# +# This code is derived from software contributed to The NetBSD Foundation +# by Charlotte Koch. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +#notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +#notice, this list of conditions and the following disclaimer in the +#documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# audio_setup() { # Open /dev/pad0 so we have a configured audio device.
CVS commit: src/tests/usr.bin/mixerctl
Module Name:src Committed By: charlotte Date: Wed Aug 10 00:14:22 UTC 2022 Modified Files: src/tests/usr.bin/mixerctl: t_mixerctl.sh Log Message: Add a TNF copyright statement in t_mixerctl.sh To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/mixerctl/t_mixerctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: sekiya Date: Tue Aug 9 23:58:46 UTC 2022 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: Turn off AWIN_GMAC_MAC_CONF_ACS, so that all received packets retain FCS bytes. ether_input() can now trust M_HASFCS to accurately represent the packet contents. Discussed on tech-net@ To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/dwc_gmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/dwc_gmac.c diff -u src/sys/dev/ic/dwc_gmac.c:1.76 src/sys/dev/ic/dwc_gmac.c:1.77 --- src/sys/dev/ic/dwc_gmac.c:1.76 Fri Aug 5 21:03:43 2022 +++ src/sys/dev/ic/dwc_gmac.c Tue Aug 9 23:58:46 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_gmac.c,v 1.76 2022/08/05 21:03:43 sekiya Exp $ */ +/* $NetBSD: dwc_gmac.c,v 1.77 2022/08/09 23:58:46 sekiya Exp $ */ /*- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.76 2022/08/05 21:03:43 sekiya Exp $"); +__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.77 2022/08/09 23:58:46 sekiya Exp $"); /* #define DWC_GMAC_DEBUG 1 */ @@ -803,7 +803,6 @@ dwc_gmac_miibus_statchg(struct ifnet *if conf |= AWIN_GMAC_MAC_CONF_FRAMEBURST | AWIN_GMAC_MAC_CONF_DISABLERXOWN | AWIN_GMAC_MAC_CONF_DISABLEJABBER - | AWIN_GMAC_MAC_CONF_ACS | AWIN_GMAC_MAC_CONF_RXENABLE | AWIN_GMAC_MAC_CONF_TXENABLE; switch (IFM_SUBTYPE(mii->mii_media_active)) { @@ -1229,8 +1228,6 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc * struct mbuf *m, *mnew; int i, len, error; - uint16_t etype; - mutex_enter(&sc->sc_rxq.r_mtx); for (i = sc->sc_rxq.r_cur; ; i = RX_NEXT(i)) { bus_dmamap_sync(sc->sc_dmat, sc->sc_dma_ring_map, @@ -1313,29 +1310,8 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc * /* finalize mbuf */ m->m_pkthdr.len = m->m_len = len; m_set_rcvif(m, ifp); + m->m_flags |= M_HASFCS; -#define ETYPE_OFFSET 20 - etype = (m->m_data[ETYPE_OFFSET] << 8) + m->m_data[ETYPE_OFFSET+1]; - - /* - * The hardware doesn't trim the four FCS bytes for us, so - * we need to trim it ourselves. - * Having the upper layer remove it by passing M_HASFCS breaks - * protocols that don't have FCS bytes at the end of the packet - * (AppleTalk, for example), so we do it here instead. - */ - - switch (etype) { - case ETHERTYPE_ATALK: - case ETHERTYPE_AARP: -/* No FCS removal needed */ -break; - default: -/* remove FCS */ -m_adj(m, -ETHER_CRC_LEN); -break; - } - if_percpuq_enqueue(sc->sc_ipq, m); skip:
CVS commit: src/sys/dev/ic
Module Name:src Committed By: sekiya Date: Tue Aug 9 23:58:46 UTC 2022 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: Turn off AWIN_GMAC_MAC_CONF_ACS, so that all received packets retain FCS bytes. ether_input() can now trust M_HASFCS to accurately represent the packet contents. Discussed on tech-net@ To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/dwc_gmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Tue Aug 9 20:05:14 UTC 2022 Modified Files: src/sys/modules/ffs: Makefile src/sys/modules/ufs: Makefile Log Message: Now that UFS_DIRHASH is default for biuilt-in file system modules, we need to update the loadable module builds, too. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/modules/ffs/Makefile cvs rdiff -u -r1.7 -r1.8 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Tue Aug 9 20:05:14 UTC 2022 Modified Files: src/sys/modules/ffs: Makefile src/sys/modules/ufs: Makefile Log Message: Now that UFS_DIRHASH is default for biuilt-in file system modules, we need to update the loadable module builds, too. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/modules/ffs/Makefile cvs rdiff -u -r1.7 -r1.8 src/sys/modules/ufs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/ffs/Makefile diff -u src/sys/modules/ffs/Makefile:1.21 src/sys/modules/ffs/Makefile:1.22 --- src/sys/modules/ffs/Makefile:1.21 Sat Jan 8 01:58:16 2022 +++ src/sys/modules/ffs/Makefile Tue Aug 9 20:05:14 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2022/01/08 01:58:16 pgoyette Exp $ +# $NetBSD: Makefile,v 1.22 2022/08/09 20:05:14 pgoyette Exp $ .include "../Makefile.inc" @@ -6,8 +6,7 @@ KMOD= ffs CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2 -CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory +CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH CWARNFLAGS.clang= -Wno-conversion COPTS.ffs_appleufs.c+= ${NO_ADDR_OF_PACKED_MEMBER} Index: src/sys/modules/ufs/Makefile diff -u src/sys/modules/ufs/Makefile:1.7 src/sys/modules/ufs/Makefile:1.8 --- src/sys/modules/ufs/Makefile:1.7 Sat Jan 8 02:00:49 2022 +++ src/sys/modules/ufs/Makefile Tue Aug 9 20:05:14 2022 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.7 2022/01/08 02:00:49 pgoyette Exp $ +# $NetBSD: Makefile,v 1.8 2022/08/09 20:05:14 pgoyette Exp $ .include "../Makefile.inc" KMOD= ufs CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2 -CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -#CPPFLAGS+= -DUFS_DIRHASH # disabled - suspected of corrupting memory +CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH CWARNFLAGS.clang= -Wno-conversion
CVS commit: src/sys/dev/pci
Module Name:src Committed By: riastradh Date: Tue Aug 9 12:42:05 UTC 2022 Modified Files: src/sys/dev/pci: virtio.c Log Message: virtio(4): Move comment for virtio_vq_intr. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/virtio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/virtio.c diff -u src/sys/dev/pci/virtio.c:1.55 src/sys/dev/pci/virtio.c:1.56 --- src/sys/dev/pci/virtio.c:1.55 Sat Jun 18 22:11:01 2022 +++ src/sys/dev/pci/virtio.c Tue Aug 9 12:42:05 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: virtio.c,v 1.55 2022/06/18 22:11:01 andvar Exp $ */ +/* $NetBSD: virtio.c,v 1.56 2022/08/09 12:42:05 riastradh Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.55 2022/06/18 22:11:01 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.56 2022/08/09 12:42:05 riastradh Exp $"); #include #include @@ -465,13 +465,6 @@ vq_sync_indirect(struct virtio_softc *sc ops); } -/* - * Can be used as sc_intrhand. - */ -/* - * Scan vq, bus_dmamap_sync for the vqs (not for the payload), - * and calls (*vq_done)() if some entries are consumed. - */ bool virtio_vq_is_enqueued(struct virtio_softc *sc, struct virtqueue *vq) { @@ -486,6 +479,12 @@ virtio_vq_is_enqueued(struct virtio_soft return (vq->vq_used_idx != virtio_rw16(sc, vq->vq_used->idx)) ? 1 : 0; } +/* + * Scan vq, bus_dmamap_sync for the vqs (not for the payload), + * and calls (*vq_done)() if some entries are consumed. + * + * Can be used as sc_intrhand. + */ int virtio_vq_intr(struct virtio_softc *sc) {
CVS commit: src/sys/dev/pci
Module Name:src Committed By: riastradh Date: Tue Aug 9 12:42:05 UTC 2022 Modified Files: src/sys/dev/pci: virtio.c Log Message: virtio(4): Move comment for virtio_vq_intr. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/virtio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/df
Module Name:src Committed By: wiz Date: Tue Aug 9 08:14:03 UTC 2022 Modified Files: src/bin/df: df.c Log Message: Sync usage with man page. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/bin/df/df.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/df/df.c diff -u src/bin/df/df.c:1.100 src/bin/df/df.c:1.101 --- src/bin/df/df.c:1.100 Mon Aug 8 16:50:35 2022 +++ src/bin/df/df.c Tue Aug 9 08:14:03 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: df.c,v 1.100 2022/08/08 16:50:35 kre Exp $ */ +/* $NetBSD: df.c,v 1.101 2022/08/09 08:14:03 wiz Exp $ */ /* * Copyright (c) 1980, 1990, 1993, 1994 @@ -45,7 +45,7 @@ __COPYRIGHT( #if 0 static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; #else -__RCSID("$NetBSD: df.c,v 1.100 2022/08/08 16:50:35 kre Exp $"); +__RCSID("$NetBSD: df.c,v 1.101 2022/08/09 08:14:03 wiz Exp $"); #endif #endif /* not lint */ @@ -623,7 +623,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-alnW] [-G|-Pbk|-bfgHhikm] [-t type] [file | " + "Usage: %s [-aclnW] [-G|-bkP|-bfgHhikmN] [-t type] [file | " "file_system]...\n", getprogname()); exit(1);
CVS commit: src/bin/df
Module Name:src Committed By: wiz Date: Tue Aug 9 08:14:03 UTC 2022 Modified Files: src/bin/df: df.c Log Message: Sync usage with man page. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/bin/df/df.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/df
Module Name:src Committed By: wiz Date: Tue Aug 9 08:13:56 UTC 2022 Modified Files: src/bin/df: df.1 Log Message: Sort options, fix macro, add RCS Id. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/bin/df/df.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/df
Module Name:src Committed By: wiz Date: Tue Aug 9 08:13:56 UTC 2022 Modified Files: src/bin/df: df.1 Log Message: Sort options, fix macro, add RCS Id. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/bin/df/df.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/df/df.1 diff -u src/bin/df/df.1:1.57 src/bin/df/df.1:1.58 --- src/bin/df/df.1:1.57 Mon Aug 8 16:50:35 2022 +++ src/bin/df/df.1 Tue Aug 9 08:13:56 2022 @@ -1,3 +1,5 @@ +.\" $NetBSD: df.1,v 1.58 2022/08/09 08:13:56 wiz Exp $ +.\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -36,7 +38,7 @@ .Sh SYNOPSIS .Nm .Op Fl aclnW -.Op Fl G | Fl Pbk | Fl bfgHhikmN +.Op Fl G | Fl bkP | Fl bfgHhikmN .Op Fl t Ar type .Oo Ar file | Ar file_system Oc Ns ... .Sh DESCRIPTION @@ -246,7 +248,7 @@ If more than one of .Fl h , .Fl k or -.FL m +.Fl m is given, the last of those specified is used. .Sh ENVIRONMENT .Bl -tag -width BLOCKSIZE
CVS commit: src/sys/arch/mac68k/dev
Module Name:src Committed By: rin Date: Tue Aug 9 08:09:44 UTC 2022 Modified Files: src/sys/arch/mac68k/dev: grf_subr.c Log Message: Switch from ``(1 << depth) color'' to ``(depth)-bpp color'' in attach message. For depth == 32, fix ``0 color'', and prevent ambiguous ``16Mi color''. I don't know whether there is 24-bpp graphic card for mac68k or not, although. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mac68k/dev/grf_subr.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/mac68k/dev
Module Name:src Committed By: rin Date: Tue Aug 9 08:09:44 UTC 2022 Modified Files: src/sys/arch/mac68k/dev: grf_subr.c Log Message: Switch from ``(1 << depth) color'' to ``(depth)-bpp color'' in attach message. For depth == 32, fix ``0 color'', and prevent ambiguous ``16Mi color''. I don't know whether there is 24-bpp graphic card for mac68k or not, although. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mac68k/dev/grf_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mac68k/dev/grf_subr.c diff -u src/sys/arch/mac68k/dev/grf_subr.c:1.24 src/sys/arch/mac68k/dev/grf_subr.c:1.25 --- src/sys/arch/mac68k/dev/grf_subr.c:1.24 Sat Aug 7 16:18:57 2021 +++ src/sys/arch/mac68k/dev/grf_subr.c Tue Aug 9 08:09:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: grf_subr.c,v 1.24 2021/08/07 16:18:57 thorpej Exp $ */ +/* $NetBSD: grf_subr.c,v 1.25 2022/08/09 08:09:44 rin Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.24 2021/08/07 16:18:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.25 2022/08/09 08:09:44 rin Exp $"); #include #include @@ -54,7 +54,7 @@ grf_establish(struct grfbus_softc *sc, n if (gm->psize == 1) printf("monochrome\n"); else - printf("%d color\n", 1 << gm->psize); + printf("%hu-bpp color\n", gm->psize); /* Attach grf semantics to the hardware. */ ga.ga_name = "grf";
CVS commit: src
Module Name:src Committed By: knakahara Date: Tue Aug 9 08:03:22 UTC 2022 Modified Files: src/share/man/man7: sysctl.7 src/sys/netipsec: key.c key_var.h Log Message: Add sysctl entry to improve interconnectivity to some VPN appliances, pointed out by seil-team@IIJ. If we want to allow different identifier types on IDii and IDir, set net.key.allow_different_idtype=1. Default(=0) is the same as before. To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/share/man/man7/sysctl.7 cvs rdiff -u -r1.275 -r1.276 src/sys/netipsec/key.c cvs rdiff -u -r1.5 -r1.6 src/sys/netipsec/key_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/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.157 src/share/man/man7/sysctl.7:1.158 --- src/share/man/man7/sysctl.7:1.157 Mon Jul 25 14:46:53 2022 +++ src/share/man/man7/sysctl.7 Tue Aug 9 08:03:22 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.157 2022/07/25 14:46:53 pgoyette Exp $ +.\" $NetBSD: sysctl.7,v 1.158 2022/08/09 08:03:22 knakahara Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd July 25, 2022 +.Dd August 9, 2022 .Dt SYSCTL 7 .Os .Sh NAME @@ -2143,6 +2143,7 @@ The currently defined variable and names .It esp_keymin integer yes .It esp_auth integer yes .It ah_keymin integer yes +.It allow_different_idtype boolean yes .El The variables are as follows: .Bl -tag -width "123456" @@ -2192,6 +2193,10 @@ on ACQUIRE PF_KEY message. Minimum AH key length, in bits, The value is used when the kernel creates proposal payload on ACQUIRE PF_KEY message. +.It Li allow_different_idtype +A boolean that allow or disallow different identifier types +on IDii and IDir. +Allowing that can improve interconnectivity to some VPN appliances. .El .It Li net.local ( Dv PF_LOCAL ) Get or set various global information about Index: src/sys/netipsec/key.c diff -u src/sys/netipsec/key.c:1.275 src/sys/netipsec/key.c:1.276 --- src/sys/netipsec/key.c:1.275 Tue May 24 20:50:20 2022 +++ src/sys/netipsec/key.c Tue Aug 9 08:03:22 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.275 2022/05/24 20:50:20 andvar Exp $ */ +/* $NetBSD: key.c,v 1.276 2022/08/09 08:03:22 knakahara Exp $ */ /* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.275 2022/05/24 20:50:20 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.276 2022/08/09 08:03:22 knakahara Exp $"); /* * This code is referred to RFC 2367 @@ -534,6 +534,7 @@ static const int maxsize[] = { static int ipsec_esp_keymin = 256; static int ipsec_esp_auth = 0; static int ipsec_ah_keymin = 128; +static bool ipsec_allow_different_idtype = false; #ifdef SYSCTL_DECL SYSCTL_DECL(_net_key); @@ -6171,7 +6172,14 @@ key_setident(struct secashead *sah, stru if (idsrc->sadb_ident_type != iddst->sadb_ident_type) { IPSECLOG(LOG_DEBUG, "ident type mismatched src %u, dst %u.\n", idsrc->sadb_ident_type, iddst->sadb_ident_type); - return EINVAL; + /* + * Some VPN appliances(e.g. NetScreen) can send different + * identifier types on IDii and IDir, so be able to allow + * such message. + */ + if (!ipsec_allow_different_idtype) { + return EINVAL; + } } switch (idsrc->sadb_ident_type) { @@ -9034,6 +9042,11 @@ sysctl_net_keyv2_setup(struct sysctllog SYSCTL_DESCR("PF_KEY statistics"), sysctl_net_key_stats, 0, NULL, 0, CTL_NET, IPSEC_PFKEY, CTL_CREATE, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_BOOL, "allow_different_idtype", NULL, + NULL, 0, &ipsec_allow_different_idtype, 0, + CTL_NET, IPSEC_PFKEY, KEYCTL_ALLOW_DIFFERENT_IDTYPE, CTL_EOL); } /* Index: src/sys/netipsec/key_var.h diff -u src/sys/netipsec/key_var.h:1.5 src/sys/netipsec/key_var.h:1.6 --- src/sys/netipsec/key_var.h:1.5 Sat Apr 28 13:23:17 2018 +++ src/sys/netipsec/key_var.h Tue Aug 9 08:03:22 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: key_var.h,v 1.5 2018/04/28 13:23:17 maxv Exp $ */ +/* $NetBSD: key_var.h,v 1.6 2022/08/09 08:03:22 knakahara Exp $ */ /* $FreeBSD: key_var.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */ /* $KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $ */ @@ -49,7 +49,8 @@ #define KEYCTL_PREFERED_OLDSA 12 #define KEYCTL_DUMPSA 13 #define KEYCTL_DUMPSP 14 -#define KEYCTL_MAXID 15 +#define KEYCTL_ALLOW_DIFFERENT_IDTYPE 15 +#define KEYCTL_MAXID 16 #ifdef _KERNEL #define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))
CVS commit: src
Module Name:src Committed By: knakahara Date: Tue Aug 9 08:03:22 UTC 2022 Modified Files: src/share/man/man7: sysctl.7 src/sys/netipsec: key.c key_var.h Log Message: Add sysctl entry to improve interconnectivity to some VPN appliances, pointed out by seil-team@IIJ. If we want to allow different identifier types on IDii and IDir, set net.key.allow_different_idtype=1. Default(=0) is the same as before. To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/share/man/man7/sysctl.7 cvs rdiff -u -r1.275 -r1.276 src/sys/netipsec/key.c cvs rdiff -u -r1.5 -r1.6 src/sys/netipsec/key_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/db
Module Name:src Committed By: charlotte Date: Tue Aug 9 07:56:19 UTC 2022 Modified Files: src/usr.bin/db: db.1 Log Message: PR bin/51878: db(1)'s man page to describe the actual behavior of '-q' To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/db/db.1 diff -u src/usr.bin/db/db.1:1.27 src/usr.bin/db/db.1:1.28 --- src/usr.bin/db/db.1:1.27 Fri Feb 17 11:43:24 2012 +++ src/usr.bin/db/db.1 Tue Aug 9 07:56:19 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: db.1,v 1.27 2012/02/17 11:43:24 wiz Exp $ +.\" $NetBSD: db.1,v 1.28 2022/08/09 07:56:19 charlotte Exp $ .\" .\" Copyright (c) 2002-2009,2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -196,7 +196,7 @@ options may be useful to encode the NUL . .It Fl q Quiet operation. -In read mode, missing keys are not considered to be an error. +In read mode, missing keys are considered to be an error. In delete .Pq Fl d and write
CVS commit: src/usr.bin/db
Module Name:src Committed By: charlotte Date: Tue Aug 9 07:56:19 UTC 2022 Modified Files: src/usr.bin/db: db.1 Log Message: PR bin/51878: db(1)'s man page to describe the actual behavior of '-q' To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.1 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: kre Date: Tue Aug 9 07:39:21 UTC 2022 Modified Files: src/doc: CHANGES Log Message: Minor alteration to the description of what df -b does (plus tiny reformat) To generate a diff of this commit: cvs rdiff -u -r1.2895 -r1.2896 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: kre Date: Tue Aug 9 07:39:21 UTC 2022 Modified Files: src/doc: CHANGES Log Message: Minor alteration to the description of what df -b does (plus tiny reformat) To generate a diff of this commit: cvs rdiff -u -r1.2895 -r1.2896 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2895 src/doc/CHANGES:1.2896 --- src/doc/CHANGES:1.2895 Tue Aug 9 06:57:30 2022 +++ src/doc/CHANGES Tue Aug 9 07:39:21 2022 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2895 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2896 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -635,6 +635,6 @@ Changes from NetBSD 9.0 to NetBSD 10.0: kernel: Enable UFS_DIRHASH optimization if the architecture or machine-specific kernel config file can use 128MB of RAM or more. [simonb 20220807] - df(1): Add -b (set blocksize), -H (-h using SI units), -N - (suppress the header line), and -f (show only free space) + df(1): Add -b (output unit: blocks; 512), -H (-h using SI units), + -N (suppress the header line), and -f (show only free space) options. [kre 20220808]