Pull up following revision(s) (requested by msaitoh in ticket #926):
sys/dev/pci/ichsmb.c: 1.52, 1.56
Add C620 devices.
--
Add Apollo Lake and Gemini Lake devices.

(snj)

Welcome to 8.0_STABLE.

(snj)

Welcome to 8.0!

(martin)

Update for 8.0 release.

(martin)

Note ticket #925

(martin)

Ticket #924

(sborrill)

Pull up the following revisions(s) (requested by martin in ticket #924):
crypto/external/bsd/heimdal/lib/libheimntlm/Makefile: revision 1.3
crypto/external/bsd/heimdal/lib/libkdc/Makefile: revision 1.4
crypto/external/bsd/heimdal/lib/libgssapi/Makefile: revision 1.5
crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile: revision 1.5

Improve MKREPRO builds for architectures with compat (like amd64).

(sborrill)

Ticket #923

(sborrill)

Pull up the following revisions(s) (requested by martin in ticket #923):
etc/Makefile.params: revision 1.20

Drop output for MAKECONF MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE
in MKREPRO=yes builds.

(sborrill)

Tickets #909 and #922

(martin)

Pull up following revision(s) (requested by sevan in ticket #922):

crypto/external/bsd/openssh/dist/ssh-agent.1: revision 1.13
crypto/external/bsd/openssh/dist/ssh-agent.c: revision 1.23

Amend whitelisted filesystem paths ssh-agent will look for PKCS11 related
libraries so that things work out of the box with pkgsrc without having to
explicitly whitelist things.

ok christos

(martin)

Pull up following revision(s) (requested by jdolecek in ticket #909):

sys/arch/xen/xen/xennetback_xenbus.c: revision 1.64 (patch)

Fix panic of DOM0 in xennetback_xenbus_destroy() on xl destroy of
DOMU with created, but non CONNECTED xennet (such as when DOMU
panics during boot); only try to disestablish the intr if it was
actually setup.

While here protect xnetback_instances with mutex, and switch to use
kmem_zalloc() + KM_SLEEP / kmem_free() like xbdback_xenbus.c; add XXXSMP
to the other global variables, and at least mark them static

(martin)

Tickets #911, #912, #913, #914, #915, #916, #917, #921

(martin)

Pull up following revision(s) (requested by nonaka in ticket #921):

usr.sbin/ndp/ndp.c: revision 1.52-1.54

Remove duplicate rtrlist() function prototype.

ndp(8): host_buf should not be used in delete().
host_buf is passed to the argument host of delete() in do_foreach().

Use s6, not mysin.

(martin)

Pull up following revision(s) (requested by christos in ticket #917):

external/gpl3/binutils.old/dist/bfd/peXXigen.c: revision 1.6
(with /binutils.old/ -> /binutils/)

Fix reproducible builds for EFI boot blocks (from HEAD)

(martin)

Pull up following revision(s) (requested by christos in ticket #916):

external/bsd/ppp/usr.sbin/pppd/sys-bsd.c: revision 1.5

New arp code needs RTF_LLDATA for DELETE to work!
XXX: pullup-8

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #915):

sys/net/if.c: revision 1.424

Print "NET_MPSAFE enabled" if it's enabled.

(martin)

Pull up following revision(s) (requested by kre in ticket #914):

usr.bin/printf/printf.c: revision 1.38,1.39

From leot@ on tech-userlevel:
Avoid running off into oblivion when a format string,
or arg to a %b conversion ends in an unescaped backslash.

Patch from Leo slightly modified by me.

Avoid printing error messages twice when an invalid
escape sequence (\ sequence) is present in an arg to a %b
conversion.

(martin)

Pull up following revision(s) (requested by triaxx in ticket #913):

external/bsd/dhcpcd/Makefile.inc: revision 1.3

Fix an inconsistency that showed /var/db/duid in the man page while the
binary opened /var/db/dhcpcd/duid.

(martin)

Pull up following revision(s) (requested by maya in ticket #912):

sys/arch/x86/x86/identcpu.c: revision 1.79
sys/arch/x86/include/specialreg.h: revision 1.127

Disable MWAIT/MONITOR on Apollo Lake CPUs to workaround APL30 errata.

We use MWAIT/MONITOR to hatch secondary CPUs. The errata means that
the wakeup may not happen, so SMP boot fails.
Use wrmsr to disable it in hardware too, for extra paranoia.

PR port-amd64/53420,
also reported on netbsd-users by joern clausen and ssartor.

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #911):

sys/kern/init_main.c: revision 1.498
sys/rump/net/lib/libnet/net_component.c: revision 1.10
sys/net/if.h: revision 1.264
sys/net/if.c: revision 1.429

Fix net.inet6.ip6.ifq node doesn't exist

The node (and child nodes) is initialized in sysctl_net_pktq_setup, but the call
of sysctl_net_pktq_setup is skipped unexpectedly.
sysctl_net_pktq_setup is skipped if in6_present is false that indicates the
netinet6 component isn't loaded on rump kernels.  However the flag is
accidentally always false because the flag is turned on in in6_dom_init that is
called after if_sysctl_setup on both normal and rump kernels.

Fix the issue by moving if_sysctl_setup after in6_dom_init (domaininit on normal
kernels).  This fix is ad-hoc but good enough for netbsd-8.  We should refine
the initialization order of network components in the future.

Pointed out by hikaru@

(martin)

Tickets #905, #906, #907, #908

(martin)

Pull up following revision(s) (requested by jnemeth in ticket #908):

usr.bin/calendar/calendars/calendar.birthday: revision 1.27
usr.bin/calendar/calendars/calendar.christian: revision 1.7
usr.bin/calendar/calendars/calendar.usholiday: revision 1.8
usr.bin/calendar/calendars/calendar.netbsd: revision 1.39
usr.bin/calendar/calendars/calendar.holiday: revision 1.28
usr.bin/calendar/calendars/calendar.holiday: revision 1.29
usr.bin/calendar/calendars/calendar.judaic: revision 1.7
usr.bin/calendar/calendars/calendar.history: revision 1.35

Only 35 years late.

Mention the Sand Creek massacre.

Fix a typo.

(or, `Emily Dickinson' - the American poet - was born on the same date)

Update calendar files for the upcoming NetBSD 8.0 release.  I'm
assuming that it will be released by August 1, which is two months
from now.  Thus I used 2018 dates for all holidays between Aug.
1st and Dec. 31st, and 2019 dates for all holidays between Jan.
1st and Jul. 31st.

(martin)

Pull up following revision(s) (requested by kre in ticket #907):

bin/sh/expand.c: revision 1.122

When matching a char class ([[:name:]]) in a pattern (for filename
expansion, case patterrns, etc) do not force '[' to be a member of
every class.

Before this fix, try:

case [ in [[:alpha:]]) echo Huh\?;; esac

XXX pullup-8    (Perhaps -7 as well, though that shell version has
much more relevant bugs than this one.)  This bug is not in -6 as
that has no charclass support.

(martin)

Pull up following revision(s) (requested by kre in ticket #906):

bin/sh/eval.c: revision 1.155
bin/sh/mknodes.sh: revision 1.3
bin/sh/nodes.c.pat: revision 1.14
bin/sh/exec.h: revision 1.27
bin/sh/exec.c: revision 1.52

Deal with ref after free found by ASAN when a function redefines
itself, or some other function which is still active.

This was a long known bug (fixed ages ago in the FreeBSD sh) which
hadn't been fixed as in practice, the situation that causes the
problem simply doesn't arise .. ASAN found it in the sh dotcmd
tests which do have this odd "feature" in the way they are written
(but where it never caused a problem, as the tests are so simple
that no mem is ever allocated between when the old version of the
function was deleted, and when it finished executing, so its code
all remained intact, despite having been freed.)

The fix is taken from the FreeBSD sh.

XXX -- pullup-8 (after a while to ensure no other problems arise).

(martin)

Pull up following revision(s) via patch (requested by knakahara in ticket #905):

sys/netinet/ip_mroute.c: revision 1.160
sys/netinet6/in6_l2tp.c: revision 1.16
sys/net/if.h: revision 1.263
sys/netinet/in_l2tp.c: revision 1.15
sys/netinet/ip_icmp.c: revision 1.172
sys/netinet/igmp.c: revision 1.68
sys/netinet/ip_encap.c: revision 1.69
sys/netinet6/ip6_mroute.c: revision 1.129

sbappendaddr() is required any lock. Currently, softnet_lock is appropriate.

When rip_input() is called as inetsw[].pr_input, rip_iput() is always called
with holding softnet_lock, that is, in case of !defined(NET_MPSAFE) it is
acquired in ipintr(), otherwise(defined(NET_MPSAFE)) it is acquire in
PR_WRAP_INPUT macro.

However, some function calls rip_input() directly without holding softnet_lock.
That causes assertion failure in sbappendaddr().
rip6_input() and icmp6_rip6_input() are also required softnet_lock for the same
reason.

(martin)

Tickets #890, #900, #901

(martin)

Pull up following revision(s) (requested by kamil in ticket #901):

lib/libutil/pty.c: revision 1.32

Fix stack use after scope in libutil/pty

The pt variable's elements are used after the end of the pt scope.

A move of pt to outer scope fixes this.

Detected with MKSANITIZER/ASan with tmux(1), a forkpty(3) user.

(martin)

Pull up following revision(s) (requested by kamil in ticket #900):

usr.sbin/sysinst/util.c: revision 1.10,1.11

Enlarge the set_status[] array by a single element
In the get_and_unpack_sets() function there is accessed the
set_status[SET_GROUP_END] element in the array. The array is allocated on
the stack with SET_GROUP_END elements. This means that it is 1 element too
short.

-

Revert previous, fix iteration loops to be consistent:
All sets that have an id >= SET_LAST have NULL name, so use that like the
loop just below.

(martin)

Pull up following revision(s) (requested by yamaguchi in ticket #890):
sys/net/if_pppoe.c: revision 1.137
sys/net/if_pppoe.c: revision 1.139
sys/net/if_pppoe.c: revision 1.140
Drop early if there's no PPPoE interface. Otherwise it is easy for someone
to flood dmesg over the local subnet.
Fix not to use PPPOE_UNLOCK before acccess to pppoe_softc
to avoid a race condition
According to the locking order of pppoe(4), the access to
pppoe_softc has to follow 5 steps as below.
1. aquire pppoe_softc_list_lock
2. aquire pppoe_softc lock
3. release pppoe_softc_list_lock
4. access to pppoe_softc
5. release pppoe_softc lock
However, pppoe_dispatch_disc_pkt() releases the lock of pppoe_softc
temporarily, and then re-aquires it before step 4 of the adove. So,
it is possible for other contexts to destroy a pppoe_softc in the
interim.
To fix this condition, avoid PPPOE_UNLOCK with the problem.
ok by knakahara@n.o
Fix to aquire pppoe_softc_list_lock before read and write the list
ok by knakahara@n.o

(martin)

Ammend ticket #918

(martin)

Additionally pullup src/sys/net/if_llatbl.c r1.30 to fix build fallout
from previous, requested by both ozaki-r (ticket #918) and kre (ticket #920):

Update previous so that there is no unused (but assigned) variable
left when there is no ARP.  Thanks gcc!

(martin)

Note ticket #910

(martin)

Pull up the following, requested by maxv in ticket #910:

sys/arch/amd64/amd64/locore.S r1.167 (patch)
sys/arch/i386/i386/locore.S r1.158 (patch)
sys/arch/x86/x86/fpu.c r1.44 (patch)

Don't switch the FPU when leaving a softint. This fixes
several problems when EagerFPU is enabled.

(martin)

Ammend ticket #918 with additional pullups

(martin)

Additionally pull up the following, requested by ozaki-r in ticket #918:

src/sys/net/if_llatbl.c 1.29

Avoid attempting to call arp related functions if there is no
arp in the kernel.

(martin)

Ammend entry for ticket #892, note tickets #918 and #919

(martin)

Additionally pull up the following, requested by maya in ticket #892:

src/tests/lib/librt/t_sched.c 1.6

fix priority tests for SCHED_OTHER

(martin)

Pull up following revision(s) (requested by maxv in ticket #919):

sys/net/npf/npf_handler.c: revision 1.41

Update the pointer when fast-kicking, because it may have been freed.

Before my changes the nonsensical pointer ininitialization held, but
when I started introducing sanity checks the whole thing collapsed.

Need pullup-8.

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #918):

sys/net/if_llatbl.c: revision 1.28

Don't overwrite an existing llentry on RTM_ADD to avoid race conditions
Reported and tested by christos@

(martin)

Note NetBSD.org fixes in release docs

(martin)

NetBSD.org capitalization police

(martin)

Ticket #904, ammend #892

(martin)

Pull up following revision(s) (requested by martin in ticket #904):

distrib/common/Makefile.bootcd: revision 1.40

Do not put debug.tgz and xdebug.tgz onto install CDs (a lot of them
grow out of bounds and for some architectures can not turn into DVDs).

(martin)

Additionally pull up following revision(s) (requested by maya in ticket #892):

tests/lib/libc/gen/posix_spawn/t_spawnattr.c: revision 1.2,1.3

Don't use SCHED_OTHER.

Fix broken test: we can't assume that the current schedule priority range
will overlap with the requested scheduler range, so get the new scheduler
range, and then try to find a different priority. If that fails (to find
a different scheduling range), give up here.

(martin)

Welcome to 8.0 RC2!

(martin)

Tickets #898 and #899

(martin)

Pull up following revision(s) (requested by kamil in ticket #899):

lib/libutil/passwd.c: revision 1.53

Prevent underflow buffer read in trim_whitespace() in libutil/passwd.c

If a string is empty or contains only white characters, the algorithm of
removal of white characters at the end of the passed string will read
buffer at index -1 and keep iterating backward.

Detected with MKSANITIZER/ASan when executing passwd(1).

(martin)

Pull up following revision(s) (requested by kamil in ticket #898):

usr.sbin/installboot/arch/i386.c: revision 1.41

Fix integer overflow in installboot(8)
Add a sanity check of the disk_buf first three bytes. The original code on
a disk with nul bytes was causing integer overflow and thus calling the
memcmp(3) functin in is_zero() with enormous length.
Verity that the 0th byte is JMP, 1th a signed byte >= 9 to prevent overflow
and 2th byte NOP.

Add a comment explaining the check.

Detected with MKSANITIZER and ASan.

(martin)

Install note changes

(martin)

Pull up the following changes with minor adjustement:

distrib/notes/acorn26/contents (same as acorn32 1.3)
distrib/notes/acorn32/contents 1.3
distrib/notes/alpha/contents 1.17
distrib/notes/amd64/contents 1.6
distrib/notes/amiga/contents 1.21
distrib/notes/arc/contents 1.3
distrib/notes/atari/contents 1.21
distrib/notes/bebox/contents 1.3
distrib/notes/cats/contents 1.3
distrib/notes/common/contents 1.173
distrib/notes/common/xfer 1.75
distrib/notes/emips/contents 1.3
distrib/notes/evbarm/contents 1.3
distrib/notes/evbppc/contents 1.4
distrib/notes/ews4800mips/contents 1.3
distrib/notes/hp300/contents 1.18
distrib/notes/hpcarm/contents 1.4
distrib/notes/hpcmips/contents 1.11
distrib/notes/hpcsh/contents 1.4
distrib/notes/hppa/contents 1.3
distrib/notes/i386/contents 1.30
distrib/notes/landisk/contents 1.4
distrib/notes/mac68k/contents 1.21
distrib/notes/macppc/contents 1.13
distrib/notes/mmeye/contents 1.4
distrib/notes/mvme68k/contents 1.14
distrib/notes/news68k/contents 1.7
distrib/notes/newsmips/contents 1.3
distrib/notes/next68k/contents 1.8
distrib/notes/ofppc/contents 1.4
distrib/notes/pmax/contents 1.18
distrib/notes/prep/contents 1.3
distrib/notes/rs6000/contents 1.3
distrib/notes/sandpoint/contents 1.3
distrib/notes/sgimips/contents 1.3
distrib/notes/shark/contents 1.3
distrib/notes/sparc/contents 1.22
distrib/notes/sparc64/contents 1.6
distrib/notes/sun2/contents 1.3
distrib/notes/sun3/contents 1.17
distrib/notes/vax/contents 1.12
distrib/notes/x68k/contents 1.18

Document debug sets and kernel module directory.

(martin)

Add temporary hint at manual installation instructions for UEFI setups.

(martin)

Fix current version of tzcode for ticket #809.

(martin)

Tickets #891, #892, #893, #894, #895, #896 and #897.

(martin)

Pull up the following, via patch, requested by maxv in ticket #897:

sys/arch/amd64/amd64/locore.S          1.166 (patch)
sys/arch/i386/i386/locore.S            1.157 (patch)
sys/arch/x86/include/cpu.h              1.92 (patch)
sys/arch/x86/include/fpu.h              1.9 (patch)
sys/arch/x86/x86/fpu.c                  1.33-1.39 (patch)
sys/arch/x86/x86/identcpu.c            1.72 (patch)
sys/arch/x86/x86/vm_machdep.c          1.34 (patch)
sys/arch/x86/x86/x86_machdep.c          1.116,1.117 (patch)

Support eager fpu switch, to work around INTEL-SA-00145.
Provide a sysctl machdep.fpu_eager, which gets automatically
initialized to 1 on affected CPUs.

(martin)

Note import of dhcpcd-7.0.6.

(martin)

Pull up the following, requested by roy in ticket #896:

external/bsd/dhcpcd/dist/src/common.c          up to 1.1.1.5
external/bsd/dhcpcd/dist/src/defs.h            up to 1.1.1.14
external/bsd/dhcpcd/dist/src/dhcpcd.8.in        up to 1.1.1.10
external/bsd/dhcpcd/dist/src/dhcpcd.c          up to 1.13
external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in  up to 1.1.1.10
external/bsd/dhcpcd/dist/src/duid.c            up to 1.1.1.3

Import dhcpcd 7.0.6.

(martin)

Pull up following revision(s) (requested by kamil in ticket #895):

usr.sbin/sysinst/util.c: revision 1.9

Fix invalid free(3) in sysinst(8)

The path variable is assigned with an allocation on the heap with
strdup(3). Later this pointer is changed with strsep(3) and this caused
invalid free(3).

Store the original pointer in a new helper variable opath and pass it to
free(3). With this change, the problem is going away.

Detected with MKSANITIZER=yes with AddressSanitizer.

(martin)

Pull up following revision(s) (requested by pgoyette in ticket #894):

sys/dev/ata/ata_raid.c: revision 1.40

Call config_cfattach_attach() regardless of whether the module is
being built as part of a kernel or as a external module.

Addresses kern/53389 - thanks for the report!

XXX pullup-8

(martin)

Pull up following revision(s) (requested by maxv in ticket #893):

sys/netinet6/icmp6.c: revision 1.228,1.230

Remove the RH0 code from ICMPv6. RH0 is deprecated by RFC5095 (2007) for
security reasons. We already removed it in Route6.

In addition there was an mbuf bug here: calling IP6_EXTHDR_GET twice with
the same offset, but still using the pointer from the first call, which
could have been made invalid. By luck, m_pulldown leaves zero-sized mbufs
in place, instead of freeing them.

And in general, using a 'finaldst' pointer on the mbuf, and then modifying
that mbuf with IP6_EXTHDR_GET with a smaller offset, was really error-
prone.

Fix 'icmp6len', it shouldn't be ip6_plen, because we may not be at the
beginning of the packet (off+ip6_plen is beyond the end of the mbuf). By
luck, the IP6_EXTHDR_GET that follows will fail and prevent buffer
overflows in non-jumbogram packets.

For jumbograms we will probably be in trouble here; but it doesn't seem
possible to craft reliably a jumbogram for a non-jumbogram-enabled device.

So I don't think it's a huge problem.

(martin)

Pull up following revision(s) (requested by maya in ticket #892):

lib/libc/sys/sched.c: revision 1.5

PR/52826: Onno van der Linden: Return PRI_NONE for sched_get_priority_m{in,ax}
and SCHED_OTHER.

(martin)

Apply patch, requested by christos in ticket #891:

Provide future compatibility API when OPENSSL_API_COMPAT is
defined to >= 0x10100000L.

(martin)

Tickets #887, #888, #889

(martin)

Pull up following revision(s) (requested by maxv in ticket #889):

sys/netinet6/ip6_output.c: revision 1.205
sys/netipsec/xform_ah.c: revision 1.90,1.93,1.102,1.103

Simplify the IPv4 parser. Get the option length in 'optlen', and sanitize
it earlier. A new check is added (off + optlen > skip).

In the IPv6 parser we reuse 'optlen', and remove 'ad' as a result.

Remove the kernel RH0 code. RH0 is deprecated by RFC5095, for security
reasons. RH0 was already removed in the kernel's input path, but some
parts were still present in the output path: they are now removed.
Sent on tech-net@ a few days ago.

Fix non-INET6 builds

Strengthen and simplify, once more.

(martin)

Pull up following revision(s) (requested by jakllsch in ticket #888):

sys/dev/pci/ld_virtio.c: revision 1.19-1.21,1.23

remove trailing whitespace

add feature/register definitions from virtio-v1.0-cs04

unload payload dma map upon command completion

Make ld_virtio aware of a possible device-side write cache.

The virtio block device capacity config item is expressed always in
request protocol sector units of 512 bytes.

Also, add and use a symbolic constant to refer to request protocol
sector units.

destroy 'sc_sync_wait' condvar and mutex upon detach

(martin)

Pull up following revision(s) (requested by christos in ticket #887):

bin/ed/main.c: revision 1.30

Prevent shell execution also in the 'r ! dobad' case, pointed out by
Martijn van Duren, thanks!

XXX: pullup-8

(martin)

Note release note changes

(martin)

Update for NetBSD-8

(martin)

Tickets #882, #883, #884, #885 and #886

(martin)

Pull up following revision(s) (requested by christos in ticket #886):

share/mk/bsd.sys.mk: revision 1.282

The compat build plays games with MAKEOBJDIR and unsets MAKEOBJDIRPREFIX.
Keep using our standard NETBSDOBJDIR if it was set.

(martin)

Pull up following revision(s) (requested by jmcneill in ticket #885):

sys/dev/ic/dwc_gmac.c: revision 1.47

Avoid calling bus_dmamap_sync with len=0

(martin)

Pull up following revision(s) (requested by uwe in ticket #884):

sys/arch/powerpc/powerpc/trap.c: revision 1.154

In mtmsr emulation ignore PSL_VEC we set in mfmsr emulation just
above, as it freaks out PSL_USEROK_P().  This is also congruent with
how we handle PSL_FP.

PR port-macppc/53360

(martin)

Pull up following revision(s) (requested by jakllsch in ticket #883):

sys/arch/arm/fdt/psci_fdt.c: revision 1.5
sys/arch/arm/arm/psci.c: revision 1.2

Use correct value for PSCI 0.2+ PSCI_CPU_ON.

Fix PSCI 0.1 detection.

(martin)

Pull up following revision(s) (requested by sevan in ticket #882):

usr.sbin/ofctl/ofctl.8: revision 1.6
usr.sbin/ofctl/ofctl.8: revision 1.7

Merge single-letter options. Use more markup.

Document -l, -r, and -w, based on input by jmcneill@

Bump date.

(martin)

Regen for ticket #878.

(msaitoh)

Tickets #877, #878, #879, #880, #881

(martin)

Pull up the following revisions, requestes by christos in ticket #881:

share/mk/bsd.sys.mk revision 1.280, 1.281

Create NETBSDOBJDIR to handle MAKEOBJDIRPREFIX, since that prepends the
prefix to the whole path.
Mention that we cannot handle MAKEOBJDIR

-

Handle more objdir variations for MKREPRO (untested)

(martin)

Pull up following revision(s) (requested by macallan in ticket #880):

sys/arch/macppc/conf/std.macppc: revision 1.24

set options ADBKBD_EMUL_USB by default

With this ADB and USB keyboards can coexist on the same mux, as needed by
built-in Bluetooth modules on some *Books

should fix PR53351

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #879):

sys/kern/subr_workqueue.c: revision 1.37

Don't wait on workqueue_wait if called from worker itself

Otherwise workqueue_wait never return in such a case.  This treatment
is the same as callout_halt.

(martin)

Pull up following revision(s) (requested by maya in ticket #878):

share/man/man4/rtsx.4: revision 1.5
sys/dev/pci/pcidevs: revision 1.1331
sys/dev/ic/rtsxreg.h: revision 1.3
sys/dev/ic/rtsxvar.h: revision 1.3
sys/dev/pci/rtsx_pci.c: revision 1.7
sys/dev/ic/rtsx.c: revision 1.3

add realtek RT525A PCI-E card reader
found in my Dell XPS 15 9550.

rtsx(4): Add support for RT525A, from openbsd.
ok rkujawa

Denote RTS525A, bump date

(martin)

Pull up following revision(s) (requested by zafer in ticket #877):

usr.sbin/user/user.c: revision 1.132

Set default homeperm values before writing usermgmt.conf file and
honor values in it instead of ignoring it.

Fixes PR bin/40324 by Guy Yur

(martin)

876

(snj)

Pull up following revision(s) (requested by ozaki-r in ticket #876):
sys/net/if_vlan.c: 1.126
tests/net/if_vlan/t_vlan.sh: 1.9
vlan: call ether_ifdetach without IFNET_LOCK
Fix PR kern/53357
--
Add tests of vlan with bridge
The tests trigger a panic reported in PR kern/53357.

(snj)

Ticket #875

(martin)

Pull up following revision(s) (requested by nonaka in ticket #875):

usr.sbin/arp/arp.c: revision 1.59

fix usage of `arp -d'.

(martin)

Ammend ticket #870

(martin)

Apply patch, requested by christos on ticket #870:

Use :q (instead of :Q) to quote make variables passed to sub makes here too.

(martin)

Ammend ticket #780

(martin)

Also pull up r1.784 for ticket #870:

add new tests

(martin)

Tickets #850 - #852, #854 - #858, #861 - #865, #867 - #874

(martin)

Pull up following revision(s) (requested by maya in ticket #874):

share/i18n/esdb/ISO-8859/ISO-8859.alias: revision 1.4

Add more aliases for Hebrew and Arabic ISO-8859-... encodings.

ISO-8859-8 is supposed to be visual order (i.e. legible if displayed ltr)
ISO-8859-8-i is supposed to be implicit logic order
ISO-8859-8-e is supposed to be explicit about order

In practice, ISO-8859-8 implying visual order is rare, and logic
order is used. ISO-8859-8-e is rarely used.

Same for Arabic, which uses ISO-8859-6-...

Mentioned in RFC 1555, RFC 1556.

(martin)

Pull up following revision(s) (requested by nat in ticket #873):
usr.bin/fstat/misc.c: revision 1.18
Update fstat for audio(4) and pad(4) devices.
XXX - pullup 8.
Ok christos@.

(martin)

Pull up following revision(s) (requested by kamil in ticket #872):

external/bsd/top/dist/machine/m_netbsd.c: revision 1.20

Fix read of unitialized array elements in top(1)

The cp_old array is allocated with malloc(3) and its pointer is passed to=
percentages64().

In this function there happens a calculation of total_change, which value=
depends on the value inside the unitialized cp_old[] array.

WARNING: MemorySanitizer: use-of-uninitialized-value
/usr/src/external/bsd/top/bin/../dist/machine/m_netbsd.c:1341:6
/usr/src/external/bsd/top/bin/../dist/machine/m_netbsd.c:478:65
SUMMARY: MemorySanitizer: use-of-uninitialized-value
/usr/src/external/bsd/top/bin/../dist/machine/m_netbsd.c:1341:6 in percentages64
Exiting

Fix this issue by changling malloc(3) with calloc(3).

Detected with Memory Sanitizer during the integration of sanitizers with
the NetBSD basesystem.

Reported by <Yang Zheng>

(martin)

Pull up following revision(s) (requested by kamil in ticket #871):

external/bsd/top/dist/top.c: revision 1.10

Fix unitialized signal mask passed to sigaction(2) in top(1)

Detected with Memory Sanitizer during the integration of sanitizers with
the NetBSD basesystem.

Reported by <Yang Zheng>

(martin)

Pull up following revision(s) (requested by christos in ticket #870):

sys/lib/libgnuefi/Makefile.inc: revision 1.5
external/mit/xorg/xorg-pkg-ver.mk: revision 1.9
sys/arch/i386/stand/lib/Makefile.inc: revision 1.17
sys/compat/common/Makefile.inc: revision 1.25
usr.bin/make/unit-tests/varquote.exp: revision 1.1, 1.2
sys/lib/libsa/Makefile.inc: revision 1.24
usr.bin/make/var.c: revision 1.220
sys/arch/ia64/stand/efi/libefi/Makefile.inc: revision 1.5
sys/arch/hppa/spmath/Makefile.inc: revision 1.10
usr.bin/make/unit-tests/varquote.mk: revision 1.1, 1.2
usr.bin/make/unit-tests/Makefile: revision 1.53
sys/lib/libkern/Makefile.inc: revision 1.45
sys/arch/acorn32/stand/lib/Makefile.inc: revision 1.4
sys/arch/m68k/fpsp/Makefile.inc: revision 1.21
usr.bin/make/make.1: revision 1.273
sys/lib/libz/Makefile.inc: revision 1.17

- Introduce :q modifier for make variables and make it double escape $'s so
  that passing variables to recursive makes with :q works as expected.
- Adjust makefiles that use recursive make to use :q

Discussed on tech-toolchain@

XXX: pullup 8

(martin)

Pull up following revision(s) (requested by joerg in ticket #869):

usr.sbin/sysinst/arch/mvme68k/md.c: revision 1.5
usr.sbin/sysinst/net.c: revision 1.24
usr.sbin/sysinst/partman.c: revision 1.22
usr.sbin/sysinst/menus.mi: revision 1.12
usr.sbin/sysinst/arch/i386/md.c: revision 1.8
usr.sbin/sysinst/arch/alpha/md.c: revision 1.3
usr.sbin/sysinst/bsddisklabel.c: revision 1.3
usr.sbin/sysinst/arch/x68k/md.c: revision 1.5
usr.sbin/sysinst/arch/hp300/md.c: revision 1.5
usr.sbin/sysinst/arch/emips/md.c: revision 1.4
usr.sbin/sysinst/arch/pmax/md.c: revision 1.3
usr.sbin/sysinst/arch/mipsco/md.c: revision 1.3
usr.sbin/sysinst/arch/hppa/md.c: revision 1.3
usr.sbin/sysinst/util.c: revision 1.8
usr.sbin/sysinst/defs.h: revision 1.10
usr.sbin/sysinst/arch/landisk/md.c: revision 1.4

deconst -> __UNCONST, the former involves UB with NULL arithmetic.

(martin)

Pull up following revision(s) (requested by roy in ticket #868):

sys/sys/socketvar.h: revision 1.156
sys/kern/uipc_socket2.c: revision 1.130
sys/kern/uipc_socket.c: revision 1.264

Separate receive socket errors from general socket errors.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #867):

sys/arch/x86/x86/procfs_machdep.c: revision 1.23

Add SSBD bit for Intel.

(martin)

Pullup the following revisions, requested by maxv in ticket #865:

sys/arch/amd64/amd64/machdep.c 1.303 (patch)
sys/arch/amd64/conf/GENERIC 1.492 (patch)
sys/arch/amd64/conf/files.amd64 1.103 (patch)
sys/arch/i386/i386/machdep.c 1.806 (patch)
sys/arch/i386/conf/GENERIC 1.1179 (patch)
sys/arch/i386/conf/files.i386 1.393 (patch)
sys/arch/x86/include/cpu.h 1.91 (patch)
sys/arch/x86/include/specialreg.h upto 1.126 (patch)
sys/arch/x86/x86/x86_machdep.c upto 1.115 (patch, adapted)
sys/arch/x86/x86/spectre.c upto 1.19 (patch, adapted,
no IBRS,
SpectreV2 mitigations not
enabled by default)

Backport the hardware SpectreV2 and SpectreV4 mitigations.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #864):

sys/dev/pci/ixgbe/ix_txrx.c 1.40-1.47 (patch)
sys/dev/pci/ixgbe/ixgbe.c 1.148,1.149,1.151,
1.152,1.154,
1.155,1.157-1.160 (patch)
sys/dev/pci/ixgbe/ixgbe.h 1.43,1.44,1.46,1.49 (patch)
sys/dev/pci/ixgbe/ixgbe_netbsd.c 1.7 (patch)
sys/dev/pci/ixgbe/ixgbe_netbsd.h 1.8 (patch)
sys/dev/pci/ixgbe/ixgbe_osdep.h 1.22 (patch)
sys/dev/pci/ixgbe/ixv.c 1.100-1.104 (patch)
sys/dev/pci/ixgbe/ixv.c 1.94,1.95,1.99 (patch)

Remove unused structure entries. No functional change.
-
Remove unused IXGBE_FC_HI and IXGBE_FC_LO. The watermark of the flow control
is automatically calculated from the size of the packet buffer.
-
Use ixgbe_eitr_write() when writing the EITR for the link interrupt like
queue's EITR to write the register safely. This change is not relatively
so important than queue's EITR because link's EITR is written in if_init().
-
Don't free and reallocate bus_dmamem when it's not required. Currently,
the watchdog timer is completely broken and never fire (it's from FreeBSD
(pre iflib)). If the problem is fixed and watchdog fired, ixgbe_init() always
calls ixgbe_jcl_reinit() and it causes panic. The reason is that
ixgbe_local_timer1(it includes watchdog function) is softint and
xgbe_jcl_reinit() calls bus_dmamem*() functions. bus_dmamem*() can't be called
from interrupt context.

One of the way to prevent panic is use worqueue for the timer, but it's
not a small change. (I'll do it in future).

Another way is not reallocate dmamem if it's not required. If both the MTU
(rx_mbuf_sz in reality) and the number of RX descriptors are not changed, it's
not required to call bus_dmamem_{unmap,free}(). Even if we use workque, this
change save time of ixgbe_init().

I have a code to fix broken watchdog timer but it sometime causes watchdog
timeout, so I don't commit it yet.
-
Count some register correctly:
- QPRDC register is only for 82599 and newer.
- Count IXGBE_QPRDC, PX{ON,OFF}{T,R}XC[NT].
The TQSMR register is not for receiving but for transmitting, so move the
initialization from ixgbe_initialize_receive_units() to
ixgbe_initialize_transmit_units(). No functional change.
-
Whitespace fix. No functional change.
-
Add rxd_nxck (Receive Descriptor next to check) read only sysctl.
Don't check IFF_RUNNING in ixgbe_rxeof(). Doing break and leaving a deacriptor
with DD bit is worse than just processing the entry. And it's also racy to
check IFF_RUNNING in rxeof(). If you'd like to strictly obey IFF_RUNNING,
it would be better to do it in the upper layer.
Same as DragonFly (a part of 79251f5ebe4cf9dd2f3e6aed590e09d756d39922).
Add "bool txr_no_space" for TX descriptor shortage. Use it like IFF_OACTIVE.
Clear que->disabled_count in {ixgbe,ixv}_init_locked(). Without this,
interrupt mask state and EIMS may mismatch and if_init doesn't recover
from TX/RX stall problem.
This change itself doesn't fix PR#53294.
-
Add hw.ixgN.debug sysctl. "sysctl -w hw.ixgN.debug=1" dumps some registers
to console.
-
Constify several variables in ixgbe/ so that they land in .rodata (1038
bytes).
-
Don't call ixgbe_rearm_queues() in ixgbe_local_timer1().
  ixgbe_enable_queue() and ixgbe_disable_queue() try to enable/disable queue
  interrupt safely. It has the internal counter. When a queue's MSI-X is
  received, ixgbe_msix_que() is called (IPL_NET). This function disable the
  queue's interrupt by ixgbe_disable_queue() and issues an softint.
  ixgbe_handle() queue is called by the softint (IPL_SOFTNET), process TX, RX
  and call ixgbe_enable_queue() at the end.

  ixgbe_local_timer1() is a callout and run always on CPU 0 (IPL_SOFTCLOCK).
  When ixgbe_rearm_queues() called, an MSI-X interrupt is issued for a specific
  queue. It may not CPU 0. If this interrupt's ixgbe_msix_que() is called and
  sofint_schedule() is called before the last sofint's softint_execute() is not
  called, the softint_schedule() fails because of SOFTINT_PENDING. It result
  in breaking ixgbe_{enable,disable}_queue()'s internal counter.
  ixgbe_local_timer1() is written not to call ixgbe_rearm_queues() if
  the interrupt is disabled, but it's called because of unknown bug or a race.

  One solution to avoid this problem is to not to use the internal counter,
  but it's little difficult. Another solution is stop using
  ixgbe_rearm_queues() at all. Essentially, ixgbe_rearm_queues() is not
  required (it was added in ixgbe.c rev. 1.43 (2016/12/01)).
  ixgbe_rearm_queues() helps for lost interrupt problem but I've never seen it
  other than ixgbe_rearm_queues() problem.

XXX pullup-8.

(martin)

Pull up following revision(s) (requested by uwe in ticket #863):

sys/arch/macppc/stand/fixcoff/elf32_powerpc_merge.x: revision 1.6,1.7 (patch)

PR port-macppc/52564

  . = (. + 0x0FFF) & 0xFFFFF000;

now seems to cause binutils to pad the preceding section, and when
that happens to be .text the powermac ofw is unhappy for whatever
reason.

For now provide .pad section that absorbs the padding as a workaround.
The binutils problem still needs to be looked into.

(martin)

Pull up following revision(s) (requested by nonaka in ticket #862):

sys/net/if_llatbl.c: revision 1.27

It is necessary to set wall time instead of monotonic time to rmx_expire.

(martin)

Pull up following revision(s) (requested by nonaka in ticket #861):

sys/compat/common/rtsock_50.c: revision 1.7

Added missing ifi_link_state at compat_50_rt_oifmsg() and compat_50_iflist().

(martin)

Pull up following revision(s) (requested by maya in ticket #858):

usr.sbin/makefs/ffs.c: revision 1.70

PR/52828: Mark Johnston: makefs UFS2 lazy inode initialization is buggy
makefs(8) emulates UFS2 in performing lazy initialization of inode
blocks when allocating and writing inodes. However, it only ever
initializes one inode block at a time, which may be insufficient.

If so, a later initialization may clobber an inode, resulting in
an inconsistent filesystem.

I committed a minimal fix for the problem to FreeBSD:
https://svnweb.freebsd.org/changeset/base/326912

(martin)

Pull up following revision(s) (requested by maya in ticket #857):

sys/dev/pci/mpii.c: revision 1.9

PR/52330: Jia-Ju Bai: mpii driver: a sleep-in-interrupt bug in mpii_intr
Since the enclosing routime mpii_event_raid already calls malloc with
M_NOWAIT, fix the cache routine to do the same. While there check the
result of the cache routine and change some error prints to aprint.

(martin)

Pull up following revision(s) (requested by maya in ticket #856):

sys/nfs/nfs.h: revision 1.76
sys/nfs/nfs_subs.c: revision 1.230
sys/nfs/nfs_socket.c: revision 1.199
sys/nfs/nfs_clntsocket.c: revision 1.6

PR/40491: From Tobias Ulmer in tech-kern@:
1. Protect the nfs request queue with its own mutex
2. make the nfs_receive queue check for signals so that intr mounts
  can be interrupted.

XXX: pullup-8

(martin)

Pull up following revision(s) (requested by maya in ticket #855):

sbin/fsck_lfs/bufcache.h: revision 1.14
sbin/fsck_lfs/bufcache.c: revision 1.20

PR/51418: Jose Luis Rodriguez Garcia: Fix incore src/sbin/fsck_lfs/bufcache.c
XXX: pullup-8, pullup-7

(martin)

Pull up following revision(s) (requested by maya in ticket #854):

external/mpl/dhcp/dist/common/bpf.c: revision 1.3

PR/50893: Bruce Lilly: Handle carp interfaces.
XXX: pullup-8 (in src/external/bsd/dhcp/dist/common/bpf.c)

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #852):

sys/netinet6/icmp6.c: revision 1.238
sys/netinet/ip_icmp.c: revision 1.171
sys/net/route.c: revision 1.210

Fix _rt_free via rtrequest(RTM_DELETE) hangs in rt_timer handlers

A rt_timer handler is passed a rtentry with an extra reference that avoids the
rtentry is accidentally released.  So rt_timer handers must release
the reference of a passed rtentry by themselves (but they didn't).

(martin)

Pull up following revision(s) (requested by mrg in ticket #851):

sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.9-1.11

disable drm2 on modern nouveau cards (Pascal-based).

our older drm doesn't have any support for modern Pascal or
the second version of Maxwell (but not disabled here yet)
but the driver tries to attach on any nvidia gpu.
this should workaround PR#53258, and other issues reported
with modern nvidia chipsets.

XXX: pullup-7, pullup-8.

-

disable matching nouveau on pascal and the second generation of maxwell
cards that are not supported by this version of drm.
this should fix various modern systems vs nvidia issues, eg PR 53188.

XXX: pullup-7, pullup-8.

-

the previous change doubled the check for pascal.  fix it so
that we only check for later maxwell and pascal once each,
as intended.

(martin)

Pull up following revision(s) (requested by leot in ticket #850):

usr.bin/tr/str.c: revision 1.30

Do not accept invalid octal character values (>= 0400).

This also avoid possible stack corruption (e.g. previously `tr -s '\400'' or
similars lead to them).

Reviewed and thanks to <pgoyette>!

(martin)

Pull up following revision(s) (requested by jdolecek in ticket #841):

sys/dev/isa/isadmareg.h: revision 1.9
sys/dev/isa/isareg.h: revision 1.10
sys/dev/isa/isadma.c: revision 1.67

fix off-by-one in the mapping of the ISA DMA page registers, they actually
start at 0x81; the code used bus_space_map() starting from 0x80 but
used +1 offset for actual I/O, now it maps starting 0x81 and does I/O
without offset

the reads and writes work exactly the same as before, but this frees
0x80 for being mapped independantly
patch provided in PR kern/52468 by Jonathan Chapman; checked against the spec
and also FreeBSD sys/x86/isa/isa_dma.c

(martin)

Tickets #840, #841, #842, #843, #844, #845, #846, #847, #848, #849

(martin)

Catch up to current in src/external/bsd/dhcpcd/dist, requested
by roy in ticket #849:

external/bsd/dhcpcd/dist/Makefile              up to 1.1.1.5
external/bsd/dhcpcd/dist/src/arp.c              up to 1.1.1.7
external/bsd/dhcpcd/dist/src/auth.c            up to 1.1.1.5
external/bsd/dhcpcd/dist/src/auth.h            up to 1.1.1.3
external/bsd/dhcpcd/dist/src/bpf.c              up to 1.7
external/bsd/dhcpcd/dist/src/defs.h            up to 1.1.1.13
external/bsd/dhcpcd/dist/src/dhcp.c            up to 1.11
external/bsd/dhcpcd/dist/src/dhcp.h            up to 1.1.1.6
external/bsd/dhcpcd/dist/src/dhcp6.c            up to 1.1.1.12
external/bsd/dhcpcd/dist/src/dhcp6.h            up to 1.1.1.6
external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf up to 1.1.1.2
external/bsd/dhcpcd/dist/src/dhcpcd.8.in        up to 1.1.1.9
external/bsd/dhcpcd/dist/src/dhcpcd.c          up to 1.12
external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in  up to 1.1.1.9
external/bsd/dhcpcd/dist/src/if-bsd.c          up to 1.1.1.8
external/bsd/dhcpcd/dist/src/if-linux.c        up to 1.1.1.9
external/bsd/dhcpcd/dist/src/if-options.c      up to 1.10
external/bsd/dhcpcd/dist/src/ipv4ll.h          up to 1.1.1.4
external/bsd/dhcpcd/dist/src/ipv6.c            up to 1.1.1.10
external/bsd/dhcpcd/dist/src/ipv6.h            up to 1.1.1.7
external/bsd/dhcpcd/dist/src/ipv6nd.c          up to 1.1.1.8
external/bsd/dhcpcd/dist/src/ipv6nd.h          up to 1.1.1.6
external/bsd/dhcpcd/dist/src/route.c            up to 1.1.1.7
doc/3RDPARTY (manually modified)

Import dhcpcd 7.0.5b.

Changes:
* Routing: Fix case when cloning route changes but needs to be replaced
* DHCP6: Transpose DHCP userclass option into DHCP6
* DHCP6: Fix sending custom vendor class option
* Auth: Allow zero value replay detection data
* Auth: Allow different tokens for send and receive
* ND6: Warn if router lifetime is set to zero
* DHCP6: Softwire Address and Port-Mapped Clients, RFC7598
*  dhcp: Clarified some checksumming code, style and commentary
    (thanks to Maxime Villard)
*  dhcp6: IAID is now unique per IA type rather than global
*  ip6: if an IA callback causes a fork, exit earlier

(martin)

Pull up following revision(s) (requested by nat in ticket #848):

share/man/man9/Makefile: revision 1.422
distrib/sets/lists/comp/mi: revision 1.2198
share/man/man7/Makefile: revision 1.33
share/man/man9/audio.9: revision 1.47
share/man/man7/audio.7: file removal
sys/dev/audio.c: revision 1.456
sys/dev/audio.c: revision 1.457
distrib/sets/lists/man/mi: revision 1.1591
share/man/man9/intro.9: revision 1.20
share/man/man7/audio.7: revision 1.3
share/man/man9/audio_system.9: revision 1.1
share/man/man7/intro.7: revision 1.26
share/man/man4/audio.4: revision 1.86

Fix a typo with sc_out/inports when setting the hardware recording gain on the
mix ring.  Found by mrg@
XXX pullup-8

Using audioctl without the -p switch defaults to the mix ring.  This allows
setting the hardware gain etc.

Update the audio spec in audio.7 to reflect these changes.
Addresses PR kern/52781.

Move the audio specification to section 9 under audio_system.
Ok wiz@

(martin)

Pull up following revision(s) (requested by nat in ticket #847):

sys/dev/usb/if_urtwn.c: revision 1.58

Fix support for 8192eu, notably TPLINK TL-WN823NV2, by using the right
registers when setting receiver gain.

Ok christos@.

(martin)

Regen (ticket #846)

(martin)

Pull up following revision(s) (requested by jnemeth in ticket #846):

sys/dev/pci/pcidevs: revision 1.1334
sys/dev/pci/pucdata.c: revision 1.102

add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card

(martin)

Pull up following revision(s) (requested by youri in ticket #845):

external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata: revision 1.4
external/mit/xorg/lib/xkeyboard-config/rules/Makefile: revision 1.4

Generate xml files properly. Noted by youri.
XXX: pullup-8

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #844):

sys/net/if.c: revision 1.425

Relax a lock check in if_mcast_op unless NET_MPSAFE

It seems that there remain some paths that don't satisfy the constraint that is
required only if NET_MPSAFE.  So don't check it by default.

One known path is nd6_rtrequest => in6_addmulti => if_mcast_op, which is not
easy to address.

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #842):

sys/netinet6/mld6.c: revision 1.93-1.99
sys/netinet6/in6_var.h: revision 1.99,1.100
sys/netinet6/in6.c: revision 1.267,1.268
sys/netinet6/nd6.c: revision 1.249

Don't hold softnet_lock in mld_timeo
Then we can get rid of remaining abuses of mutex_owned(softnet_lock).

Release in6_multilock on callout_halt of mld_timeo to avoid a deadlock
Improve atomicity of in6_leavegroup and in6_delmulti

Avoid NULL pointer dereference on imm->i6mm_maddr

Make a refcount decrement and a removal from a list of an item atomic
in6m_refcount of an in6m can be incremented if the in6m is on the list
(if_multiaddrs) in in6_addmulti or mld_input.  So we must avoid such an
increment when we try to destroy an in6m.  To this end we must make
an in6m_refcount decrement and a removal of an in6m from if_multiaddrs
atomic.

Make a deletion of in6m in nd6_rtrequest atomic

Move LIST_REMOVE
mld_stoptimer releases in6_multilock temporarily, so we must LIST_REMOVE first.

Avoid double LIST_REMOVE which corrupts lists
Mark in6m as used for non-DIAGNOSTIC builds.

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #843):

sys/dev/pci/ixgbe/ixv.c: revision 1.101
sys/net/if_bridge.c: revision 1.156
sys/net/if_pppoe.c: revision 1.138
sys/dev/pci/if_wm.c: revision 1.580
sys/dev/pci/ixgbe/ixgbe.c: revision 1.156
sys/net/if_gif.c: revision 1.142

Ensure to call if_register after interface initializations finish

(martin)

Tickets #832, #834, #836, #837, #838, #839 and #840

(martin)

Pull up following revision(s) (requested by knakahara in ticket #840):

sys/net/if_ipsec.c: revision 1.15,1.16

Fix panic when ipsecif(4) adds discard policy. Pointed out by ohishi@IIJ, thanks.
Reviewd by ohishi@IIJ. Sorry, I jumped the gun and committed.

Fix the following two issues.
    - remove extra padding of sizeof(xisr) when adding ipsec policy
    - add padding for xpl when adding discard policy

(martin)

Pull up following revision(s) (requested by knakahara in ticket #839):

sys/net/if_ipsec.c: revision 1.14

ipsecif(4) must not set port number to spidx even if NAT-T. Pointed out by ohishi@IIJ, thanks.

(martin)

Pull up following revision(s) (requested by jmcneill in ticket #838):

etc/rc.d/sshd: revision 1.28

Silence ssh-keygen output when host keys are generated. Instead, print only
key fingerprints. This replaces dozens of lines out ASCII art output with
something more reasonable:

armv7# service sshd start
ssh-keygen: 1024 SHA256:ynP4BQ2B0Fknnf9PfF4QoUDlYi0+7rNfYXTOYP2cDic root@armv7 (DSA)
ssh-keygen: 521 SHA256:Eoj382aaJNlSxuq/aYj3AXgxfMJAkyVPoCQd2BNjJiA root@armv7 (ECDSA)
ssh-keygen: 256 SHA256:+e9/qTbbN/g6xvkadtHsmIQ+Pc0afZRxbXJsk2HKIzY root@armv7 (ED25519)
ssh-keygen: 2048 SHA256:urNaF/m6oiCe5hXFZBxGLW2PvLz0ibtRFrqYw6R+qTw root@armv7 (RSA)
ssh-keygen: 256 SHA256:Su2Nal2W3vrFz8ukpcSXngl1/bu6xUm1nSvbxTHe9Js root@armv7 (XMSS)
Starting sshd.

(martin)

Pull up following revision(s) (requested by maxv in ticket #837):

sys/netinet/udp_usrreq.c: revision 1.237

Fix three pretty bad mistakes in NAT-T:

* If we got a keepalive packet, we need to call m_freem, not m_free.
  Here the next mbufs in the chain are not freed. Seems easy to remotely
  DoS the system by sending fragmented keepalives in a loop.

* If !ipsec_used, free the mbuf.

* In udp_input, we need to update 'uh', because udp4_realinput may have
  modified the chain. Perhaps we also need to re-enforce alignment, so
  add an XXX.

(martin)

Pull up following revision(s) (requested by nonaka in ticket #836):
external/gpl2/gmake/dist/glob/glob.c: revision 1.5
gmake: __alloca and __stat are provided only when building with GLIBC.
Fix a build failure on Ubuntu 18.04.

(martin)

Pull up following revision(s) (requested by christos in ticket #834):

usr.bin/make/var.c: revision 1.219
share/mk/bsd.obj.mk: revision 1.52
usr.sbin/crash/Makefile: revision 1.40
share/mk/sys.mk: revision 1.131
share/mk/bsd.sys.mk: revision 1.276
share/mk/bsd.sys.mk: revision 1.277

Prevent 'make obj' creating an objdir inside an objdir. This happens the
second time we call 'make obj' in /usr/src/rescue with MAKEOBJDIR set.
XXX: pullup-8
-
Need to delete ${DESTDIR} for lint
XXX: pullup-8
-
Fix reproducible builds
XXX: pullup-8
-
Also substitute ${X11SRCDIR} for the random seed for reproducible builds so
that the random seed is consistent.
XXX: pullup-8
-
Since ${MAKE} converts $$ -> $ during parsing we need to put it back to
preserve the original variable value with :Q.
XXX: pullup-8
-
Be more selective about remapping object directories otherwise we pick
objdump and objcopy with the regex.
XXX: pullup-8

(martin)

Pull up following revision(s) (requested by jakllsch in ticket #832):

sys/dev/pci/pcivar.h: revision 1.112
sys/dev/pci/pci_map.c: revision 1.34,1.35
sys/arch/x86/x86/efi.c: revision 1.15

Enable the appropriate memory or I/O space decode in the PCI
Command/Status Register upon mapping a BAR.

This should fix PR #53286.  It's also possible there are other similar
PRs that might be fixed by this.
-
Refine previous change to enable PCI window decoding in Command
Register upon mapping; conditionalize on a global variable, that is set
to true on x86 machines booting under EFI.

For now, initialize the global variable at compile time to false.  This
is intended to limit potential problems for other NetBSD ports, should
this changeset be pulled up to netbsd-8.

Related to PR #53286.

(martin)

Change #860 entry with the text provided in the ticket.

(bouyer)

tickets 859, 860

(bouyer)

Pull up following revision(s) (requested by martin in ticket #860):
usr.sbin/sysinst/msg.mi.de: revision 1.7
usr.sbin/sysinst/arch/i386/md.c: revision 1.10
usr.sbin/sysinst/msg.mi.fr: revision 1.10
usr.sbin/sysinst/arch/i386/md.c: revision 1.11
usr.sbin/sysinst/menus.mi: revision 1.13
usr.sbin/sysinst/arch/i386/md.c: revision 1.9
usr.sbin/sysinst/msg.mi.es: revision 1.7
usr.sbin/sysinst/msg.mi.en: revision 1.11
usr.sbin/sysinst/mbr.c: revision 1.6
usr.sbin/sysinst/disks.c: revision 1.15
usr.sbin/sysinst/bsddisklabel.c: revision 1.4
usr.sbin/sysinst/disks.c: revision 1.16
usr.sbin/sysinst/msg.mi.pl: revision 1.9
usr.sbin/sysinst/defs.h: revision 1.11
Add an option to install onto a pre-configured wedge.
Greatly simmplifies (U)EFI setups (but does not fully automate them yet).
In the generated /etc/fstab, do not use the (temporary, during sysinst)
path name for the file in the comment, but instead the one it will
have on the target system.
Reorder fetch options: http before ftp
Default console device and speed to that used by syinst
add missing brace.

(bouyer)

Pull up following revision(s) (requested by martin in ticket #859):
sys/arch/arm/arm/syscall.c: revision 1.65
PR kern/53261: handle SYS_syscall indirection in MD code - the generic
version would misalign the argument array.

(bouyer)

Tickets #830, #831 and #833

(martin)

Pull up following revision(s) (requested by maxv in ticket #833):

sys/kern/uipc_mbuf.c: revision 1.214

Revert my rev1.190, remove the M_READONLY check. The initial code was
correct: what is read-only is the mbuf storage, not the mbuf itself. The
storage contains the packet payload, and never has anything related to
mbufs. So it is fine to remove M_PKTHDR on mbufs that have a read-only
storage.

In fact it was kind of obvious, since several places already manually
remove M_PKTHDR without taking care of the external storage.

(martin)

Pull up following revision(s) (requested by jakllsch in ticket #831):

sys/arch/i386/stand/efiboot/eficons.c: revision 1.6

During awaitkey(), move the cursor back to the beginning of the
countdown with '\b' only after waiting.

Some UEFI implementations have a destructive/erasing backspace,
and will not show the countdown if we move the cursor back before the
wait.

My ThinkPad T430 w/ Lenovo's UEFI exhibited this whiteout-backspace,
while my Gigabyte Brix GB-BXBT-2807 did not.

Should fix PR #53292.

(martin)

Pull up following revision(s) (requested by maxv in ticket #830):

sys/netinet6/nd6_rtr.c: revision 1.142

Add missing m_put_rcvif_psref.

(martin)

Tickets #827 - #829

(martin)

Pull up following revision(s) (requested by knakahara in ticket #829):

sys/net/if_l2tp.c: revision 1.24
sys/net/if_ipsec.c: revision 1.13
sys/net/if_gif.h: revision 1.31
sys/netipsec/ipsecif.c: revision 1.8
sys/net/if_gif.c: revision 1.140
sys/netinet6/in6_l2tp.c: revision 1.15
sys/net/if_ipsec.h: revision 1.3
sys/netinet6/in6_gif.c: revision 1.92
sys/net/if_l2tp.h: revision 1.5
sys/netinet/in_l2tp.c: revision 1.13
sys/netinet/in_gif.c: revision 1.93

Fix LOCKDEBUG kernel panic when many(about 200) tunnel interfaces is created.

The tunnel interfaces are gif(4), l2tp(4), and ipsecif(4). They use mutex
itself in percpu area. When percpu_cpu_enlarge() run, the address of the
mutex in percpu area becomes different from the address which lockdebug
saved. That can cause "already initialized" false detection.

(martin)

Pull up following revision(s) (requested by knakahara in ticket #828):

sys/net/if_ipsec.c: revision 1.12

Fix "how" argument of MGET(). Pointed out by maxv@n.o, thanks.
MGET() does not have M_ZERO flag, so add memset when it is required.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #827):

sys/dev/pci/if_wm.c: revision 1.577

rxipsum and rxtusum are not interrupt counter, so use EVCNT_TYPE_MISC
instead of EVCNT_TYPE_INTR.

(martin)

Tickets #824 - #826

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #826):

sys/net/if_bridge.c: revision 1.155
sys/net/if.c: revision 1.421
sys/net/bpf.c: revision 1.224
sys/net/if.c: revision 1.422
sys/net/if.c: revision 1.423

Use if_is_mpsafe (NFC)

Protect packet input routines with KERNEL_LOCK and splsoftnet
if_input, i.e, ether_input and friends, now runs in softint without any
protections.  It's ok for ether_input itself because it's already MP-safe,
however, subsequent routines called from it such as carp_input and agr_input
aren't safe because they're not MP-safe.  Protect if_input with KERNEL_LOCK.
if_input can be called from a normal LWP context.  In that case we need to
prevent interrupts (softint) from running by splsoftnet to protect
non-MP-safe
codes (e.g., carp_input and agr_input).

Pointed out by mlelstv@

Protect if_deferred_start_softint with KERNEL_LOCK if the interface isn't
MP-safe

(martin)

Pull up following revision(s) (requested by nat in ticket #825):

share/man/man7/Makefile: revision 1.32
share/man/man9/audio.9: revision 1.46
sys/dev/audio.c: revision 1.453
sys/dev/audio.c: revision 1.454
sys/dev/audio.c: revision 1.455
share/man/man7/audio.7: revision 1.1
share/man/man7/audio.7: revision 1.2
share/man/man7/intro.7: revision 1.24
share/man/man4/audio.4: revision 1.85
distrib/sets/lists/man/mi: revision 1.1586

Fix numbering of vchan mixer controls to correspond to the vchan number in
use.

This makes the numbering of vchans consistient for audioctl and mixerctl.
Expose the audio_info structure of vchan zero(0) the mix ring to allow
setting the hardware gain and balance via audioctl(1) using the -p 0
switch.

It is not possible to influence the hardware gain/blance from the
audio_info structure of vchans 1 onwards.  It is now possible to return
the audio mixers audio format from the audio_info structure of vchan 0 to
ease applications configuring for mmapped play back.

This is conformant to the audio specification posted on tech-kern see:

        "NetBSD Audio Specification 2018"

or audio.7 manual page to be added in a follow up commit.
Add the audio mixer specification to section 7 of the manual.
See posting on tech-kern - "NetBSD Audio Specification 2018."
Update the introduction page to section 7 of the manual noting the audio
spec.

Various improvements, more markup, typo fixes.

Fix over cautious compiler error - setmode may not be initialized.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #824):

sys/dev/pci/ixgbe/ixv.c: revision 1.97

Fix panic or hangup when "sysctl -w hw.ixgN.debug=1".
XXX pullup-8

(martin)

Tickets #805, #822 and #823.

(martin)

Pull up following revision(s) (requested by maxv in ticket #823):

sys/net/npf/npf_inet.c: revision 1.45-1.47
sys/net/npf/npf_alg_icmp.c: revision 1.27-1.30
sys/net/npf/npf_sendpkt.c: revision 1.19

Fix use-after-free.

The nbuf can be reallocated as a result of caching 'enpc', so it is
necessary to recache 'npc', otherwise it contains pointers to the freed
mbuf - pointers which are then used in the ruleset machinery.

We recache 'npc' when we are sure we won't use 'enpc' anymore, because
'enpc' can be clobbered as a result of caching 'npc' (in other words,
only one of the two can be cached at the same time).
Also, we recache 'npc' unconditionally, because there is no way to know
whether the nbuf got clobbered relatively to it. We can't use the
NBUF_DATAREF_RESET flag, because it is stored in the nbuf and not in the
cache.

Discussed with rmind@.

Change npf_cache_all so that it ensures the potential ICMP Query Id is in
the nbuf. In such a way that we don't need to ensure that later.
Change npfa_icmp4_inspect and npfa_icmp6_inspect so that they touch neither
the nbuf nor npc. Adapt their callers accordingly.

In the end, if a packet has a Query Id, we set NPC_ICMP_ID in npc and leave
right away, without recaching npc (not needed since we didn't touch the
nbuf).

This fixes the handling of Query Id packets (that I broke in my previous
commit), and also fixes another possible use-after-free.

Retrieve the complete IPv4 header right away, and make sure we did retrieve
the IPv6 option header we were iterating on.

Ah, fix compilation. I tested my previous change by loading the kernel
module from the filesystem, but the Makefile didn't have DIAGNOSTIC
enabled, and the two KASSERTs I added did not compile properly.

If we fail to advance inside TCP/UDP/ICMPv4/ICMPv6, stop pretending L4
is unknown, and error out right away.

This prevents bugs in machinery, if a place looks for L4 in 'npc_proto'
without checking the cache too. I've seen a ~similar problem already.

In addition to checking L4 in the cache, here we also need to check the
protocol. The NPF entry point does not ensure that
        ICMPv6 can be set only in IPv6
        ICMPv4 can be set only in IPv4
So we could have ICMPv6 in IPv4.

apply some INET6 so this compiles in INET6-less kernels again.

(martin)

Pull up following revision(s) (requested by maya in ticket #822):

lib/libc/string/stresep.c: revision 1.4
tests/lib/libc/string/t_stresep.c: revision 1.4

PR/52499: Justin: stresep uses memmove with of-by-one length
Add test from PR/52499

(martin)

Pull up following revision(s) (requested by gson in ticket #805):

sys/kern/kern_lwp.c: revision 1.192

PR/kern/53202: Kernel hangs running t_ptrace_wait:resume1 test, revert
previous.

(martin)

Tickets #818 - #821

(martin)

Pull up following revision(s) (requested by roy in ticket #821):

sys/netinet6/in6_proto.c: revision 1.125
sys/net/raw_cb.h: revision 1.29
sys/kern/uipc_usrreq.c: revision 1.186

Increase the default size of some receive buffers from 8k to 16k.

This mitigates recent reports of socket overflow errors
and fixes PR bin/53247.

(martin)

Pull up following revision(s) (requested by mrg in ticket #820):

usr.bin/midiplay/midiplay.1: revision 1.20
usr.bin/midiplay/midiplay.1: revision 1.21
usr.bin/midiplay/midiplay.c: revision 1.31
usr.bin/midiplay/midiplay.c: revision 1.32

if just parsing don't try to read the uninitialised device name,
or display the unit number.

add a "-s" option that sends an ALL_SOUNDS_OFF midi event.  very
useful after an interrupted midiplay leaves notes on.

Merge options without arguments in synopsis.

Sync usage with manpage.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #819):

share/man/man4/ixg.4: revision 1.11
share/man/man4/ixg.4: revision 1.12
share/man/man4/Makefile: revision 1.652
share/man/man4/ixv.4: revision 1.1
share/man/man4/ixv.4: revision 1.2
distrib/sets/lists/man/mi: revision 1.1585

Add a maunal page for ixv(4).
Add missing .Nd.
Fix xref.
Use Nx. Fix typo. Capitalize Gigabit and Ethernet.
Add ixv.4.

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #818):

sys/compat/linux/common/linux_socket.c: revision 1.142
sys/compat/linux32/common/linux32_socket.c: revision 1.29

Fix pserialize enter/exit pairs in linux_getifconf and linux32_getifconf

Tested by using a small linux program that uses ioctl(SIOCGIFCONF).
Probably fix PR kern/53259 as well.

(martin)

Tickets #814 - #817

(martin)

Pull up following revision(s) (requested by maxv in ticket #817):

sys/net/npf/npf_inet.c: revision 1.38-1.44
sys/net/npf/npf_handler.c: revision 1.38-1.39
sys/net/npf/npf_alg_icmp.c: revision 1.26
sys/net/npf/npf.h: revision 1.56
sys/net/npf/npf_sendpkt.c: revision 1.17-1.18

Declare NPC_FMTERR, and use it to kick malformed packets. Several sanity
checks are added in IPv6; after we see the first IPPROTO_FRAGMENT header,
we are allowed to fail to advance, otherwise we kick the packet.
Sent on tech-net@ a few days ago, no response, but I'm committing it now
anyway.

Switch nptr to uint8_t, and use nbuf_ensure_contig. Makes us use fewer
magic values.

Remove dead branches, 'npc' can't be NULL (and it is dereferenced
earlier).

Fix two consecutive mistakes.

The first mistake was npf_inet.c rev1.37:
        "Don't reassemble ipv6 fragments, instead treat the first fragment
        as a regular packet (subject to filtering rules), and pass
        subsequent fragments in the same group unconditionally."

Doing this was entirely wrong, because then a packet just had to push
the L4 payload in a secondary fragment, and NPF wouldn't apply rules on
it - meaning any IPv6 packet could bypass >=L4 filtering. This mistake
was supposed to be a fix for the second mistake.

The second mistake was that ip6_reass_packet (in npf_reassembly) was
getting called with npc->npc_hlen. But npc_hlen pointed to the last
encountered header in the IPv6 chain, which was not necessarily the
fragment header. So ip6_reass_packet was given garbage, and would fail,
resulting in the packet getting kicked. So basically IPv6 was broken by
NPF.

The first mistake is reverted, and the second one is fixed by doing:
-                      hlen = sizeof(struct ip6_frag);
+                      hlen = 0;

Now the iteration stops on the fragment header, and the call to
ip6_reass_packet is valid.

My npf_inet.c rev1.38 is partially reverted: we don't need to worry
about failing properly to advance; once the packet is reassembled
npf_cache_ip gets called again, and this time the whole chain should be
there.

Tested with a simple UDPv6 server - send a 3000-byte-sized buffer, the
packet gets correctly reassembled by NPF now.

Mmh, put back the RFC6946 check (about dummy fragments), otherwise NPF
is not happy in npf_reassembly, because NPC_IPFRAG is again returned after
the packet was reassembled.

I'm wondering whether it would not be better to just remove the fragment
header in frag6_input directly.

Fix the "return-rst" rule on IPv6 packets.
The scopes needed to be set on the addresses before invoking ip6_output,
because ip6_output needs them. The reason they are not here already is
because pfil_run_hooks (in ip6_input) is called _before_ the kernel
initializes the scopes.

Until now ip6_output was always failing, and the IPv6-TCP-RST packet was
never actually sent.

Perhaps it would be better to have the kernel initialize the scopes
before invoking pfil_run_hooks, but several things will need to be fixed
in several places.

Tested with a simple TCPv6 server. Until now the client would block
waiting for an answer that never came; now it receives an RST right away
and closes the connection, as expected.
I believe that the same problem exists in the "return-icmp" rules, but I
can't investigate this right now (some problems with wireshark).

Fix the IPv6 payload computation in npf_tcpsaw. It was incorrect, and this
caused the "return-rst" rules to send back an RST with the wrong ACK when
the received SYN had an IPv6 option.

Set the scopes before calling icmp6_error(). This fixes a bug similar to
the one I fixed in rev1.17: since the scopes were not set the packet was
never actually sent.

Tested with wireshark, now the ICMPv6 reply is correctly sent, as
expected.

Don't read the L4 payload after IPPROTO_AH when handling IPv6 packets.
AH must be considered as the payload, otherwise a

        block all
        pass in proto ah from any
        pass out proto ah from any

configuration will actually block everything, because NPF checks the
protocol against the one found after AH, and not AH itself.

In addition it may have been a problem for stateful connections; an AH
packet sent by an attacker with an incorrect authentication and a correct
TCP/UDP/whatever payload from an active connection could manage to change
NPF's FSM state, which would perhaps have altered the legitimate
connection with the authenticated remote IPsec host.

Note that IPv4 already doesn't go beyond AH, which is the correct
behavior.

Add XXX (we don't handle IPv6 Jumbograms), and whitespace.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #816):

sys/dev/pci/if_wm.c: revision 1.578

  Fix a bug that TX might stall because WM_TXQ_NO_SPACE is not cleared in
if_init() (though I've never seen this problem). Clear txq->txq_flags in
wm_init_tx_queue(). OK'd by knakahara.

(martin)

Pull up following revision(s) (requested by pgoyette in ticket #815):

sys/dev/ic/hme.c: revision 1.97

Fix mis-placed right paren.  kern/53271

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #814):

sys/dev/pci/if_bnxvar.h: revision 1.7
sys/dev/pci/if_bnx.c: revision 1.64

- Fix a bug that bnx(4) panics on shutdown. Stop callout before restroy.
  Reported by Andreas Gustafsson in PR#53265.
- Make sure not to re-arm the callout when we are about to detach. Same as
  if_bge.c rev. 1.292.
- Use pci_intr_establish_xname().

(martin)

Ticket #782

(martin)

Pull up following revision(s) (requested by nonaka in ticket #782):

sys/dev/usb/if_axe.c: revision 1.85-1.89

propagate pullup-782 for NetBSD-8 to HEAD (gcc uninitialized)

It was not gcc's fault for correctly detecting an uninitialized variable.

Fix the uninitialized variable issues by error checking things.
downgrade error to debug.

merge duplicated code, back to logging error.

use the proper station nodeid read command.

(martin)

793, 794, 797, 798, 801

(snj)

Pull up following revision(s) (requested by kre in ticket #801):
usr.sbin/sysinst/partman.c: 1.20-1.21
PR install/53220
Don't call pm_lvm_find() unless have_lvm
pm_lvm_find() assumes that data structs (lvms) has been allocated
for it to use, which doesn't happen if !have_lvm
This avoids a sysinst core dump when the lvm command is not installed
(such as when installing from the embedded RAM root filesys in an
INSTALL kernel.)
--
Change return type of pm_lvm_find() from int to void.
It always returns (returned) 0 which was ignored by the one call.

(snj)

Pull up following revision(s) (requested by martin in ticket #798):
usr.sbin/sysinst/disks.c: 1.14
Simplify and get rid of external "grep" dependency which is not available
on all install meadia.
Sugested by kre.

(snj)

Pull up following revision(s) (requested by martin in ticket #797):
sbin/gpt/gpt.8: 1.60-1.63
sbin/gpt/header.c: 1.9
Make the "gpt header" command return EXIT_FAILURE when no GPT is present.
This helps sysinst to tell a GPT labeled disk from others.
Very lazy version of a change proposed by kre.
--
Sort sections.
--
Bump date for new EXIT STATUS section.
--
Spello.  (it is "existence").
ispell also says that we should s/parseable/parsable/ but I'm
not sure about that one, so I left it.
I also left a correct spelling that no-one has bothered to mangle!

(snj)

Pull up following revision(s) (requested by martin in ticket #794):
usr.sbin/sysinst/partman.c: 1.18
fixes for GCC 6.4:
sysinst's pm_cgd_check() has missing {} issue.

(snj)

Pull up following revision(s) (requested by martin in ticket #793):
usr.sbin/sysinst/partman.c: 1.16-1.17
Fix copy paste error. from coverity.
Cosmetics: fix the order of calloc() arguments.

(snj)

Ticket #813

(martin)

Pull up following revision(s) (requested by spz in ticket #813):

sys/net/if_vlan.c: revision 1.122

If cnt == 0, don't kmem_alloc(0). Found by Mootja.

Looking at the code, I also find it suspicious that we read
ifv->ifv_mib->ifvm_p directly without making sure ifv_mib != NULL.

(martin)

Pull up following revision(s) (requested by spz in ticket #800):

crypto/external/bsd/heimdal/dist/kdc/connect.c: revision 1.3

avoid busy-waiting on a dead child

(martin)

Tickets #802 - #804, #807, #809, #810

(martin)

Pull up following revision(s) (requested by sevan in ticket #810):

crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3: revision 1.5
crypto/external/bsd/netpgp/dist/src/libbn/libnetpgpbn.3: revision 1.6
crypto/external/bsd/netpgp/dist/src/libmj/libmj.3: revision 1.8
crypto/external/bsd/netpgp/dist/src/libmj/libmj.3: revision 1.9
crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3: revision 1.20
crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3: revision 1.21
crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3: revision 1.22
crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1: revision 1.12
crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3: revision 1.23
crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1: revision 1.13
crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3: revision 1.19

Some further changes from PR bin/48395.

Drop superfluous zero prefix for single digit number days.
heads up by wiz

Break down explanation of netpgp_init to make it easier to extend.

Document how the userid is obtained.

Remove trailing whitespace.

Add the following functions to the list (TODO - add descriptions)
netpgp_unsetvar
netpgp_list_keys_json
netpgp_match_keys
netpgp_match_keys_json
netpgp_match_pubkeys
netpgp_validate_sigs
netpgp_format_json

Remove netpgp_match_list_keys() as function does not exist

Add missing output file to netpgp_verify_file() argument list

Sprinkle const to arguments

(martin)

Catch up to current for the following, requested by kre in ticket #809:

external/public-domain/tz/dist/Makefile        up to 1.1.1.21
external/public-domain/tz/dist/NEWS            up to 1.1.1.22
external/public-domain/tz/dist/TZDATA_VERSION  up to 1.12
external/public-domain/tz/dist/africa          up to 1.1.1.15
external/public-domain/tz/dist/asia            up to 1.1.1.20
external/public-domain/tz/dist/australasia      up to 1.1.1.15
external/public-domain/tz/dist/europe          up to 1.1.1.21
external/public-domain/tz/dist/theory.html      up to 1.1.1.4
external/public-domain/tz/dist/version          up to 1.1.1.9
external/public-domain/tz/dist/ziguard.awk      up to 1.1.1.2
doc/3RDPARTY 1.1520 (patch)

tzdata updated to 2018e.

(martin)

Pull up following revision(s) (requested by pgoyette in ticket #807):

sys/compat/common/compat_mod.c: revision 1.29

Clean up a stray #ifdef _MODULE - it prevented definition of
COMPAT_SIGCONTEXT which in turn prevented building of the
SYS_compat16_sigaction_14 code.

Should address PR kern/53260

XXX Pull-up to netbsd-8

(martin)

Pull up following revision(s) (requested by kre in ticket #804):

bin/sh/parser.c: revision 1.146

PR bin/53201

Don't synerr on
${var-anything
more}

The newline in the middle of the var expansion is permitted.

Bug reported by Martijn Dekker from his modernish tests.
XXX pullup-8

(martin)

Pull up the following, requested by nakayama in ticket #803:

sys/conf/copyright 1.16

Update for 2018 new year

(martin)

Pull up following revision(s) (requested by maxv in ticket #802):

sys/kern/uipc_mbuf.c: revision 1.211 (via patch)

Modify m_defrag, so that it never frees the first mbuf of the chain. While
here use the given 'flags' argument, and not M_DONTWAIT.

We have a problem with several drivers: they poll an mbuf chain from their
queues and call m_defrag on them, but m_defrag could update the mbuf
pointer, so the mbuf in the queue is no longer valid. It is not easy to
fix each driver, because doing pop+push will reorder the queue, and we
don't really want that to happen.

This problem was independently spotted by me, Kengo, Masanobu, and other
people too it seems (perhaps PR/53218).
Now m_defrag leaves the first mbuf in place, and compresses the chain
only starting from the second mbuf in the chain.

It is important not to compress the first mbuf with hacks, because the
storage of this first mbuf may be shared with other mbufs.

(martin)

Tickets #786 - #792, #795, #796, #799, #800

(martin)

Pull up following revision(s) (requested by maxv in ticket #799):

sys/netipsec/ipsec_output.c: revision 1.75
sys/netipsec/ipsec_output.c: revision 1.67

Strengthen this check, to make sure there is room for an ip6_ext structure.
Seems possible to crash m_copydata here (but I didn't test more than that).

Fix the checks in compute_ipsec_pos, otherwise m_copydata could crash. I
already fixed half of the problem two months ago in rev1.67, back then I
thought it was not triggerable because each packet we emit is guaranteed
to have correctly formed IPv6 options; but it is actually triggerable via
IPv6 forwarding, we emit a packet we just received, and we don't sanitize
its options before invoking IPsec.

Since it would be wrong to just stop the iteration and continue the IPsec
processing, allow compute_ipsec_pos to fail, and when it does, drop the
packet entirely.

(martin)