o Restore netmap emulation mode to working order, including
  fixing the destructor panics on detach.
o Omit pipe additions to these fixes, likely problematic for
  Suricata to pass traffic like it does on 11.0 without this
  patch.
o Allow to build the module without errors in the tree.

Many thanks to Vincenzo Maffione for assistance and review!  :)

From b497fe34fd275da6b850bf271f510d02b888b8bc Mon Sep 17 00:00:00 2001
From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Thu, 2 Jun 2016 00:21:40 +0200
Subject: [PATCH] allocate only the rings requested by the user

From 09936864fa5b67b82ef4a9907819b7018e9a38f2 Mon Sep 17 00:00:00 2001
From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Wed, 20 Jul 2016 20:35:12 +0000
Subject: [PATCH] freebsd: fix const-related warning

From ab90c6c10224fefbb6a6c6e0b92e6ba80e5b694d Mon Sep 17 00:00:00 2001
From: Vincenzo Maffione <v.maffione@gmail.com>
Date: Wed, 28 Sep 2016 18:39:55 +0200
Subject: [PATCH] freebsd: generic: change mbuf allocation management

From fe811e11b2c37fc274a1134e1c10b2f6ada1a91c Mon Sep 17 00:00:00 2001
From: Vincenzo Maffione <v.maffione@gmail.com>
Date: Thu, 29 Sep 2016 08:54:52 +0200
Subject: [PATCH] freebsd: generic: call m_extadd() only once for each mbuf

Help mitigate against CoReV attack[1]. We already force shared libraries
to be compiled with -fPIC.

[1]: https://sourceware.org/ml/libc-alpha/2016-12/msg00914.html



Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>
MFC-to:		10-STABLE
MFC-to:		11-STABLE
(cherry picked from commit 19d38259535dbc6705d8ca3a8d644e4cc87bbf38)

  Don't read if_counters with if_addr_lock held

  Calling into an ifnet implementation with the if_addr_lock already
  held can cause a LOR and potentially a deadlock, as ifnet
  implementations typically can take the if_addr_lock after their
  own locks during configuration.  Refactor a sysctl handler that
  was violating this to read if_counter data in a temporary buffer
  before the if_addr_lock is taken, and then copying the data
  in its final location later, when the if_addr_lock is held.

  PR: 194109
  Reported by: Jean-Sebastien Pedron
  MFC after: 2 weeks
  Differential Revision:        https://reviews.freebsd.org/D8498
  Reviewed by: sbruno

Based on feedback by countless users, this removes the if_output
calls in the pf code that escape pfil processing in IPv4 by going
the long way.  This is only partially applicable to FreeBSD and
we are working on fixing this in a full fashion in 12-CURRENT.

It also disables ip_tryforward() as that does not seem trivial
to convert as it is missing 12-CURRENT's nhop4/nhop6.  Maybe we
will see that in 11.1.

Many thanks to Andrey V. Elsukov (ae@) for giving this direction
and review.

Also see: https://reviews.freebsd.org/D8877

This matches the Intel 7.6.2 driver code to restore "no carrier"
state transitions in the 82574 chipsets.

PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211219
Also see: https://svnweb.freebsd.org/base?view=revision&revision=286831

Security:	FreeBSD-SA-17:01.openssh
Security:	CVE-2016-10009
Security:	CVE-2016-10010
Approved by:	so

If you run "ifconfig lagg0 destroy" and "ifconfig lagg0" at the same time a
page fault may result. The first process will destroy ifp->if_lagg in
lagg_clone_destroy (called by if_clone_destroy). Then the second process
will observe that ifp->if_lagg is NULL at the top of lagg_port_ioctl and
goto fallback: where it will promptly dereference ifp->if_lagg anyway.

The solution is to repeat the NULL check for ifp->if_lagg

MFC after:	4 weeks
Sponsored by:	Spectra Logic Corp
Differential Revision:	https://reviews.freebsd.org/D8512

Remove stray debugging code from r310180

Reported by:	rstone
Pointy hat to:	asomers
MFC after:	3 weeks
X-MFC-with:	310180
Sponsored by:	Spectra Logic Corp

This fixes long-standing problems when changing settings of the adapter.

Discussed in:
https://lists.freebsd.org/pipermail/freebsd-net/2016-June/045509.html

Submitted by:	arnaud.ysmal@stormshield.eu
Reviewed by:	erj@freebsd.org
Approved by:	re (gjb)
Differential Revision:	https://reviews.freebsd.org/D7030

