Ticket #1529

(martin)

Pull up following revision(s) (requested by maxv in ticket #1529):
sys/netipsec/xform_ipip.c: revision 1.44 via patch

PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

(martin)

Ticket #1529

(martin)

Pull up following revision(s) (requested by maxv in ticket #1529):
sys/netipsec/xform_ipip.c: revision 1.44 via patch

PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

(martin)

Ticket #1529

(martin)

Pull up following revision(s) (requested by maxv in ticket #1529):
sys/netipsec/xform_ipip.c: revision 1.44 via patch

PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

(martin)

Ticket #1567

(martin)

Pull up following revision(s) (requested by maxv in ticket #1567):
sys/netipsec/xform_ipip.c: revision 1.44
PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

(martin)

Ticket #1567

(martin)

Pull up following revision(s) (requested by maxv in ticket #1567):
sys/netipsec/xform_ipip.c: revision 1.44
PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

(martin)

Ticket #1567

(martin)

Pull up following revision(s) (requested by maxv in ticket #1567):
sys/netipsec/xform_ipip.c: revision 1.44
PR/52161: Ryota Ozaki: Fix AH tunnel ipsec for ipv6. Compute plen right,
don't forget to subtract the ipv6 header length.

(martin)

Ticket #551

(martin)

Pull up following revision(s) (requested by maxv in ticket #551):
sys/netipsec/xform_ipip.c: revision 1.56-1.63

Fix use-after-free. There is a path where the mbuf gets pulled up without
a proper mtod afterwards:

218    ipo = mtod(m, struct ip *);
281    m = m_pullup(m, hlen);
232    ipo->ip_src.s_addr

Found by Mootja.

Meanwhile it seems to me that 'ipo' should be set to NULL if the inner
packet is IPv6, but I'll revisit that later.
As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

Style and remove dead code.

dedup

Fix the IPIP_STAT_IBYTES stats; we did m_adj(m, iphlen) which substracted
iphlen, so no need to re-substract it again.

Remove broken MROUTING code, rename ipo->ip4, and simplify.

(martin)

Style and simplify.

(maxv)

Style a bit, and if we don't know the pad-filling policy use
SADB_X_EXT_PZERO by default.

There doesn't seem to be a sanity check in the keysock API to make sure
this place is never reached, and it's better to fill in with zeros than
not filling in at all (and leaking uninitialized mbuf data).

(maxv)

Remove broken MROUTING code, rename ipo->ip4, and simplify.

(maxv)

Fix the IPIP_STAT_IBYTES stats; we did m_adj(m, iphlen) which substracted
iphlen, so no need to re-substract it again.

(maxv)

dedup again

(maxv)

dedup

(maxv)

Style and remove dead code.

(maxv)

Fix buffer overflow on sending an IPv6 packet with large options

If an IPv6 packet has large options, a necessary space for evacuation can
exceed the expected size (ah_pool_item_size). Give up using the pool_cache
if it happens.

Pointed out by maxv@

(ozaki-r)

Commonalize error paths (NFC)

(ozaki-r)

style

(maxv)

Ticket #550

(martin)

Pull up following revision(s) (requested by hannken in ticket #550):
sbin/fsck_ffs/pass1.c: revision 1.58
Treat an inode with "mode == 0" and "blocks != 0" as partially allocated
and clear it as ffs_newvnode() tests for "blocks == 0".

(martin)

Ticket #1530

(martin)

Pull up following revision(s) (requested by maxv in ticket #1530):
sys/netipsec/xform_ah.c: revision 1.80-1.81 via patch

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(martin)

Ticket #1530

(martin)

Pull up following revision(s) (requested by maxv in ticket #1530):
sys/netipsec/xform_ah.c: revision 1.80-1.81 via patch

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(martin)

Ticket #1530

(martin)

Pull up following revision(s) (requested by maxv in ticket #1530):
sys/netipsec/xform_ah.c: revision 1.80-1.81 via patch

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(martin)

Ticket #1568

(martin)

Pull up following revision(s) (requested by maxv in ticket #1568):
sys/netipsec/xform_ah.c: revision 1.80-1.81 via patch

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(martin)

Ticket #1568

(martin)

Pull up following revision(s) (requested by maxv in ticket #1568):
sys/netipsec/xform_ah.c: revision 1.80-1.81 via patch

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(martin)

Ticket #1568

(martin)

Pull up following revision(s) (requested by maxv in ticket #1568):
sys/netipsec/xform_ah.c: revision 1.80-1.81 via patch

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(martin)

Tickets #548 and #549

(martin)

Pull up following revision(s) (requested by maxv in ticket #549):
sys/netipsec/xform_ah.c: revision 1.80-1.81 via patch

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(martin)

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

sys/dev/i2c/files.i2c: revision 1.84 (via patch)

Delete 'define dbcool {}' line commented out in previous.  It's bogus
and the gcc6 correctly complains about that when it compiles ioconf.c
PR toolchain/53023

(martin)

Make sure the Authentication Header fits the mbuf chain, otherwise panic.

(maxv)

Fix use-after-free, 'ah' may not be valid after m_makewritable and
ah_massage_headers.

(maxv)

Fix kernel panic (assertion failure) on receiving an IPv6 packet with large options

If an IPv6 packet has large options, a necessary space for evacuation can
exceed the expected size (ah_pool_item_size). Give up using the pool_cache
if it happens.

Pointed out by maxv@

(ozaki-r)

Don't relook up an SP/SA in opencrpyto callbacks

We don't need to do so because we have a reference to it. And also
relooking-up one there may return an sp/sav that has different
parameters from an original one.

(ozaki-r)

Adjust Allwinner emac(4) drivers to be compatible with root on NFS.

(jakllsch)

Adjust comment; sun4i_emac is also used on sun5i.

(jakllsch)

Remove dead code.

From David Binderman in PR kern/53029

(maya)

Revert functional changes in previous, at expense of strict KNF conformance.

(jakllsch)

join lines where they fit.

(christos)

Don't invoke UB.

Heads up by John D. Baker.

(maya)

Style, and remove unused prototypes and functions.

(maxv)

Remove m_checkalignment(), unused. This eliminates a reference to
m_getptr().

(maxv)

Remove IFF_STATICARP, we don't support this, and the code is useless in its
current form.

ok ozaki-r@

(maxv)

Cosmetic - consistently use #define<SPACE>

(uwe)

Fix a bug that RX and TX may stall on heavy load on wm(4) like ixgbe.c:r1.121.

wm_rxeof() and wm_txeof() have loop limit and the function returns true
if a packet still exists.

XXX need pullup-8

(knakahara)

Fix broken dig and host commands

OpenSSL 1.1 does not have GOST support, so restrict GOST support to 1.0.

(ryoon)

Fix a bug that RX may stall on heavy load on ixg(4). ixgbe_rxeof() has loop
limit and the function returns true if a packet are still in the RX ring.
ixgbe_handle_que() didn't check the return value. Check the return vaule
and issue a softint.

This bug is derived from FreeBSD and ixv(4) has no this bug.

XXX pullup-8

(msaitoh)

Sort some lists. Use EXIT STATUS instead of RETURN VALUES.

(wiz)

Dedup common codes in error paths (NFCI)

(ozaki-r)

Fix mbuf leaks on error paths

Pointed out by maxv@

(ozaki-r)

Use .Cm instead of .Li, same as arp.8.

(maxv)

Re-make ip6_nexthdr global, it will be used in soon-to-be-added code...

(maxv)

Revert my two last changes in this file. They are apparently causing
problems with racoon, I'll investigate this later.

(maxv)

Use cpu_softintr_p

(ozaki-r)

need -lrt for shm_{open,close}

(christos)

depend on librt for shm_{open,close}

(christos)

Asan needs bits and pieces of ubsan now; go figure.

(christos)

our __csa_atexit does not like NULL dso; use atexit(3) instead.

(christos)

enable addr2line

(christos)

- enable netbsd
- add cast to (uptr) for _Unwind_GetIP

(christos)

Provide SHAR384 flavors: The OpenSSL SHA512_Final implementation is re-used
to implement SHA384_Final, but does the right thing by checking the internally
kept digest size. The NetBSD libc implementation provides two entry points
that write a different size digest, so if we use the SHA512_Final from here
we end up overwriting memory.

(christos)

Provide the means to use the libc sha2 internally instead of the openssl
implementation; this does not really matter since their structs are larger
than ours, but it helps when we want to verify that we are not using any
of the openssl code.

(christos)

Add a (void *) cast to make things compile with our own sha2 header

(christos)

Avoid unused variable warning

(sjg)

add missing test files added in the vendor branch.

(christos)

Make the arpresolve branch more readable, fix typo, fix XXX (which I
added), add missing pserialize_read_exit (which I forgot).

(maxv)

Mmh. Add a missing check: if ARP was disabled on the interface, don't
process ARP packets. Otherwise the kernel will add ARP entries even if

ifconfig wm0 -arp

was entered.

(maxv)

Delete 'define dbcool {}' line commented out in previous.  It's bogus
and the gcc6 correctly complains about that when it compiles ioconf.c

PR toolchain/53023

(uwe)

Treat an inode with "mode == 0" and "blocks != 0" as partially allocated
and clear it as ffs_newvnode() tests for "blocks == 0".

(hannken)

Remove KERNEL_LOCK around the MPLS code. It's not needed, since we're only
touching the tag of the mbuf - the tag belongs only to the mbuf, and the
mbuf is not shared.

ok knakahara@

(maxv)

Be tougher:

* In arpintr(), don't allow IEEE1394 packets on non-IEEE1394 interfaces.

* In revarpinput(), kick IEEE1394 packets right away. They are not
  supported.

(maxv)

Same change as rev1.258, but this time in revarpinput: use m_pullup.

(maxv)

Minor stylistic changes, and use C99 types.

(maxv)

Adapt to ar_tha() changes in if_arp.h rev1.31.

(martin)

Replace dead code by KASSERT.

(maxv)

obsolete some GCC 4.8 files.

(mrg)

Fix copy & pasto (dsa code vs. rsa code) in previous, fixes PR lib/53012
and recentish sshfs test failures.

(martin)

use -fno-delete-null-pointer-checks for kernels.

(mrg)

Put time_second and time_uptime in different cache lines, probably saves
us some false sharing.

(maxv)

Don't force ARPHRD_IEEE1394 on IEEE1394 interfaces. If it's not there, then
kick the packet. And do this earlier.

(maxv)

Define ar_* as inlined functions, not as macros. Makes it easier to
understand why ARPHRD_IEEE1394 needs to be handled with care - it doesn't
have ar_tha.

(maxv)

Use only one label, clearer.

(maxv)

Fix three things in arpintr():

* mtod can't return NULL.

* It is wrong to kick the packet if m->m_len < arplen. While this check
  always returns false for native Ethernet interfaces, it may not if the
  frame is encapsulated in EtherIP/L2TP. Use m_pullup instead.

* Remove XXX, it is fine. Reduce the indentation level afterwards.

(maxv)

Style, no functional change.

(maxv)

Disable the 'define dbcool {}' line - it's not needed, and causes
problems with config(1) and gcc6.  See PR toolchain/530223 for more
info.

(pgoyette)

Remove double declaration; 'ddb_regs' is already declared as a macro
in db_machdep.h if MULTIPROCESSOR is on, and the macro has higher
priority.

Don't declare 'ddb_regs' locally in this case, because it is misleading.
Part of PR/52964.

(maxv)

note that openssl and GCC may upset your builds.

(mrg)

Define ddb_regp only if MULTIPROCESSOR (NFC)

(ozaki-r)

Fix NULL pointer dereference via ddb_regs

ddb_regs can be *ddb_regp (see db_machdep.h) so ddb_regp should be NULL-ed
after dereference to ddb_regs.

Also dbreg should be restored to ddb_regp because ddb_regp can be changed
by db_mach_cpu during db_trap.

Fix PR 52964
Helped by nonaka@

(ozaki-r)

Unconditionally print the trap like we do for amdt64 (Dimitris Karagkasidis)

(christos)

Spelling

(sevan)

Add a new option CISS_NO_INTERRUPT_HACK for driving ciss(4) by callouts.
This is intended as workaround for certain Xen issues with dom0 kernels
and will likely want to have a high HZ value as well for decent
performance.

(joerg)

Fix __siglongjmp14().

Fixes SIGINT causing ksh to "longjmp botch", presumably due to incorrect
magic number.
cvs: ----------------------------------------------------------------------

(jakllsch)

Simplify and make the GCC check more precise at the same time.

(joerg)

Do not treat .info as warning for -W

Reported by: lwhsu at FreeBSD.org

(sjg)

Fix building with MKGCC=no

(adam)

Add CSDL

(ginsbach)

546, 547

(snj)

1551, 1552

(snj)

1551, 1552

(snj)

1548, 1551, 1552

(snj)

Pull up following revision(s) (requested by mrg in ticket #1552):
sys/arch/sparc/sparc/timer.c: 1.33-1.34
sys/arch/sparc/sparc/timer_sun4m.c: 1.31
sys/arch/sparc/sparc/timerreg.h: 1.10
fix time goes backwards problems on sparc.
there are a few things here:
- there's a race between reading the limit register (which clears
  the interrupt and the limit bit) and increasing the latest offset.
  this can happen easily if an interrupt comes between the read and
  the call to tickle_tc() that increases the offset (i obverved this
  actually happening.)
- in early boot, sometimes the counter can cycle twice before the
  tickle happens.
to handle these issues, add two workarounds:
- if the limit bit isn't set, but the counter value is less than
  the previous value, and the offset hasn't changed, use the same
  fixup as if the limit bit was set.  this handles the first case
  above.
- add a hard-workaround for never allowing returning a smaller
  value (except during 32 bit overflow): if the result is less than
  the last result, add fixups until it does (or until it would
  overflow.)
the first workaround fixes general run-time issues, and the second
fixes issues only seen during boot.
also expand some comments in timer_sun4m.c and re-enable the sun4m
sub-microsecond tmr_ustolim4m() support (but it's always called with
at least 'tick' microseconds, so the end result is the same.)
--
fix hang at 4B microseconds (1h12 or so), and simplify part of the previous

(snj)

Pull up following revision(s) (requested by mrg in ticket #1552):
sys/arch/sparc/sparc/timer.c: 1.33-1.34
sys/arch/sparc/sparc/timer_sun4m.c: 1.31
sys/arch/sparc/sparc/timerreg.h: 1.10
fix time goes backwards problems on sparc.
there are a few things here:
- there's a race between reading the limit register (which clears
  the interrupt and the limit bit) and increasing the latest offset.
  this can happen easily if an interrupt comes between the read and
  the call to tickle_tc() that increases the offset (i obverved this
  actually happening.)
- in early boot, sometimes the counter can cycle twice before the
  tickle happens.
to handle these issues, add two workarounds:
- if the limit bit isn't set, but the counter value is less than
  the previous value, and the offset hasn't changed, use the same
  fixup as if the limit bit was set.  this handles the first case
  above.
- add a hard-workaround for never allowing returning a smaller
  value (except during 32 bit overflow): if the result is less than
  the last result, add fixups until it does (or until it would
  overflow.)
the first workaround fixes general run-time issues, and the second
fixes issues only seen during boot.
also expand some comments in timer_sun4m.c and re-enable the sun4m
sub-microsecond tmr_ustolim4m() support (but it's always called with
at least 'tick' microseconds, so the end result is the same.)
--
fix hang at 4B microseconds (1h12 or so), and simplify part of the previous

(snj)

Pull up following revision(s) (requested by mrg in ticket #1552):
sys/arch/sparc/sparc/timer.c: 1.33-1.34
sys/arch/sparc/sparc/timer_sun4m.c: 1.31
sys/arch/sparc/sparc/timerreg.h: 1.10
fix time goes backwards problems on sparc.
there are a few things here:
- there's a race between reading the limit register (which clears
  the interrupt and the limit bit) and increasing the latest offset.
  this can happen easily if an interrupt comes between the read and
  the call to tickle_tc() that increases the offset (i obverved this
  actually happening.)
- in early boot, sometimes the counter can cycle twice before the
  tickle happens.
to handle these issues, add two workarounds:
- if the limit bit isn't set, but the counter value is less than
  the previous value, and the offset hasn't changed, use the same
  fixup as if the limit bit was set.  this handles the first case
  above.
- add a hard-workaround for never allowing returning a smaller
  value (except during 32 bit overflow): if the result is less than
  the last result, add fixups until it does (or until it would
  overflow.)
the first workaround fixes general run-time issues, and the second
fixes issues only seen during boot.
also expand some comments in timer_sun4m.c and re-enable the sun4m
sub-microsecond tmr_ustolim4m() support (but it's always called with
at least 'tick' microseconds, so the end result is the same.)
--
fix hang at 4B microseconds (1h12 or so), and simplify part of the previous

(snj)

Pull up following revision(s) (requested by ozaki-r in ticket #1551):
sys/netinet6/ip6_forward.c: 1.89-1.90 via patch
Fix use-after-free of mbuf by ip6flow_create
This fixes recent failures of some ATF tests such as t_ipsec_tunnel_odd.
--
Fix use-after-free of mbuf by ip6flow_create (one more)

(snj)

Pull up following revision(s) (requested by ozaki-r in ticket #1551):
sys/netinet6/ip6_forward.c: 1.89-1.90 via patch
Fix use-after-free of mbuf by ip6flow_create
This fixes recent failures of some ATF tests such as t_ipsec_tunnel_odd.
--
Fix use-after-free of mbuf by ip6flow_create (one more)

(snj)

Pull up following revision(s) (requested by ozaki-r in ticket #1551):
sys/netinet6/ip6_forward.c: 1.89-1.90 via patch
Fix use-after-free of mbuf by ip6flow_create
This fixes recent failures of some ATF tests such as t_ipsec_tunnel_odd.
--
Fix use-after-free of mbuf by ip6flow_create (one more)

(snj)

Pull up following revision(s) (requested by christos in ticket #1548):
external/bsd/blacklist/bin/blacklistd.c: 1.35
external/bsd/blacklist/bin/state.c: 1.19
restore rules after the database is open, add error message to prevent
silent failure in the future. (Kurt Lidl)

(snj)

Pull up following revision(s) (requested by maxv in ticket #547):
sys/netinet/ip_input.c: 1.366
Disable ip_allowsrcrt and ip_forwsrcrt. Enabling them by default was a
completely dumb idea, because they have security implications.
By sending an IPv4 packet containing an LSRR option, an attacker will
cause the system to forward the packet to another IPv4 address - and
this way he white-washes the source of the packet.
It is also possible for an attacker to reach hidden networks: if a server
has a public address, and a private one on an internal network (network
which has several internal machines connected), the attacker can send a
packet with:
        source = 0.0.0.0
        destination = public address of the server
        LSRR first address = address of a machine on the internal network
And the packet will be forwarded, by the server, to the internal machine,
in some cases even with the internal IP address of the server as a source.

(snj)

Keep a pointer to the interface of the multicast membership, because the
multicast element itself might go away in in_delmulti (but the interface
can't because we hold the lock). From ozaki-r@

(christos)

Pull up following revision(s) (requested by maxv in ticket #546):
sys/net/if_mpls.c: 1.31-1.33
sys/netmpls/mpls_ttl.c: 1.9-1.11
Style, and fix several bugs:
- ip4_check(), mpls_unlabel_inet() and mpls_unlabel_inet6() perform
  pullups, so we need to pass the updated pointers back
- in mpls_lse() the route is not always freed
Looks a little better now.
--
Kick MPLS packets earlier.
--
Several changes:
* Declare TRIM_LABEL as a function.
* In mpls_unlabel_inet, copy the label locally. It's not incorrect to
  keep a pointer on the mbuf, but it's bug-friendly.
* In mpls_label_inetX, fix the length check. Meanwhile add an XXX: we
  just want to make sure that m_copydata won't fail, but if we were
  guaranteed that m has M_PKTHDR set, we could simply check the length
  against m->m_pkthdr.len.
--
Style in MPLS.
--
Add XXX.

(snj)

Another missing NULL-check.

(maxv)

m_free -> m_freem, otherwise leak

(maxv)

NULL-check after M_DONTWAIT.

(maxv)

Add a KASSERT; we expect *from to be a single mbuf (not chained).

(maxv)

Use m_freem instead of m_free. Otherwise we're leaking the next mbufs in
the chain.

(maxv)

Replace bcopy -> memcpy when it is obvious that the areas don't overlap.
Rearrange ip6_splithdr() for clarity.

(maxv)

Fix typo, and add a comment about MPLS.

(maxv)

Complete previous by complteley removing the _DIAGASSERT from memmove -
the accidental left over from previous fired on all legitimate calls
and caused PR bin/52986 and PR lib/52987.

(martin)

note GCC 6.4 import.

(mrg)

Don't rebase the pointers. 'm' is only allowed to become NULL (which
means 'processed').

(maxv)

Remove unused argument from tcp_signature_getsav.

(maxv)

Add a KASSERT.

(maxv)

Remove the 'm' argument from syn_cache_respond(); all it does with it is
freeing it, so free in the caller instead.

(maxv)

Remove this multicast check. Multicast packets are already dropped at
the beginning of the function.

(maxv)

545

(snj)

Pull up following revision(s) (requested by christos in ticket #545):
sbin/gpt/backup.c: 1.17-1.18
sbin/gpt/biosboot.c: 1.29-1.30
sbin/gpt/gpt.c: 1.71-1.73
sbin/gpt/gpt.h: 1.36
sbin/gpt/restore.c: 1.17
sbin/gpt/show.c: 1.40-1.41
sys/dev/dkwedge/dkwedge_gpt.c: 1.19-1.20
PR/52522: Piotr Meyer: Don't NUL terminate the gpt label name.
--
- make sure that the utf16 string is padded with 0's where needed.
- since the utf16 string is not 0 terminated, pass the size of the string.
--
use __arraycount
--
PR/52522: ent_name is not necessarily 0 terminated, so check bounds.
--
use arraycount.

(snj)

we need variables to be signed here.

(christos)

543, 544

(snj)

Pull up following revision(s) (requested by christos in ticket #544):
sys/rump/dev/lib/libucom/UCOM.ioconf: 1.6
should be umodeswitch!

(snj)

Pull up following revision(s) (requested by christos in ticket #543):
external/gpl2/xcvs/dist/src/rsh-client.c: 1.3
Fix for CVE-2017-12836; (cvs command injection) from MirBSD.

(snj)

tickets 536, 537, 539, 541, 542

(snj)

Pull up following revision(s) (requested by christos in ticket #542):
usr.sbin/ypserv/ypserv/ypserv_proc.c: 1.18
PR/47615: Dr. W. Stukenbrock: Always zero out the result structs in the
svc procs to avoid returning stale request data to the client.

(snj)

Pull up following revision(s) (requested by maya in ticket #541):
sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_nve0.c: 1.3
PR/53006: stackfield: Please support NVIDIA GT730 to kernel

(snj)

Pull up following revision(s) (requested by ozaki-r in ticket #539):
sys/netinet/in.c: 1.217
Don't call lltable_purge_entries from in_if_down if ARP isn't enabled
Reported by bouyer@

(snj)

Pull up following revision(s) (requested by bouyer in ticket #537):
sys/dev/sdmmc/sdmmc_mem.c: revision 1.64
Fix uninitialized variable use:
if there is an error, or if we are using a SPI controller,
sdmmc_mem_send_op_cond() doens't assign a value to *ocrp,
but it is used unconditionally in sdmmc_mem_enable() to see if we can switch
to low voltage.
In sdmmc_mem_send_op_cond(), if the new ocr is not returned by the
card for whatever reason, set *ocrp to the orig value.

(snj)

Pull up following revision(s) (requested by ozaki-r in ticket #536):
distrib/sets/lists/base/shl.mi: 1.825
distrib/sets/lists/comp/mi: 1.2168-1.2169
distrib/sets/lists/comp/shl.mi: 1.310
distrib/sets/lists/debug/mi: 1.234
distrib/sets/lists/debug/shl.mi: 1.188
distrib/sets/lists/man/mi: 1.1570
distrib/sets/lists/tests/mi: 1.772
etc/mtree/NetBSD.dist.tests: 1.150
share/man/man4/Makefile: 1.650
share/man/man4/ipsec.4: 1.42-1.43
share/man/man4/ipsecif.4: 1.1-1.5
sys/arch/amd64/conf/ALL: 1.77
sys/arch/amd64/conf/GENERIC: 1.480
sys/conf/files: 1.1191
sys/net/Makefile: 1.34
sys/net/files.net: 1.14
sys/net/if.c: 1.404
sys/net/if.h: 1.248
sys/net/if_gif.c: 1.135
sys/net/if_ipsec.c: 1.1-1.3
sys/net/if_ipsec.h: 1.1
sys/net/if_l2tp.c: 1.16
sys/net/if_types.h: 1.28
sys/netinet/in.c: 1.214
sys/netinet/in.h: 1.103
sys/netinet/in_gif.c: 1.92
sys/netinet/ip_var.h: 1.122
sys/netinet6/in6.c: 1.257
sys/netinet6/in6.h: 1.88
sys/netinet6/in6_gif.c: 1.90
sys/netinet6/ip6_var.h: 1.75
sys/netipsec/Makefile: 1.6
sys/netipsec/files.netipsec: 1.13
sys/netipsec/ipsec.h: 1.62
sys/netipsec/ipsecif.c: 1.1
sys/netipsec/ipsecif.h: 1.1
sys/netipsec/key.c: 1.246-1.247
sys/netipsec/key.h: 1.34
sys/rump/net/Makefile.rumpnetcomp: 1.20
sys/rump/net/lib/libipsec/IPSEC.ioconf: 1.1
sys/rump/net/lib/libipsec/Makefile: 1.1
sys/rump/net/lib/libipsec/ipsec_component.c: 1.1
tests/net/Makefile: 1.34
tests/net/if_ipsec/Makefile: 1.1
tests/net/if_ipsec/t_ipsec.sh: 1.1-1.2
Don't touch an SP without a reference to it
unify processing to check nesting count for some tunnel protocols.
add ipsec(4) interface, which is used for route-based VPN.
man and ATF are added later, please see man for details.
reviewed by christos@n.o, joerg@n.o and ozaki-r@n.o, thanks.
https://mail-index.netbsd.org/tech-net/2017/12/18/msg006557.html
ipsec(4) interface supports rump now.
add ipsec(4) interface ATF.
add ipsec(4) interface man as ipsecif.4.
add ipsec(4) interface to amd64/GENERIC and amd64/ALL configs.
apply in{,6}_tunnel_validate() to gif(4).
Spell IPsec that way. Simplify macro usage. Sort SEE ALSO. Bump
date for previous.
Improve wording and macro use.
Some parts are not clear to me, so someone with knowledge of ipsecif(4)
should improve this some more.
Improve ipsecif.4. Default port ipsec(4) NAT-T is tested now.
pointed out by wiz@n.o and suggested by ozaki-r@n.o, thanks.
Change the prefix of test names to ipsecif_ to distinguish from tests for ipsec(4)
New sentence, new line. Remove empty macro.
Fix PR kern/52920. Pointed out by David Binderman, thanks.
Improve wording, and put a new drawing, from me and Kengo Nakahara.
apply a little more #ifdef INET/INET6.  fixes !INET6 builds.

(snj)

Wrap PowerPC #pragma goop in #if __GNUC_PREREQ__(6,0).
Our older GCC warns/errors on it.

(jakllsch)

Add obsolete lines for the gcc-5 and openssl-1.0 lines for systems that have
installed gcc-6 and openssl-1.1. Requested by wiz@

(christos)

PR/53008: Henning Petersen: Fix missing brace inside comment.

(christos)

PR/53006: stackfield: Please support NVIDIA GT730 to kernel

(christos)

Add missing comma.

(wiz)

Sort SEE ALSO.

(wiz)

Remove Tn.

(wiz)

Use bools with bool. NFCI.

From Henning Petersen in PR toolchain/53009.
(I completed for the rest of the function. Similar code exists in GCC trunk.)

(maya)

Remove Tn.

(wiz)

Remove useless macros. Sort errors.

(wiz)

Remove useless macro.

(wiz)

Remove Tn. Remove trailing whitespace. Remove useless Pp.

(wiz)

Move SVS into x86/svs.c

(maxv)

Style, and reduce the diff between i386 and amd64. No functional change.

(maxv)

switch amd64 to gcc-6. Thanks mrg for all the work!

(christos)

more volatile to appease gcc.

(christos)

Use bsd.init.mk (instead of bsd.own.mk) consistently so that
Makefile.inc gets called before bsd.own.mk so that we get a chance
to use NOFOO easily in Makefile.inc. Use that to turn CTF off for
everything.

(christos)

non-null arg.

(christos)

introduce a inline function to set a value to zero while
hiding this fact from GCC.  this allows the PPC code that
writes to address zero to actually work rather than cause
GCC to emit an explicit "trap" instruction, which in early
boot means hang on my pegasosII.  use this in oae_init()
for both rfid->rfi and also setting the jump-to-zero trap.

found with a lot of debugging, but GCC 6's new warning
-Wnull-dereference found it when i was informed of its
existence.  unfortunately, there are dozens of other
violations in our kernel today so simply enabling that
option for everything is not a good idea, but is a goal.

(mrg)

remove more unreachable code.

(christos)

Convert to full recursive attr/die lookup instead of one level since gcc 6
creates indirect attributes that point to indirect attributes. The code is
smaller this way too :-)

(christos)

We need authentication || encryption even when we are not building
kerberos. They are needed for telnet_net_write() which is used in libtelnet.

(christos)

fix pasto

(christos)

Restore pic and sse2 enabled code to make libcrypto works as before.

(nakayama)

Do for i386 what was done for amd64 (but in a more KNF conformant way...)

(kre)

Add a note, to say that basically the recent FreeBSD binaries can't be
expected to work, and that we keep compat_freebsd only for tw_cli.

(maxv)