Date: Mon, 20 May 2019 08:01:38 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r347987 - in user/ngie/bug-237403: . cddl/contrib/opensolaris/cmd/zfs contrib/netbsd-tests/lib/libc/sys contrib/wpa/wpa_supplicant etc lib/libbe lib/libc/amd64/sys lib/libc/gen lib/libc... Message-ID: <201905200801.x4K81chP052636@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon May 20 08:01:37 2019 New Revision: 347987 URL: https://svnweb.freebsd.org/changeset/base/347987 Log: MFhead@r347986 Added: user/ngie/bug-237403/lib/libc/gen/group - copied unchanged from r347986, head/lib/libc/gen/group user/ngie/bug-237403/lib/libc/gen/master.passwd - copied unchanged from r347986, head/lib/libc/gen/master.passwd user/ngie/bug-237403/sys/dev/usb/usb_fdt_support.c - copied unchanged from r347986, head/sys/dev/usb/usb_fdt_support.c user/ngie/bug-237403/sys/dev/usb/usb_fdt_support.h - copied unchanged from r347986, head/sys/dev/usb/usb_fdt_support.h user/ngie/bug-237403/sys/modules/lindebugfs/ - copied from r347986, head/sys/modules/lindebugfs/ user/ngie/bug-237403/sys/sys/_eventhandler.h - copied unchanged from r347986, head/sys/sys/_eventhandler.h user/ngie/bug-237403/tests/sys/sys/rb_test.c - copied unchanged from r347986, head/tests/sys/sys/rb_test.c user/ngie/bug-237403/tests/sys/sys/splay_test.c - copied unchanged from r347986, head/tests/sys/sys/splay_test.c Deleted: user/ngie/bug-237403/etc/group user/ngie/bug-237403/etc/master.passwd user/ngie/bug-237403/lib/libc/powerpc64/string/ user/ngie/bug-237403/share/man/man4/de.4 user/ngie/bug-237403/share/man/man4/ed.4 user/ngie/bug-237403/share/man/man4/man4.i386/cs.4 user/ngie/bug-237403/share/man/man4/man4.i386/ep.4 user/ngie/bug-237403/share/man/man4/man4.i386/ex.4 user/ngie/bug-237403/share/man/man4/man4.i386/fe.4 user/ngie/bug-237403/share/man/man4/man4.i386/vx.4 user/ngie/bug-237403/share/man/man4/man4.powerpc/bm.4 user/ngie/bug-237403/share/man/man4/pcn.4 user/ngie/bug-237403/share/man/man4/sf.4 user/ngie/bug-237403/share/man/man4/sn.4 user/ngie/bug-237403/share/man/man4/tl.4 user/ngie/bug-237403/share/man/man4/tx.4 user/ngie/bug-237403/share/man/man4/txp.4 user/ngie/bug-237403/share/man/man4/wb.4 user/ngie/bug-237403/share/man/man4/xe.4 user/ngie/bug-237403/sys/dev/bm/ user/ngie/bug-237403/sys/dev/cs/ user/ngie/bug-237403/sys/dev/de/ user/ngie/bug-237403/sys/dev/ed/ user/ngie/bug-237403/sys/dev/ep/ user/ngie/bug-237403/sys/dev/ex/ user/ngie/bug-237403/sys/dev/fe/ user/ngie/bug-237403/sys/dev/pcn/ user/ngie/bug-237403/sys/dev/sf/ user/ngie/bug-237403/sys/dev/sn/ user/ngie/bug-237403/sys/dev/tl/ user/ngie/bug-237403/sys/dev/tx/ user/ngie/bug-237403/sys/dev/txp/ user/ngie/bug-237403/sys/dev/vx/ user/ngie/bug-237403/sys/dev/wb/ user/ngie/bug-237403/sys/dev/xe/ user/ngie/bug-237403/sys/modules/bm/ user/ngie/bug-237403/sys/modules/cs/ user/ngie/bug-237403/sys/modules/de/ user/ngie/bug-237403/sys/modules/ed/ user/ngie/bug-237403/sys/modules/ep/ user/ngie/bug-237403/sys/modules/ex/ user/ngie/bug-237403/sys/modules/fe/ user/ngie/bug-237403/sys/modules/pcn/ user/ngie/bug-237403/sys/modules/sf/ user/ngie/bug-237403/sys/modules/sn/ user/ngie/bug-237403/sys/modules/tl/ user/ngie/bug-237403/sys/modules/tx/ user/ngie/bug-237403/sys/modules/txp/ user/ngie/bug-237403/sys/modules/vx/ user/ngie/bug-237403/sys/modules/wb/ user/ngie/bug-237403/sys/modules/xe/ Modified: user/ngie/bug-237403/Makefile.inc1 user/ngie/bug-237403/ObsoleteFiles.inc user/ngie/bug-237403/UPDATING user/ngie/bug-237403/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/ngie/bug-237403/contrib/netbsd-tests/lib/libc/sys/t_mlock.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/main.c user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_supplicant.c user/ngie/bug-237403/etc/Makefile user/ngie/bug-237403/lib/libbe/be_access.c user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_fsbase.c user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_gsbase.c user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_fsbase.c user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_gsbase.c user/ngie/bug-237403/lib/libc/gen/Makefile.inc user/ngie/bug-237403/lib/libc/stdlib/bsearch.3 user/ngie/bug-237403/lib/libc/sys/mlock.2 user/ngie/bug-237403/lib/libc/sys/mlockall.2 user/ngie/bug-237403/lib/libc/tests/sys/mlock_helper.c user/ngie/bug-237403/lib/libc/x86/gen/getcontextx.c user/ngie/bug-237403/lib/libc/x86/sys/__vdso_gettc.c user/ngie/bug-237403/lib/libc/x86/sys/pkru.c user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/Makefile user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.3 user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.c user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.h user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/tests/Makefile user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c user/ngie/bug-237403/lib/libnetgraph/msg.c user/ngie/bug-237403/lib/libomp/Makefile user/ngie/bug-237403/lib/libsecureboot/h/libsecureboot.h user/ngie/bug-237403/lib/libsecureboot/openpgp/opgp_key.c user/ngie/bug-237403/lib/libsecureboot/openpgp/opgp_sig.c user/ngie/bug-237403/lib/libsecureboot/tests/tvo.c user/ngie/bug-237403/lib/libsecureboot/vepcr.c user/ngie/bug-237403/lib/libsecureboot/verify_file.c user/ngie/bug-237403/libexec/rc/rc.conf user/ngie/bug-237403/libexec/rtld-elf/rtld_malloc.c user/ngie/bug-237403/release/powerpc/generate-hfs.sh user/ngie/bug-237403/release/powerpc/hfs-boot.bz2.uu user/ngie/bug-237403/sbin/fdisk/fdisk.c user/ngie/bug-237403/sbin/ifconfig/ifconfig.8 user/ngie/bug-237403/sbin/ifconfig/ifconfig.c user/ngie/bug-237403/sbin/nvmecontrol/nvmecontrol.8 user/ngie/bug-237403/share/man/man4/Makefile user/ngie/bug-237403/share/man/man4/ae.4 user/ngie/bug-237403/share/man/man4/man4.i386/Makefile user/ngie/bug-237403/share/man/man4/man4.powerpc/Makefile user/ngie/bug-237403/share/man/man4/ng_eiface.4 user/ngie/bug-237403/share/man/man4/nvd.4 user/ngie/bug-237403/share/man/man4/nvme.4 user/ngie/bug-237403/share/man/man5/rc.conf.5 user/ngie/bug-237403/share/man/man7/development.7 user/ngie/bug-237403/share/man/man9/vmem.9 user/ngie/bug-237403/share/misc/bsd-family-tree user/ngie/bug-237403/stand/common/module.c user/ngie/bug-237403/sys/amd64/amd64/copyout.c user/ngie/bug-237403/sys/amd64/amd64/exception.S user/ngie/bug-237403/sys/amd64/amd64/fpu.c user/ngie/bug-237403/sys/amd64/amd64/genassym.c user/ngie/bug-237403/sys/amd64/amd64/initcpu.c user/ngie/bug-237403/sys/amd64/amd64/machdep.c user/ngie/bug-237403/sys/amd64/amd64/mp_machdep.c user/ngie/bug-237403/sys/amd64/amd64/pmap.c user/ngie/bug-237403/sys/amd64/amd64/support.S user/ngie/bug-237403/sys/amd64/amd64/trap.c user/ngie/bug-237403/sys/amd64/amd64/vm_machdep.c user/ngie/bug-237403/sys/amd64/conf/GENERIC user/ngie/bug-237403/sys/amd64/conf/NOTES user/ngie/bug-237403/sys/amd64/include/pcpu.h user/ngie/bug-237403/sys/amd64/include/pmap.h user/ngie/bug-237403/sys/amd64/include/proc.h user/ngie/bug-237403/sys/amd64/linux/linux.h user/ngie/bug-237403/sys/amd64/linux/linux_machdep.c user/ngie/bug-237403/sys/amd64/linux/linux_ptrace.c user/ngie/bug-237403/sys/amd64/linux/linux_sysvec.c user/ngie/bug-237403/sys/amd64/linux32/linux.h user/ngie/bug-237403/sys/amd64/linux32/linux32_machdep.c user/ngie/bug-237403/sys/amd64/linux32/linux32_sysvec.c user/ngie/bug-237403/sys/amd64/vmm/io/iommu.c user/ngie/bug-237403/sys/amd64/vmm/vmm.c user/ngie/bug-237403/sys/amd64/vmm/x86.c user/ngie/bug-237403/sys/arm/allwinner/a10/a10_intc.c user/ngie/bug-237403/sys/arm/allwinner/a10_dmac.c user/ngie/bug-237403/sys/arm/allwinner/a31_dmac.c user/ngie/bug-237403/sys/arm/allwinner/aw_ccu.c user/ngie/bug-237403/sys/arm/allwinner/aw_reset.c user/ngie/bug-237403/sys/arm/allwinner/aw_rsb.c user/ngie/bug-237403/sys/arm/allwinner/aw_spi.c user/ngie/bug-237403/sys/arm/allwinner/aw_thermal.c user/ngie/bug-237403/sys/arm/allwinner/aw_wdog.c user/ngie/bug-237403/sys/arm/allwinner/clkng/aw_ccung.c user/ngie/bug-237403/sys/arm/allwinner/clkng/aw_clk_nm.c user/ngie/bug-237403/sys/arm/allwinner/clkng/aw_clk_prediv_mux.c user/ngie/bug-237403/sys/arm/allwinner/clkng/ccu_sun8i_r.c user/ngie/bug-237403/sys/arm/arm/machdep.c user/ngie/bug-237403/sys/arm/arm/pl190.c user/ngie/bug-237403/sys/arm/broadcom/bcm2835/bcm2835_rng.c user/ngie/bug-237403/sys/arm/broadcom/bcm2835/bcm2835_wdog.c user/ngie/bug-237403/sys/arm/broadcom/bcm2835/bcm2836.c user/ngie/bug-237403/sys/arm/freescale/imx/imx_wdog.c user/ngie/bug-237403/sys/arm/mv/armada/thermal.c user/ngie/bug-237403/sys/arm/mv/armada/wdt.c user/ngie/bug-237403/sys/arm/mv/mv_spi.c user/ngie/bug-237403/sys/arm/mv/timer.c user/ngie/bug-237403/sys/arm/nvidia/tegra124/tegra124_machdep.c user/ngie/bug-237403/sys/arm/nvidia/tegra124/tegra124_pmc.c user/ngie/bug-237403/sys/arm/nvidia/tegra_xhci.c user/ngie/bug-237403/sys/arm/ti/ti_pruss.c user/ngie/bug-237403/sys/arm/ti/ti_wdt.c user/ngie/bug-237403/sys/arm/versatile/versatile_pci.c user/ngie/bug-237403/sys/arm/versatile/versatile_sic.c user/ngie/bug-237403/sys/arm64/arm64/busdma_bounce.c user/ngie/bug-237403/sys/arm64/arm64/elf32_machdep.c user/ngie/bug-237403/sys/arm64/arm64/freebsd32_machdep.c user/ngie/bug-237403/sys/arm64/arm64/gicv3_its.c user/ngie/bug-237403/sys/arm64/arm64/machdep.c user/ngie/bug-237403/sys/arm64/coresight/coresight.c user/ngie/bug-237403/sys/arm64/include/bus_dma.h user/ngie/bug-237403/sys/arm64/include/bus_dma_impl.h user/ngie/bug-237403/sys/arm64/include/cpufunc.h user/ngie/bug-237403/sys/arm64/include/ifunc.h user/ngie/bug-237403/sys/arm64/linux/linux.h user/ngie/bug-237403/sys/arm64/linux/linux_sysvec.c user/ngie/bug-237403/sys/arm64/rockchip/clk/rk3399_cru.c user/ngie/bug-237403/sys/arm64/rockchip/clk/rk_clk_pll.c user/ngie/bug-237403/sys/arm64/rockchip/clk/rk_clk_pll.h user/ngie/bug-237403/sys/arm64/rockchip/clk/rk_cru.c user/ngie/bug-237403/sys/cam/cam_periph.h user/ngie/bug-237403/sys/cam/ctl/ctl_ha.c user/ngie/bug-237403/sys/cddl/compat/opensolaris/kern/opensolaris.c user/ngie/bug-237403/sys/cddl/dev/dtrace/amd64/dtrace_isa.c user/ngie/bug-237403/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S user/ngie/bug-237403/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c user/ngie/bug-237403/sys/compat/lindebugfs/lindebugfs.c user/ngie/bug-237403/sys/compat/linux/linux.c user/ngie/bug-237403/sys/compat/linux/linux.h user/ngie/bug-237403/sys/compat/linux/linux_common.h user/ngie/bug-237403/sys/compat/linux/linux_emul.h user/ngie/bug-237403/sys/compat/linux/linux_file.c user/ngie/bug-237403/sys/compat/linux/linux_fork.c user/ngie/bug-237403/sys/compat/linux/linux_getcwd.c user/ngie/bug-237403/sys/compat/linux/linux_ioctl.c user/ngie/bug-237403/sys/compat/linux/linux_misc.c user/ngie/bug-237403/sys/compat/linux/linux_misc.h user/ngie/bug-237403/sys/compat/linux/linux_signal.c user/ngie/bug-237403/sys/compat/linux/linux_socket.c user/ngie/bug-237403/sys/compat/linux/linux_socket.h user/ngie/bug-237403/sys/compat/linux/linux_stats.c user/ngie/bug-237403/sys/compat/linuxkpi/common/include/asm/uaccess.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/atomic.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/compiler.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/device.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/interrupt.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/kernel.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/ktime.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/mm_types.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/pci.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/preempt.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/random.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/sched.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/seq_file.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/timer.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/uaccess.h user/ngie/bug-237403/sys/compat/linuxkpi/common/include/linux/ww_mutex.h user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_current.c user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_pci.c user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_tasklet.c user/ngie/bug-237403/sys/conf/NOTES user/ngie/bug-237403/sys/conf/files user/ngie/bug-237403/sys/conf/files.arm64 user/ngie/bug-237403/sys/conf/files.i386 user/ngie/bug-237403/sys/conf/files.powerpc user/ngie/bug-237403/sys/conf/kern.post.mk user/ngie/bug-237403/sys/conf/kern.pre.mk user/ngie/bug-237403/sys/conf/kmod.mk user/ngie/bug-237403/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c user/ngie/bug-237403/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c user/ngie/bug-237403/sys/crypto/aesni/aesni.c user/ngie/bug-237403/sys/crypto/armv8/armv8_crypto.c user/ngie/bug-237403/sys/crypto/blake2/blake2_cryptodev.c user/ngie/bug-237403/sys/crypto/ccp/ccp.c user/ngie/bug-237403/sys/crypto/ccp/ccp_hardware.c user/ngie/bug-237403/sys/ddb/db_command.c user/ngie/bug-237403/sys/ddb/db_ps.c user/ngie/bug-237403/sys/dev/aac/aac_pci.c user/ngie/bug-237403/sys/dev/acpi_support/acpi_panasonic.c user/ngie/bug-237403/sys/dev/acpica/acpi.c user/ngie/bug-237403/sys/dev/acpica/acpi_lid.c user/ngie/bug-237403/sys/dev/acpica/acpi_thermal.c user/ngie/bug-237403/sys/dev/acpica/acpi_video.c user/ngie/bug-237403/sys/dev/acpica/acpivar.h user/ngie/bug-237403/sys/dev/adb/adb_kbd.c user/ngie/bug-237403/sys/dev/adb/adb_mouse.c user/ngie/bug-237403/sys/dev/ae/if_ae.c user/ngie/bug-237403/sys/dev/ahci/ahci_generic.c user/ngie/bug-237403/sys/dev/amdsbwd/amdsbwd.c user/ngie/bug-237403/sys/dev/atkbdc/psm.c user/ngie/bug-237403/sys/dev/bge/if_bge.c user/ngie/bug-237403/sys/dev/bge/if_bgereg.h user/ngie/bug-237403/sys/dev/cardbus/cardbus.c user/ngie/bug-237403/sys/dev/cmx/cmx.c user/ngie/bug-237403/sys/dev/coretemp/coretemp.c user/ngie/bug-237403/sys/dev/cpuctl/cpuctl.c user/ngie/bug-237403/sys/dev/cxgbe/cxgbei/cxgbei.c user/ngie/bug-237403/sys/dev/cxgbe/cxgbei/icl_cxgbei.c user/ngie/bug-237403/sys/dev/cxgbe/tom/t4_tls.c user/ngie/bug-237403/sys/dev/dcons/dcons_crom.c user/ngie/bug-237403/sys/dev/dcons/dcons_os.c user/ngie/bug-237403/sys/dev/dcons/dcons_os.h user/ngie/bug-237403/sys/dev/evdev/evdev_private.h user/ngie/bug-237403/sys/dev/extres/syscon/syscon_generic.c user/ngie/bug-237403/sys/dev/firewire/firewire.c user/ngie/bug-237403/sys/dev/firewire/fwohci.c user/ngie/bug-237403/sys/dev/ichwd/ichwd.c user/ngie/bug-237403/sys/dev/ida/ida_disk.c user/ngie/bug-237403/sys/dev/ida/ida_pci.c user/ngie/bug-237403/sys/dev/iicbus/twsi/a10_twsi.c user/ngie/bug-237403/sys/dev/iicbus/twsi/twsi.c user/ngie/bug-237403/sys/dev/iir/iir_ctrl.c user/ngie/bug-237403/sys/dev/ioat/ioat.c user/ngie/bug-237403/sys/dev/ipmi/ipmi.c user/ngie/bug-237403/sys/dev/ipmi/ipmi_opal.c user/ngie/bug-237403/sys/dev/ips/ips.c user/ngie/bug-237403/sys/dev/iscsi/icl_soft_proxy.c user/ngie/bug-237403/sys/dev/iscsi_initiator/iscsivar.h user/ngie/bug-237403/sys/dev/iwm/if_iwm_notif_wait.c user/ngie/bug-237403/sys/dev/ksyms/ksyms.c user/ngie/bug-237403/sys/dev/led/led.c user/ngie/bug-237403/sys/dev/liquidio/lio_bsd.h user/ngie/bug-237403/sys/dev/mfi/mfi_disk.c user/ngie/bug-237403/sys/dev/mfi/mfi_pci.c user/ngie/bug-237403/sys/dev/mfi/mfi_syspd.c user/ngie/bug-237403/sys/dev/mlx/mlxvar.h user/ngie/bug-237403/sys/dev/mmc/host/dwmmc.c user/ngie/bug-237403/sys/dev/mpr/mprvar.h user/ngie/bug-237403/sys/dev/mps/mpsvar.h user/ngie/bug-237403/sys/dev/mrsas/mrsas.h user/ngie/bug-237403/sys/dev/netmap/if_ptnet.c user/ngie/bug-237403/sys/dev/nmdm/nmdm.c user/ngie/bug-237403/sys/dev/ntb/if_ntb/if_ntb.c user/ngie/bug-237403/sys/dev/ntb/ntb_hw/ntb_hw_intel.c user/ngie/bug-237403/sys/dev/ow/ow.c user/ngie/bug-237403/sys/dev/pccard/pccard.c user/ngie/bug-237403/sys/dev/pci/pci.c user/ngie/bug-237403/sys/dev/pci/pci_host_generic.c user/ngie/bug-237403/sys/dev/pci/pci_host_generic_acpi.c user/ngie/bug-237403/sys/dev/pci/pci_iov.c user/ngie/bug-237403/sys/dev/pci/pci_pci.c user/ngie/bug-237403/sys/dev/pci/pcivar.h user/ngie/bug-237403/sys/dev/random/fortuna.c user/ngie/bug-237403/sys/dev/random/ivy.c user/ngie/bug-237403/sys/dev/scc/scc_core.c user/ngie/bug-237403/sys/dev/scc/scc_dev_quicc.c user/ngie/bug-237403/sys/dev/scc/scc_dev_sab82532.c user/ngie/bug-237403/sys/dev/scc/scc_dev_z8530.c user/ngie/bug-237403/sys/dev/smartpqi/smartpqi_includes.h user/ngie/bug-237403/sys/dev/sound/pcm/sound.h user/ngie/bug-237403/sys/dev/tws/tws.h user/ngie/bug-237403/sys/dev/usb/net/if_cdce.c user/ngie/bug-237403/sys/dev/usb/net/if_smsc.c user/ngie/bug-237403/sys/dev/usb/net/if_usie.c user/ngie/bug-237403/sys/dev/usb/net/uhso.c user/ngie/bug-237403/sys/dev/usb/serial/u3g.c user/ngie/bug-237403/sys/dev/usb/usb_device.c user/ngie/bug-237403/sys/dev/usb/usbdi.h user/ngie/bug-237403/sys/dev/usb/wlan/if_run.c user/ngie/bug-237403/sys/dev/veriexec/veriexec_ioctl.h user/ngie/bug-237403/sys/dev/veriexec/verified_exec.c user/ngie/bug-237403/sys/dev/viawd/viawd.c user/ngie/bug-237403/sys/dev/vkbd/vkbd.c user/ngie/bug-237403/sys/dev/vmware/vmci/vmci.c user/ngie/bug-237403/sys/dev/vt/vt_cpulogos.c user/ngie/bug-237403/sys/dev/vt/vt_sysmouse.c user/ngie/bug-237403/sys/dev/watchdog/watchdog.c user/ngie/bug-237403/sys/dev/xdma/xdma.c user/ngie/bug-237403/sys/dev/xdma/xdma_bank.c user/ngie/bug-237403/sys/dev/xdma/xdma_bio.c user/ngie/bug-237403/sys/dev/xdma/xdma_mbuf.c user/ngie/bug-237403/sys/dev/xdma/xdma_queue.c user/ngie/bug-237403/sys/dev/xdma/xdma_sg.c user/ngie/bug-237403/sys/dev/xen/console/xen_console.c user/ngie/bug-237403/sys/dev/xen/debug/debug.c user/ngie/bug-237403/sys/fs/devfs/devfs_vnops.c user/ngie/bug-237403/sys/i386/conf/GENERIC user/ngie/bug-237403/sys/i386/conf/NOTES user/ngie/bug-237403/sys/i386/i386/elan-mmcr.c user/ngie/bug-237403/sys/i386/i386/exception.s user/ngie/bug-237403/sys/i386/i386/genassym.c user/ngie/bug-237403/sys/i386/i386/geode.c user/ngie/bug-237403/sys/i386/i386/initcpu.c user/ngie/bug-237403/sys/i386/i386/longrun.c user/ngie/bug-237403/sys/i386/i386/mp_machdep.c user/ngie/bug-237403/sys/i386/i386/npx.c user/ngie/bug-237403/sys/i386/i386/pmap_base.c user/ngie/bug-237403/sys/i386/i386/support.s user/ngie/bug-237403/sys/i386/include/pcpu.h user/ngie/bug-237403/sys/i386/linux/linux.h user/ngie/bug-237403/sys/i386/linux/linux_machdep.c user/ngie/bug-237403/sys/i386/linux/linux_sysvec.c user/ngie/bug-237403/sys/kern/bus_if.m user/ngie/bug-237403/sys/kern/imgact_elf.c user/ngie/bug-237403/sys/kern/init_main.c user/ngie/bug-237403/sys/kern/kern_clock.c user/ngie/bug-237403/sys/kern/kern_exec.c user/ngie/bug-237403/sys/kern/kern_exit.c user/ngie/bug-237403/sys/kern/kern_fork.c user/ngie/bug-237403/sys/kern/kern_intr.c user/ngie/bug-237403/sys/kern/kern_proc.c user/ngie/bug-237403/sys/kern/kern_thread.c user/ngie/bug-237403/sys/kern/stack_protector.c user/ngie/bug-237403/sys/kern/subr_blist.c user/ngie/bug-237403/sys/kern/subr_bus_dma.c user/ngie/bug-237403/sys/kern/subr_intr.c user/ngie/bug-237403/sys/kern/subr_param.c user/ngie/bug-237403/sys/kern/subr_power.c user/ngie/bug-237403/sys/kern/subr_turnstile.c user/ngie/bug-237403/sys/kern/subr_vmem.c user/ngie/bug-237403/sys/kern/subr_witness.c user/ngie/bug-237403/sys/kern/tty_tty.c user/ngie/bug-237403/sys/kern/vfs_cache.c user/ngie/bug-237403/sys/kern/vfs_mountroot.c user/ngie/bug-237403/sys/kern/vfs_subr.c user/ngie/bug-237403/sys/libkern/arc4random.c user/ngie/bug-237403/sys/mips/atheros/ar71xx_gpio.c user/ngie/bug-237403/sys/mips/atheros/ar71xx_machdep.c user/ngie/bug-237403/sys/mips/atheros/ar71xx_wdog.c user/ngie/bug-237403/sys/mips/conf/std.AR_MIPS_BASE user/ngie/bug-237403/sys/mips/include/pmap.h user/ngie/bug-237403/sys/mips/mips/pmap.c user/ngie/bug-237403/sys/modules/Makefile user/ngie/bug-237403/sys/modules/ipsec/Makefile user/ngie/bug-237403/sys/modules/linprocfs/Makefile user/ngie/bug-237403/sys/modules/linsysfs/Makefile user/ngie/bug-237403/sys/modules/linux/Makefile user/ngie/bug-237403/sys/modules/linux64/Makefile user/ngie/bug-237403/sys/modules/linux_common/Makefile user/ngie/bug-237403/sys/modules/linuxkpi/Makefile user/ngie/bug-237403/sys/modules/usb/usb/Makefile user/ngie/bug-237403/sys/net/bpf.c user/ngie/bug-237403/sys/net/bpf.h user/ngie/bug-237403/sys/net/bpf_buffer.c user/ngie/bug-237403/sys/net/bpfdesc.h user/ngie/bug-237403/sys/net/ethernet.h user/ngie/bug-237403/sys/net/if.c user/ngie/bug-237403/sys/net/if_clone.h user/ngie/bug-237403/sys/net/if_llatbl.c user/ngie/bug-237403/sys/net/if_llatbl.h user/ngie/bug-237403/sys/net/if_tuntap.c user/ngie/bug-237403/sys/net/if_var.h user/ngie/bug-237403/sys/net/if_vlan_var.h user/ngie/bug-237403/sys/net/iflib.c user/ngie/bug-237403/sys/net/route.c user/ngie/bug-237403/sys/netinet/if_ether.c user/ngie/bug-237403/sys/netinet/ip_output.c user/ngie/bug-237403/sys/netinet/netdump/netdump_client.c user/ngie/bug-237403/sys/netinet/sctp_usrreq.c user/ngie/bug-237403/sys/netinet/sctputil.c user/ngie/bug-237403/sys/netinet/sctputil.h user/ngie/bug-237403/sys/netinet/tcp_hpts.c user/ngie/bug-237403/sys/netinet/tcp_offload.c user/ngie/bug-237403/sys/netinet/toecore.c user/ngie/bug-237403/sys/netinet/toecore.h user/ngie/bug-237403/sys/netinet6/icmp6.c user/ngie/bug-237403/sys/netinet6/ip6_output.c user/ngie/bug-237403/sys/netinet6/nd6.c user/ngie/bug-237403/sys/netinet6/nd6_nbr.c user/ngie/bug-237403/sys/powerpc/aim/mmu_oea64.c user/ngie/bug-237403/sys/powerpc/aim/mp_cpudep.c user/ngie/bug-237403/sys/powerpc/conf/GENERIC user/ngie/bug-237403/sys/powerpc/conf/NOTES user/ngie/bug-237403/sys/powerpc/ofw/ofw_machdep.c user/ngie/bug-237403/sys/powerpc/powermac/cpcht.c user/ngie/bug-237403/sys/powerpc/powermac/cuda.c user/ngie/bug-237403/sys/powerpc/powermac/pmu.c user/ngie/bug-237403/sys/powerpc/powermac/smu.c user/ngie/bug-237403/sys/powerpc/powermac/vcoregpio.c user/ngie/bug-237403/sys/powerpc/powernv/opal.h user/ngie/bug-237403/sys/powerpc/powernv/opal_async.c user/ngie/bug-237403/sys/powerpc/powernv/opal_console.c user/ngie/bug-237403/sys/powerpc/powernv/opal_dev.c user/ngie/bug-237403/sys/powerpc/powernv/opal_flash.c user/ngie/bug-237403/sys/powerpc/powernv/opal_sensor.c user/ngie/bug-237403/sys/powerpc/powernv/xive.c user/ngie/bug-237403/sys/powerpc/powerpc/cpu.c user/ngie/bug-237403/sys/powerpc/powerpc/openpic.c user/ngie/bug-237403/sys/powerpc/ps3/ps3bus.c user/ngie/bug-237403/sys/powerpc/pseries/rtas_dev.c user/ngie/bug-237403/sys/powerpc/pseries/xics.c user/ngie/bug-237403/sys/riscv/include/pcpu.h user/ngie/bug-237403/sys/riscv/riscv/intr_machdep.c user/ngie/bug-237403/sys/riscv/riscv/locore.S user/ngie/bug-237403/sys/riscv/riscv/machdep.c user/ngie/bug-237403/sys/riscv/riscv/mp_machdep.c user/ngie/bug-237403/sys/riscv/riscv/pmap.c user/ngie/bug-237403/sys/security/audit/audit.c user/ngie/bug-237403/sys/security/audit/audit_trigger.c user/ngie/bug-237403/sys/security/mac_veriexec/mac_veriexec.c user/ngie/bug-237403/sys/security/mac_veriexec/mac_veriexec.h user/ngie/bug-237403/sys/security/mac_veriexec/mac_veriexec_internal.h user/ngie/bug-237403/sys/security/mac_veriexec/veriexec_metadata.c user/ngie/bug-237403/sys/sparc64/conf/GENERIC user/ngie/bug-237403/sys/sys/_lock.h user/ngie/bug-237403/sys/sys/blist.h user/ngie/bug-237403/sys/sys/bus.h user/ngie/bug-237403/sys/sys/bus_dma.h user/ngie/bug-237403/sys/sys/conf.h user/ngie/bug-237403/sys/sys/cpu.h user/ngie/bug-237403/sys/sys/disk/mbr.h user/ngie/bug-237403/sys/sys/eventhandler.h user/ngie/bug-237403/sys/sys/interrupt.h user/ngie/bug-237403/sys/sys/lock.h user/ngie/bug-237403/sys/sys/malloc.h user/ngie/bug-237403/sys/sys/param.h user/ngie/bug-237403/sys/sys/pcpu.h user/ngie/bug-237403/sys/sys/power.h user/ngie/bug-237403/sys/sys/proc.h user/ngie/bug-237403/sys/sys/seqc.h user/ngie/bug-237403/sys/sys/systm.h user/ngie/bug-237403/sys/sys/vmmeter.h user/ngie/bug-237403/sys/sys/watchdog.h user/ngie/bug-237403/sys/vm/memguard.c user/ngie/bug-237403/sys/vm/swap_pager.c user/ngie/bug-237403/sys/vm/vm_glue.c user/ngie/bug-237403/sys/vm/vm_map.c user/ngie/bug-237403/sys/vm/vm_map.h user/ngie/bug-237403/sys/vm/vm_meter.c user/ngie/bug-237403/sys/vm/vm_mmap.c user/ngie/bug-237403/sys/vm/vm_pageout.c user/ngie/bug-237403/sys/vm/vm_pageout.h user/ngie/bug-237403/sys/vm/vm_unix.c user/ngie/bug-237403/sys/x86/acpica/OsdEnvironment.c user/ngie/bug-237403/sys/x86/cpufreq/smist.c user/ngie/bug-237403/sys/x86/include/bus_dma.h user/ngie/bug-237403/sys/x86/include/busdma_impl.h user/ngie/bug-237403/sys/x86/include/ifunc.h user/ngie/bug-237403/sys/x86/include/specialreg.h user/ngie/bug-237403/sys/x86/include/x86_smp.h user/ngie/bug-237403/sys/x86/include/x86_var.h user/ngie/bug-237403/sys/x86/iommu/busdma_dmar.c user/ngie/bug-237403/sys/x86/iommu/intel_drv.c user/ngie/bug-237403/sys/x86/iommu/intel_fault.c user/ngie/bug-237403/sys/x86/iommu/intel_gas.c user/ngie/bug-237403/sys/x86/iommu/intel_intrmap.c user/ngie/bug-237403/sys/x86/iommu/intel_qi.c user/ngie/bug-237403/sys/x86/iommu/intel_quirks.c user/ngie/bug-237403/sys/x86/x86/busdma_bounce.c user/ngie/bug-237403/sys/x86/x86/cpu_machdep.c user/ngie/bug-237403/sys/x86/x86/identcpu.c user/ngie/bug-237403/sys/x86/x86/mp_x86.c user/ngie/bug-237403/sys/x86/x86/tsc.c user/ngie/bug-237403/sys/x86/x86/ucode.c user/ngie/bug-237403/tests/sys/netipsec/tunnel/utils.subr user/ngie/bug-237403/tests/sys/sys/Makefile user/ngie/bug-237403/tools/build/beinstall.sh user/ngie/bug-237403/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/bug-237403/tools/tools/tinybsd/conf/firewall/etc/rc.firewall user/ngie/bug-237403/usr.bin/dtc/fdt.hh user/ngie/bug-237403/usr.bin/vmstat/vmstat.c user/ngie/bug-237403/usr.sbin/bhyve/virtio.c user/ngie/bug-237403/usr.sbin/camdd/camdd.c user/ngie/bug-237403/usr.sbin/efibootmgr/efibootmgr.c user/ngie/bug-237403/usr.sbin/etcupdate/etcupdate.sh user/ngie/bug-237403/usr.sbin/jail/jail.8 user/ngie/bug-237403/usr.sbin/mergemaster/mergemaster.sh user/ngie/bug-237403/usr.sbin/mountd/mountd.c user/ngie/bug-237403/usr.sbin/ntp/ntpd/leap-seconds Directory Properties: user/ngie/bug-237403/ (props changed) user/ngie/bug-237403/cddl/ (props changed) user/ngie/bug-237403/cddl/contrib/opensolaris/ (props changed) user/ngie/bug-237403/cddl/contrib/opensolaris/cmd/zfs/ (props changed) user/ngie/bug-237403/contrib/netbsd-tests/ (props changed) user/ngie/bug-237403/contrib/wpa/ (props changed) user/ngie/bug-237403/sys/contrib/ipfilter/ (props changed) Modified: user/ngie/bug-237403/Makefile.inc1 ============================================================================== --- user/ngie/bug-237403/Makefile.inc1 Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/Makefile.inc1 Mon May 20 08:01:37 2019 (r347987) @@ -871,8 +871,8 @@ DB_FROM_SRC= yes .endif .if defined(DB_FROM_SRC) -INSTALLFLAGS+= -N ${.CURDIR}/etc -MTREEFLAGS+= -N ${.CURDIR}/etc +INSTALLFLAGS+= -N ${.CURDIR}/lib/libc/gen +MTREEFLAGS+= -N ${.CURDIR}/lib/libc/gen .endif _INSTALL_DDIR= ${DESTDIR}/${DISTDIR} INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::} Modified: user/ngie/bug-237403/ObsoleteFiles.inc ============================================================================== --- user/ngie/bug-237403/ObsoleteFiles.inc Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/ObsoleteFiles.inc Mon May 20 08:01:37 2019 (r347987) @@ -38,9 +38,39 @@ # xargs -n1 | sort | uniq -d; # done +# 20190517: Remove obsolete 10 and 10/100 ethernet drivers. +OLD_FILES+=usr/share/man/man4/bm.4 +OLD_FILES+=usr/share/man/man4/cs.4 +OLD_FILES+=usr/share/man/man4/de.4 +OLD_FILES+=usr/share/man/man4/if_de.4 +OLD_FILES+=usr/share/man/man4/ed.4 +OLD_FILES+=usr/share/man/man4/if_ed.4 +OLD_FILES+=usr/share/man/man4/ep.4 +OLD_FILES+=usr/share/man/man4/ex.4 +OLD_FILES+=usr/share/man/man4/fe.4 +OLD_FILES+=usr/share/man/man4/pcn.4 +OLD_FILES+=usr/share/man/man4/if_pcn.4 +OLD_FILES+=usr/share/man/man4/sf.4 +OLD_FILES+=usr/share/man/man4/if_sf.4 +OLD_FILES+=usr/share/man/man4/sn.4 +OLD_FILES+=usr/share/man/man4/if_sn.4 +OLD_FILES+=usr/share/man/man4/tl.4 +OLD_FILES+=usr/share/man/man4/if_tl.4 +OLD_FILES+=usr/share/man/man4/tx.4 +OLD_FILES+=usr/share/man/man4/if_tx.4 +OLD_FILES+=usr/share/man/man4/txp.4 +OLD_FILES+=usr/share/man/man4/if_txp.4 +OLD_FILES+=usr/share/man/man4/vx.4 +OLD_FILES+=usr/share/man/man4/wb.4 +OLD_FILES+=usr/share/man/man4/xe.4 +OLD_FILES+=usr/share/man/man4/if_xe.4 +# 20190513: libcap_sysctl interface change +OLD_FILES+=lib/casper/libcap_sysctl.1 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package. OLD_FILES+=usr/tests/sys/opencrypto/dpkt.py OLD_FILES+=usr/tests/sys/opencrypto/dpkt.pyc +# 20190326: tzdata 2019a import +OLD_FILES+=usr/share/zoneinfo/Etc/UCT # 20190304: new libc++ import which bumps version from 7.0.1 to 8.0.0. OLD_FILES+=usr/include/c++/v1/experimental/dynarray # 20190304: new clang import which bumps version from 7.0.1 to 8.0.0. @@ -199,16 +229,21 @@ OLD_FILES+=usr/include/sys/seq.h OLD_FILES+=usr/lib/libprivateifconfig.a OLD_FILES+=usr/lib/libprivateifconfig_p.a # 20190131: pfil(9) changed -OLD_FILES+=usr/share/man/man9/pfil_hook_get.9 -OLD_FILES+=usr/share/man/man9/pfil_rlock.9 -OLD_FILES+=usr/share/man/man9/pfil_runlock.9 -OLD_FILES+=usr/share/man/man9/pfil_wlock.9 -OLD_FILES+=usr/share/man/man9/pfil_wunlock.9 +OLD_FILES+=usr/share/man/man9/pfil_hook_get.9.gz +OLD_FILES+=usr/share/man/man9/pfil_rlock.9.gz +OLD_FILES+=usr/share/man/man9/pfil_runlock.9.gz +OLD_FILES+=usr/share/man/man9/pfil_wlock.9.gz +OLD_FILES+=usr/share/man/man9/pfil_wunlock.9.gz # 20190126: adv(4) / adw(4) removal OLD_FILES+=usr/share/man/man4/adv.4.gz OLD_FILES+=usr/share/man/man4/adw.4.gz +# 20190123: nonexistant cred_update_thread(9) removed +OLD_FILES+=usr/share/man/man9/cred_update_thread.9.gz # 20190114: old pbuf allocator removed +OLD_FILES+=usr/share/man/man9/getpbuf.9.gz OLD_FILES+=usr/share/man/man9/pbuf.9.gz +OLD_FILES+=usr/share/man/man9/relpbuf.9.gz +OLD_FILES+=usr/share/man/man9/trypbuf.9.gz # 20181219: ibcs removal OLD_FILES+=usr/share/examples/ibcs2/hello.uu OLD_FILES+=usr/share/examples/ibcs2/README Modified: user/ngie/bug-237403/UPDATING ============================================================================== --- user/ngie/bug-237403/UPDATING Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/UPDATING Mon May 20 08:01:37 2019 (r347987) @@ -31,6 +31,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20190517: + For users of mergemaster, after recent changes to locations of + master.passwd and group in the source tree mergemaster needs to be + updated. Before running `mergemaster -p', cd to usr.sbin/mergemaster + and run `make install'. + +20190513: + User-wired pages now have their own counter, + vm.stats.vm.v_user_wire_count. The vm.max_wired sysctl was renamed + to vm.max_user_wired and changed from an unsigned int to an unsigned + long. bhyve VMs wired with the -S are now subject to the user + wiring limit; the vm.max_user_wired sysctl may need to be tuned to + avoid running into the limit. + 20190507: The IPSEC option has been removed from GENERIC. Users requiring ipsec(4) must now load the ipsec(4) kernel module. @@ -68,13 +82,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: produce warnings in dmesg when the conditions are met. 20190416: - The tunable "security.stack_protect.permit_nonrandom_cookies" may be - set to a non-zero value to boot systems that do not provide early - entropy. Otherwise, such systems may see the panic message: - "cannot initialize stack cookies because random device is not yet - seeded." - -20190416: The loadable random module KPI has changed; the random_infra_init() routine now requires a 3rd function pointer for a bool (*)(void) method that returns true if the random device is seeded (and @@ -92,7 +99,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: The fuse(4) module has been renamed to fusefs(4) for consistency with other filesystems. You should update any kld_load="fuse" entries in /etc/rc.conf, fuse_load="YES" entries in /boot/loader.conf, and - "options FUSE" enties in kernel config files. + "options FUSE" entries in kernel config files. 20190304: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to @@ -156,7 +163,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: 20181211: Remove the timed and netdate programs from the base tree. Setting - the time with these deamons has been obsolete for over a decade. + the time with these daemons has been obsolete for over a decade. 20181126: On amd64, arm64 and armv7 (architectures that install LLVM's ld.lld @@ -219,7 +226,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: 20181009: OpenSSL has been updated to version 1.1.1. This update included - additional various API changes througout the base system. It is + additional various API changes throughout the base system. It is important to rebuild third-party software after upgrading. The value of __FreeBSD_version has been bumped accordingly. @@ -316,13 +323,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: 20180719: ARM64 now have efifb support, if you want to have serial console on your arm64 board when an screen is connected and the bootloader - setup a framebuffer for us to use, just add : + setup a frame buffer for us to use, just add : boot_serial=YES boot_multicons=YES in /boot/loader.conf For Raspberry Pi 3 (RPI) users, this is needed even if you don't have - an screen connected as the firmware will setup a framebuffer are that - u-boot will expose as an EFI framebuffer. + an screen connected as the firmware will setup a frame buffer are that + u-boot will expose as an EFI frame buffer. 20180719: New uid:gid added, ntpd:ntpd (123:123). Be sure to run mergemaster @@ -421,7 +428,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: 20180508: The nxge(4) driver has been removed. This driver was for PCI-X 10g - cards made by s2io/Neterion. The company was aquired by Exar and + cards made by s2io/Neterion. The company was acquired by Exar and no longer sells or supports Ethernet products. If you have device nxge in your kernel config file it must be removed. @@ -512,7 +519,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: 20180212: FreeBSD boot loader enhanced with Lua scripting. It's purely opt-in for now by building WITH_LOADER_LUA and WITHOUT_FORTH in /etc/src.conf. - Co-existance for the transition period will come shortly. Booting is a + Co-existence for the transition period will come shortly. Booting is a complex environment and test coverage for Lua-enabled loaders has been thin, so it would be prudent to assume it might not work and make provisions for backup boot methods. Modified: user/ngie/bug-237403/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/ngie/bug-237403/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon May 20 08:01:37 2019 (r347987) @@ -2361,6 +2361,7 @@ us_compare(const void *larg, const void *rarg, void *u case ZFS_PROP_NAME: propname = "name"; if (numname) { +compare_nums: (void) nvlist_lookup_uint64(lnvl, propname, &lv64); (void) nvlist_lookup_uint64(rnvl, propname, @@ -2368,10 +2369,12 @@ us_compare(const void *larg, const void *rarg, void *u if (rv64 != lv64) rc = (rv64 < lv64) ? 1 : -1; } else { - (void) nvlist_lookup_string(lnvl, propname, - &lvstr); - (void) nvlist_lookup_string(rnvl, propname, - &rvstr); + if ((nvlist_lookup_string(lnvl, propname, + &lvstr) == ENOENT) || + (nvlist_lookup_string(rnvl, propname, + &rvstr) == ENOENT)) { + goto compare_nums; + } rc = strcmp(lvstr, rvstr); } break; Modified: user/ngie/bug-237403/contrib/netbsd-tests/lib/libc/sys/t_mlock.c ============================================================================== --- user/ngie/bug-237403/contrib/netbsd-tests/lib/libc/sys/t_mlock.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/contrib/netbsd-tests/lib/libc/sys/t_mlock.c Mon May 20 08:01:37 2019 (r347987) @@ -51,7 +51,7 @@ __RCSID("$NetBSD: t_mlock.c,v 1.6 2016/08/09 12:02:44 #define _KMEMUSER #include <machine/vmparam.h> -void set_vm_max_wired(int); +void set_vm_max_wired(u_long); void restore_vm_max_wired(void); #endif Modified: user/ngie/bug-237403/contrib/wpa/wpa_supplicant/main.c ============================================================================== --- user/ngie/bug-237403/contrib/wpa/wpa_supplicant/main.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/contrib/wpa/wpa_supplicant/main.c Mon May 20 08:01:37 2019 (r347987) @@ -199,6 +199,11 @@ int main(int argc, char *argv[]) wpa_supplicant_fd_workaround(1); +#ifdef CONFIG_DRIVER_NDIS + void driver_ndis_init_ops(void); + driver_ndis_init_ops(); +#endif /* CONFIG_DRIVER_NDIS */ + for (;;) { c = getopt(argc, argv, "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW"); Modified: user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_supplicant.c ============================================================================== --- user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_supplicant.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/contrib/wpa/wpa_supplicant/wpa_supplicant.c Mon May 20 08:01:37 2019 (r347987) @@ -6357,13 +6357,6 @@ struct wpa_global * wpa_supplicant_init(struct wpa_par if (params == NULL) return NULL; -#ifdef CONFIG_DRIVER_NDIS - { - void driver_ndis_init_ops(void); - driver_ndis_init_ops(); - } -#endif /* CONFIG_DRIVER_NDIS */ - #ifndef CONFIG_NO_WPA_MSG wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); #endif /* CONFIG_NO_WPA_MSG */ Modified: user/ngie/bug-237403/etc/Makefile ============================================================================== --- user/ngie/bug-237403/etc/Makefile Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/etc/Makefile Mon May 20 08:01:37 2019 (r347987) @@ -15,13 +15,17 @@ SUBDIR+=sendmail .endif BIN1= \ - group \ login.access \ rc.bsdextended \ + rc.firewall \ termcap.small # NB: keep these sorted by MK_* knobs +.if ${MK_SENDMAIL} != "no" +BIN1+= rc.sendmail +.endif + .if ${MK_SENDMAIL} == "no" ETCMAIL=mailer.conf aliases .else @@ -58,33 +62,9 @@ distribution: @echo "set DESTDIR before running \"make ${.TARGET}\"" @false .endif -.if ${MK_SENDMAIL} != "no" cd ${.CURDIR}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "tags=package=sendmail"\ - rc.sendmail ${DESTDIR}/etc; -.endif -.if ${MK_IPFW} != "no" - cd ${.CURDIR}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "tags=package=ipfw"\ - rc.firewall ${DESTDIR}/etc; -.endif - cd ${.CURDIR}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "tags=package=runtime"\ - ${BIN1} ${DESTDIR}/etc; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T "tags=package=runtime"\ - master.passwd ${DESTDIR}/etc; - -.if ${MK_TCSH} == "no" - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd -.endif - pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd -.if defined(NO_ROOT) - ( \ - echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ - echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ - echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ - ) | ${METALOG.add} -.endif + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${BIN1} ${DESTDIR}/etc ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap Modified: user/ngie/bug-237403/lib/libbe/be_access.c ============================================================================== --- user/ngie/bug-237403/lib/libbe/be_access.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libbe/be_access.c Mon May 20 08:01:37 2019 (r347987) @@ -99,13 +99,12 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data) if (strcmp("none", zfs_mnt) == 0) { /* * mountpoint=none; we'll mount it at info->mountpoint assuming - * we're at the root. If we're not at the root... that's less - * than stellar and not entirely sure what to do with that. - * For now, we won't treat it as an error condition -- we just - * won't mount it, and we'll continue on. + * we're at the root. If we're not at the root, we're likely + * at some intermediate dataset (e.g. zroot/var) that will have + * children that may need to be mounted. */ if (info->depth > 0) - return (0); + goto skipmount; snprintf(tmp, BE_MAXPATHLEN, "%s", info->mountpoint); } else { @@ -136,6 +135,7 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data) if (!info->deepmount) return (0); +skipmount: ++info->depth; err = zfs_iter_filesystems(zfs_hdl, be_mount_iter, info); --info->depth; Modified: user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_fsbase.c ============================================================================== --- user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_fsbase.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_fsbase.c Mon May 20 08:01:37 2019 (r347987) @@ -57,7 +57,7 @@ amd64_get_fsbase_syscall(void **addr) return (sysarch(AMD64_GET_FSBASE, addr)); } -DEFINE_UIFUNC(, int, amd64_get_fsbase, (void **), static) +DEFINE_UIFUNC(, int, amd64_get_fsbase, (void **)) { if (__getosreldate() >= P_OSREL_WRFSBASE && Modified: user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_gsbase.c ============================================================================== --- user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_gsbase.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/amd64/sys/amd64_get_gsbase.c Mon May 20 08:01:37 2019 (r347987) @@ -57,7 +57,7 @@ amd64_get_gsbase_syscall(void **addr) return (sysarch(AMD64_GET_GSBASE, addr)); } -DEFINE_UIFUNC(, int, amd64_get_gsbase, (void **), static) +DEFINE_UIFUNC(, int, amd64_get_gsbase, (void **)) { if (__getosreldate() >= P_OSREL_WRFSBASE && Modified: user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_fsbase.c ============================================================================== --- user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_fsbase.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_fsbase.c Mon May 20 08:01:37 2019 (r347987) @@ -57,7 +57,7 @@ amd64_set_fsbase_syscall(void *addr) return (sysarch(AMD64_SET_FSBASE, &addr)); } -DEFINE_UIFUNC(, int, amd64_set_fsbase, (void *), static) +DEFINE_UIFUNC(, int, amd64_set_fsbase, (void *)) { if (__getosreldate() >= P_OSREL_WRFSBASE && Modified: user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_gsbase.c ============================================================================== --- user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_gsbase.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/amd64/sys/amd64_set_gsbase.c Mon May 20 08:01:37 2019 (r347987) @@ -57,7 +57,7 @@ amd64_set_gsbase_syscall(void *addr) return (sysarch(AMD64_SET_GSBASE, &addr)); } -DEFINE_UIFUNC(, int, amd64_set_gsbase, (void *), static) +DEFINE_UIFUNC(, int, amd64_set_gsbase, (void *)) { if (__getosreldate() >= P_OSREL_WRFSBASE && Modified: user/ngie/bug-237403/lib/libc/gen/Makefile.inc ============================================================================== --- user/ngie/bug-237403/lib/libc/gen/Makefile.inc Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/gen/Makefile.inc Mon May 20 08:01:37 2019 (r347987) @@ -4,7 +4,8 @@ # machine-independent gen sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen -CONFS= shells +CONFS+= group master.passwd shells +CONFSMODE_master.passwd= 600 SRCS+= __getosreldate.c \ __pthread_mutex_init_calloc_cb_stub.c \ @@ -543,3 +544,16 @@ MLINKS+=vis.3 nvis.3 \ vis.3 svis.3 MLINKS+=wordexp.3 wordfree.3 + +afterinstallconfig: +.if ${MK_TCSH} == "no" + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd +.endif + pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd +.if defined(NO_ROOT) && defined(METALOG) + ( \ + echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ + echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ + echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \ + ) | cat -l >> ${METALOG} +.endif Copied: user/ngie/bug-237403/lib/libc/gen/group (from r347986, head/lib/libc/gen/group) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/bug-237403/lib/libc/gen/group Mon May 20 08:01:37 2019 (r347987, copy of r347986, head/lib/libc/gen/group) @@ -0,0 +1,36 @@ +# $FreeBSD$ +# +wheel:*:0:root +daemon:*:1: +kmem:*:2: +sys:*:3: +tty:*:4: +operator:*:5:root +mail:*:6: +bin:*:7: +news:*:8: +man:*:9: +games:*:13: +ftp:*:14: +staff:*:20: +sshd:*:22: +smmsp:*:25: +mailnull:*:26: +guest:*:31: +video:*:44: +bind:*:53: +unbound:*:59: +proxy:*:62: +authpf:*:63: +_pflogd:*:64: +_dhcp:*:65: +uucp:*:66: +dialer:*:68: +network:*:69: +audit:*:77: +www:*:80: +ntpd:*:123: +_ypldap:*:160: +hast:*:845: +nogroup:*:65533: +nobody:*:65534: Copied: user/ngie/bug-237403/lib/libc/gen/master.passwd (from r347986, head/lib/libc/gen/master.passwd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/bug-237403/lib/libc/gen/master.passwd Mon May 20 08:01:37 2019 (r347987, copy of r347986, head/lib/libc/gen/master.passwd) @@ -0,0 +1,28 @@ +# $FreeBSD$ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin +tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin +kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin +games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin +news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin +man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin +sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin +smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin +mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin +bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin +unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin +_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin +_ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin Modified: user/ngie/bug-237403/lib/libc/stdlib/bsearch.3 ============================================================================== --- user/ngie/bug-237403/lib/libc/stdlib/bsearch.3 Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/stdlib/bsearch.3 Mon May 20 08:01:37 2019 (r347987) @@ -32,7 +32,7 @@ .\" @(#)bsearch.3 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd February 22, 2013 +.Dd May 15, 2019 .Dt BSEARCH 3 .Os .Sh NAME @@ -83,6 +83,61 @@ The function returns a pointer to a matching member of the array, or a null pointer if no match is found. If two members compare as equal, which member is matched is unspecified. +.Sh EXAMPLES +A sample program that searches people by age in a sorted array: +.Bd -literal +#include <assert.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +struct person { + char name[5]; + int age; +}; + +int +compare(const void *key, const void *array_member) +{ + int age = (intptr_t) key; + struct person person = *(struct person *) array_member; + + return (age - person.age); +} + +int +main() +{ + struct person *friend; + + /* Sorted array */ + struct person friends[6] = { + { "paul", 22 }, + { "anne", 25 }, + { "fred", 25 }, + { "mary", 27 }, + { "mark", 35 }, + { "bill", 50 } + }; + + size_t array_size = sizeof(friends) / sizeof(struct person); + + friend = bsearch((void *)22, &friends, array_size, sizeof(struct person), compare); + assert(strcmp(friend->name, "paul") == 0); + printf("name: %s\enage: %d\en", friend->name, friend->age); + + friend = bsearch((void *)25, &friends, array_size, sizeof(struct person), compare); + assert(strcmp(friend->name, "fred") == 0 || strcmp(friend->name, "anne") == 0); + printf("name: %s\enage: %d\en", friend->name, friend->age); + + friend = bsearch((void *)30, &friends, array_size, sizeof(struct person), compare); + assert(friend == NULL); + printf("friend aged 30 not found\en"); + + return (EXIT_SUCCESS); +} +.Ed .Sh SEE ALSO .Xr db 3 , .Xr lsearch 3 , Modified: user/ngie/bug-237403/lib/libc/sys/mlock.2 ============================================================================== --- user/ngie/bug-237403/lib/libc/sys/mlock.2 Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/sys/mlock.2 Mon May 20 08:01:37 2019 (r347987) @@ -28,7 +28,7 @@ .\" @(#)mlock.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd March 20, 2018 +.Dd May 13, 2019 .Dt MLOCK 2 .Os .Sh NAME @@ -97,13 +97,13 @@ resource limit and the system-wide .Dq wired pages limit -.Va vm.max_wired . -.Va vm.max_wired +.Va vm.max_user_wired . +.Va vm.max_user_wired applies to the system as a whole, so the amount available to a single process at any given time is the difference between -.Va vm.max_wired +.Va vm.max_user_wired and -.Va vm.stats.vm.v_wire_count . +.Va vm.stats.vm.v_user_wire_count . .Pp If .Va security.bsd.unprivileged_mlock @@ -124,13 +124,11 @@ will fail if: is set to 0 and the caller is not the super-user. .It Bq Er EINVAL The address range given wraps around zero. -.It Bq Er EAGAIN -Locking the indicated range would exceed the system limit for locked memory. .It Bq Er ENOMEM Some portion of the indicated address range is not allocated. There was an error faulting/mapping a page. -Locking the indicated range would exceed the per-process limit for locked -memory. +Locking the indicated range would exceed the per-process or system-wide limits +for locked memory. .El The .Fn munlock @@ -171,11 +169,11 @@ system calls first appeared in Allocating too much wired memory can lead to a memory-allocation deadlock which requires a reboot to recover from. .Pp -The per-process resource limit is a limit on the amount of virtual -memory locked, while the system-wide limit is for the number of locked -physical pages. -Hence a process with two distinct locked mappings of the same physical page -counts as 2 pages against the per-process limit and as only a single page -in the system limit. +The per-process and system-wide resource limits of locked memory apply +to the amount of virtual memory locked, not the amount of locked physical +pages. +Hence two distinct locked mappings of the same physical page counts as +2 pages aginst the system limit, and also against the per-process limit +if both mappings belong to the same physical map. .Pp The per-process resource limit is not currently supported. Modified: user/ngie/bug-237403/lib/libc/sys/mlockall.2 ============================================================================== --- user/ngie/bug-237403/lib/libc/sys/mlockall.2 Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/sys/mlockall.2 Mon May 20 08:01:37 2019 (r347987) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 25, 2012 +.Dd May 13, 2019 .Dt MLOCKALL 2 .Os .Sh NAME @@ -69,7 +69,7 @@ limited in how much they can lock down. A single process can lock the minimum of a system-wide .Dq wired pages limit -.Va vm.max_wired +.Va vm.max_user_wired and the per-process .Dv RLIMIT_MEMLOCK resource limit. @@ -138,9 +138,9 @@ and functions first appeared in .Fx 5.1 . .Sh BUGS -The per-process resource limit is a limit on the amount of virtual -memory locked, while the system-wide limit is for the number of locked -physical pages. -Hence a process with two distinct locked mappings of the same physical page -counts as 2 pages against the per-process limit and as only a single page -in the system limit. +The per-process and system-wide resource limits of locked memory apply +to the amount of virtual memory locked, not the amount of locked physical +pages. +Hence two distinct locked mappings of the same physical page counts as +2 pages aginst the system limit, and also against the per-process limit +if both mappings belong to the same physical map. Modified: user/ngie/bug-237403/lib/libc/tests/sys/mlock_helper.c ============================================================================== --- user/ngie/bug-237403/lib/libc/tests/sys/mlock_helper.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/tests/sys/mlock_helper.c Mon May 20 08:01:37 2019 (r347987) @@ -39,16 +39,16 @@ __FBSDID("$FreeBSD$"); #include <limits.h> #include <stdio.h> -#define VM_MAX_WIRED "vm.max_wired" +#define VM_MAX_WIRED "vm.max_user_wired" static void -vm_max_wired_sysctl(int *old_value, int *new_value) +vm_max_wired_sysctl(u_long *old_value, u_long *new_value) { size_t old_len; - size_t new_len = (new_value == NULL ? 0 : sizeof(int)); + size_t new_len = (new_value == NULL ? 0 : sizeof(*new_value)); if (old_value == NULL) - printf("Setting the new value to %d\n", *new_value); + printf("Setting the new value to %lu\n", *new_value); else { ATF_REQUIRE_MSG(sysctlbyname(VM_MAX_WIRED, NULL, &old_len, new_value, new_len) == 0, @@ -60,14 +60,14 @@ vm_max_wired_sysctl(int *old_value, int *new_value) "sysctlbyname(%s) failed: %s", VM_MAX_WIRED, strerror(errno)); if (old_value != NULL) - printf("Saved the old value (%d)\n", *old_value); + printf("Saved the old value (%lu)\n", *old_value); } void -set_vm_max_wired(int new_value) +set_vm_max_wired(u_long new_value) { FILE *fp; - int old_value; + u_long old_value; fp = fopen(VM_MAX_WIRED, "w"); if (fp == NULL) { @@ -78,7 +78,7 @@ set_vm_max_wired(int new_value) vm_max_wired_sysctl(&old_value, NULL); - ATF_REQUIRE_MSG(fprintf(fp, "%d", old_value) > 0, + ATF_REQUIRE_MSG(fprintf(fp, "%lu", old_value) > 0, "saving %s failed", VM_MAX_WIRED); fclose(fp); @@ -90,7 +90,7 @@ void restore_vm_max_wired(void) { FILE *fp; - int saved_max_wired; + u_long saved_max_wired; fp = fopen(VM_MAX_WIRED, "r"); if (fp == NULL) { @@ -98,14 +98,14 @@ restore_vm_max_wired(void) return; } - if (fscanf(fp, "%d", &saved_max_wired) != 1) { + if (fscanf(fp, "%lu", &saved_max_wired) != 1) { perror("fscanf failed\n"); fclose(fp); return; } fclose(fp); - printf("old value in %s: %d\n", VM_MAX_WIRED, saved_max_wired); + printf("old value in %s: %lu\n", VM_MAX_WIRED, saved_max_wired); if (saved_max_wired == 0) /* This will cripple the test host */ return; Modified: user/ngie/bug-237403/lib/libc/x86/gen/getcontextx.c ============================================================================== --- user/ngie/bug-237403/lib/libc/x86/gen/getcontextx.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/x86/gen/getcontextx.c Mon May 20 08:01:37 2019 (r347987) @@ -61,7 +61,7 @@ __getcontextx_size_xfpu(void) return (sizeof(ucontext_t) + xstate_sz); } -DEFINE_UIFUNC(, int, __getcontextx_size, (void), static) +DEFINE_UIFUNC(, int, __getcontextx_size, (void)) { u_int p[4]; @@ -100,7 +100,7 @@ __fillcontextx2_noxfpu(char *ctx) return (0); } -DEFINE_UIFUNC(, int, __fillcontextx2, (char *), static) +DEFINE_UIFUNC(, int, __fillcontextx2, (char *)) { return ((cpu_feature2 & CPUID2_OSXSAVE) != 0 ? __fillcontextx2_xfpu : Modified: user/ngie/bug-237403/lib/libc/x86/sys/__vdso_gettc.c ============================================================================== --- user/ngie/bug-237403/lib/libc/x86/sys/__vdso_gettc.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/x86/sys/__vdso_gettc.c Mon May 20 08:01:37 2019 (r347987) @@ -72,7 +72,7 @@ rdtsc_mb_none(void) { } -DEFINE_UIFUNC(static, void, rdtsc_mb, (void), static) +DEFINE_UIFUNC(static, void, rdtsc_mb, (void)) { u_int p[4]; /* Not a typo, string matches our do_cpuid() registers use. */ Modified: user/ngie/bug-237403/lib/libc/x86/sys/pkru.c ============================================================================== --- user/ngie/bug-237403/lib/libc/x86/sys/pkru.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libc/x86/sys/pkru.c Mon May 20 08:01:37 2019 (r347987) @@ -71,7 +71,7 @@ x86_pkru_get_perm_hw(u_int keyidx, int *access, int *m return (0); } -DEFINE_UIFUNC(, int, x86_pkru_get_perm, (u_int, int *, int *), static) +DEFINE_UIFUNC(, int, x86_pkru_get_perm, (u_int, int *, int *)) { return ((cpu_stdext_feature2 & CPUID_STDEXT2_OSPKE) == 0 ? @@ -106,7 +106,7 @@ x86_pkru_set_perm_hw(u_int keyidx, int access, int mod return (0); } -DEFINE_UIFUNC(, int, x86_pkru_set_perm, (u_int, int, int), static) +DEFINE_UIFUNC(, int, x86_pkru_set_perm, (u_int, int, int)) { return ((cpu_stdext_feature2 & CPUID_STDEXT2_OSPKE) == 0 ? Modified: user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/Makefile ============================================================================== --- user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/Makefile Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/Makefile Mon May 20 08:01:37 2019 (r347987) @@ -6,7 +6,7 @@ SHLIBDIR?= /lib/casper PACKAGE=libcasper -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" @@ -25,8 +25,12 @@ HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_sysctl.3 - -MLINKS+=cap_sysctl.3 libcap_sysctl.3 -MLINKS+=cap_sysctl.3 cap_sysctlbyname.3 +MLINKS+=cap_sysctl.3 libcap_sysctl.3 \ + cap_sysctl.3 cap_sysctlbyname.3 \ + cap_sysctl.3 cap_nametomib.3 \ + cap_sysctl.3 cap_sysctl_limit_init.3 \ + cap_sysctl.3 cap_sysctl_limit_mib.3 \ + cap_sysctl.3 cap_sysctl_limit_name.3 \ + cap_sysctl.3 cap_sysctl_limit.3 .include <bsd.lib.mk> Modified: user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.3 ============================================================================== --- user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.3 Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.3 Mon May 20 08:01:37 2019 (r347987) @@ -24,72 +24,113 @@ .\" .\" $FreeBSD$ .\" -.Dd March 18, 2018 +.Dd May 13, 2019 .Dt CAP_SYSCTL 3 .Os .Sh NAME -.Nm cap_sysctlbyname +.Nm cap_sysctl .Nd "library for getting or setting system information in capability mode" .Sh LIBRARY .Lb libcap_sysctl .Sh SYNOPSIS -.In sys/nv.h .In libcasper.h .In casper/cap_sysctl.h .Ft int -.Fn cap_sysctlbyname "cap_channel_t *chan" " const char *name" " void *oldp" " size_t *oldlenp" " const void *newp" " size_t newlen" +.Fn cap_sysctl "cap_channel_t *chan" "const int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" "const void *newp" "size_t newlen" +.Ft int +.Fn cap_sysctlbyname "cap_channel_t *chan" "const char *name" "void *oldp" "size_t *oldlenp" "const void *newp" "size_t newlen" +.Ft int +.Fn cap_sysctlnametomib "cap_channel_t *chan" "const char *name" "int *mibp" "size_t *sizep" +.Ft void * +.Fn cap_sysctl_limit_init "cap_channel_t *chan" +.Ft void * +.Fn cap_sysctl_limit_name "void *limit" "const char *name" "int flags" +.Ft void * +.Fn cap_sysctl_limit_mib "void *limit" "int *mibp" "u_int miblen" "int flags" +.Ft int +.Fn cap_sysctl_limit "void *limit" .Sh DESCRIPTION -The function +The +.Fn cap_sysctl , .Fn cap_sysctlbyname -is equivalent to +and +.Fn cap_sysctlnametomib +functions are equivalent to +.Xr sysctl 3 , .Xr sysctlbyname 3 -except that the connection to the -.Nm system.sysctl -service needs to be provided. +and +.Xr sysctlnametomib 3 , +except that they are implemented by the +.Ql system.sysctl +.Xr libcasper 3 +service and require a corresponding +.Xr libcasper 3 +capability. .Sh LIMITS -The service can be limited using -.Xr cap_limit_set 3 -function. +By default, the +.Nm +capability provides unrestricted access to the sysctl namespace. +Applications typically only require access to a small number of sysctl +variables; the +.Fn cap_sysctl_limit +interface can be used to restrict the sysctls that can be accessed using +the +.Nm +capability. +.Fn cap_sysctl_limit_init +returns an opaque limit handle used to store a list of permitted sysctls +and access rights. +Rights are encoded using the following flags: +.Pp +.Bd -literal -offset indent -compact +CAP_SYSCTL_READ allow reads of the sysctl variable +CAP_SYSCTL_WRITE allow writes of the sysctl variable +CAP_SYSCTL_RDWR allow reads and writes of the sysctl variable +CAP_RECURSIVE permit access to any child of the sysctl variable +.Ed +.Pp The -.Xr nvlist 9 -for that function can contain the following values and types: -.Bl -ohang -offset indent -.It ( NV_TYPE_NUMBER ) -The name of the element with type number will be treated as the limited sysctl. -The value of the element will describe the access rights for given sysctl. -There are four different rights +.Fn cap_sysctl_limit_name +function adds the sysctl identified by +.Ar name +to the limit list, and +.Fn cap_sysctl_limit_mib +function adds the sysctl identified by +.Ar mibp +to the limit list. +The access rights for the sysctl are specified in the +.Ar flags +parameter; at least one of .Dv CAP_SYSCTL_READ , -.Dv CAP_SYSCTL_WRITE , -.Dv CAP_SYSCTL_RDWR , +.Dv CAP_SYSCTL_WRITE and -.Dv CAP_SYSCTL_RECURSIVE . -The -.Dv CAP_SYSCTL_READ -flag allows to fetch the value of a given sysctl. -The -.Dv CAP_SYSCTL_WIRTE -flag allows to override the value of a given sysctl. -The .Dv CAP_SYSCTL_RDWR -is combination of the -.Dv CAP_SYSCTL_WIRTE -and -.Dv CAP_SYSCTL_READ -and allows to read and write the value of a given sysctl. -The -.Dv CAP_SYSCTL_RECURSIVE -allows access to all children of a given sysctl. -This right must be combined with at least one other right. +must be specified. +.Fn cap_sysctl_limit +applies a set of sysctl limits to the capability, denying access to sysctl +variables not belonging to the set. +.Pp +Once a set of limits is applied, subsequent calls to +.Fn cap_sysctl_limit +will fail unless the new set is a subset of the current set. +.Pp +.Fn cap_sysctlnametomib +will succeed so long as the named sysctl variable is present in the limit set, +regardless of its access rights. +When a sysctl variable name is added to a limit set, its MIB identifier is +automatically added to the set. .Sh EXAMPLES -The following example first opens a capability to casper and then uses this +The following example first opens a capability to casper, uses this capability to create the .Nm system.sysctl -casper service and uses it to get the value of +casper service, and then uses the +.Nm +capability to get the value of .Dv kern.trap_enotcap . .Bd -literal cap_channel_t *capcas, *capsysctl; const char *name = "kern.trap_enotcap"; -nvlist_t *limits; +void *limit; int value; size_t size; @@ -111,11 +152,11 @@ if (capsysctl == NULL) cap_close(capcas); /* Create limit for one MIB with read access only. */ -limits = nvlist_create(0); -nvlist_add_number(limits, name, CAP_SYSCTL_READ); +limit = cap_sysctl_limit_init(capsysctl); +(void)cap_sysctl_limit_name(limit, name, CAP_SYSCTL_READ); /* Limit system.sysctl. */ -if (cap_limit_set(capsysctl, limits) < 0) +if (cap_sysctl_limit(limit) < 0) err(1, "Unable to set limits"); /* Fetch value. */ @@ -129,7 +170,9 @@ cap_close(capsysctl); .Sh SEE ALSO .Xr cap_enter 2 , .Xr err 3 , +.Xr sysctl 3 , .Xr sysctlbyname 3 , +.Xr sysctlnametomib 3 , .Xr capsicum 4 , .Xr nv 9 .Sh AUTHORS Modified: user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.c ============================================================================== --- user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.c Mon May 20 03:35:14 2019 (r347986) +++ user/ngie/bug-237403/lib/libcasper/services/cap_sysctl/cap_sysctl.c Mon May 20 08:01:37 2019 (r347987) @@ -1,12 +1,15 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2013 The FreeBSD Foundation + * Copyright (c) 2013, 2018 The FreeBSD Foundation * All rights reserved. * * This software was developed by Pawel Jakub Dawidek under sponsorship from * the FreeBSD Foundation. * + * Portions of this software were developed by Mark Johnston + * under sponsorship from the FreeBSD Foundation. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905200801.x4K81chP052636>