Approved by:	so

mode.

Simply move the check if SEGVGUARD is active to the top of the functions
that utilize the check. No need to waste CPU cycles if SEGVGUARD isn't
active.

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>
MFC-to:		10-STABLE
MFC-to:		11-STABLE
(cherry picked from commit 94ec671827b6e75e180324424847c6210c3ffaca)

vn_stat is the wrong function to use. Using VOP_GETATTR provides
SEGVGUARD with the same info as vn_stat. It also does less than vn_stat,
so fewer CPU cycles are used.

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>
github-issue:	#227
MFC-to:		10-STABLE
MFC-to:		11-STABLE
(cherry picked from commit 19e621a2c023cbabb00eac0e8a5cae507c6c4cbe)

Instead of taking an extra reference to deal with pfsync_q_ins()
and pfsync_q_del() taken and dropping a reference (resp,) make
it optional of those functions to take or drop a reference by
passing an extra argument.

Submitted by:	glebius@

PR:		215105
Submitted by:	<jtd2004a sbcglobal.net>
Approved by:	so

The fix for FreeBSD-SA-16:37.libc (CVE-2016-6559) improperly calculates
how many bytes are remaining in the buffer.

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>
MFC-to:		10-STABLE
MFC-to:		11-STABLE

Fix link_ntoa(3) buffer overflow in libc. [SA-16:37]
Fix possible escape from bhyve(8) virtual machine. [SA-16:38]
Fix warnings about valid time zone abbreviations. [EN-16:19]
Update timezone database information. [EN-16:20]
Fix incorrectly defined unicode character(s). [EN-16:21]

Security:	FreeBSD-SA-16:36.telnetd
Security:	FreeBSD-SA-16:37.libc
Security:	FreeBSD-SA-16:38.bhyve
Errata Notice:	FreeBSD-EN-16:19.tzcode
Errata Notice:	FreeBSD-EN-16:20.tzdata
Errata Notice:	FreeBSD-EN-16:21.localedef
Approved by:	so

  localedef: Fix ctype dump (fixed wide spread errors)

See original commit for longer description.

Errata Notice:	EN-16:21
Approved by:	so

    Incorporate a change from OpenBSD by millert@OpenBSD.org

    Don't warn about valid time zone abbreviations.  POSIX
    through 2000 says that an abbreviation cannot start with ':', and
    cannot contain ',', '-', '+', NUL, or a digit.  POSIX from 2001
    on changes this rule to say that an abbreviation can contain only
    '-', '+', and alphanumeric characters from the portable character
    set in the current locale.  To be portable to both sets of rules,
    an abbreviation must therefore use only ASCII letters."  Adapted
    from tzcode2015f.

Errata Notice:	EN-16:19.tzcode
Submitted by:	bapt
Approved by:	so

Use after free happens for state that is deleted. The reference
count is what prevents the state from being freed. When the
state is dequeued, the reference count is dropped and the memory
freed. We can't dereference the next pointer or re-queue the
state.

MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D8671

Taken from: http://www.iana.org/time-zones

Taken from: http://www.iana.org/time-zones

Security:	FreeBSD-SA-16:33.openssh
Approved by:	so

(cherry picked from commit c3ce2fe853233c3441e70fa0f68d37cc0998d626)

we have to refresh it ... always.  This fixes problems reported in NetMap
with em(4) devices after conversion to extended descriptor format in
svn r293331.

Submitted by:	luigi@
Reported by:	franco@opnsense.org
MFC after:	2 days

based on passing incorrect parameters to sysarch(2). [1]

Fix unchecked array reference in the VGA device emulation code. [2]

Security:	SA-16:15 [1]
Security:       SA-16:32 [2]
Approved by:	so

A programming error in GELIBoot causes the loader to attempt to read past
the end of the disk if the size of the final partition is not a multiple of
4 kB.

Merge r306834 from stable/11.

Approved by:	so

Those options will come from OPNsense's custom kernel config.

OPNsense uses custom kernel configs. Leave GENERIC alone.

Taken from: http://www.iana.org/time-zones

Taken from: http://www.iana.org/time-zones

Leftover cruft from an old ZFS bug made it to commit
885c2e55.

Enabled for amd64, i386, and aarch64.

Note that this commit also enables ASLR in the GENERIC kernel.

Signed-off-by: Shawn Webb <shawn@opnsense.org>

This comes from the stable/16.7 branch.

Signed-off-by: Shawn Webb <shawn@opnsense.org>