HardenedBSD-10-STABLE-v44.4

Warning: this is a ntpd security update

More information will be in the FreeBSD's SA:
Security: CVE-2016-1547, CVE-2016-1548, CVE-2016-1549, CVE-2016-1550
Security: CVE-2016-1551, CVE-2016-2516, CVE-2016-2517, CVE-2016-2518
Security: CVE-2016-2519
Security: FreeBSD-SA-16:16.ntp

Oliver Pinter + (1):
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

bcr (2):
MFC r298522:
MFC r298524:

delphij (1):
MFC r298695: MFV r298691: ntp 4.2.8p7.

jhb (1):
MFC 297039,297374,297398,297484: Poll the IPI status while waiting constantly instead of delaying 5 microseconds between checks. This avoids inserting a minimum latency of 5 microseconds on each IPI.

HardenedBSD-10-STABLE-v44.3

Oliver Pinter (2):
HBSD: revert custom kbdmux related changes to avoid merge conflict with the upstream
HBSD: update OP-HBSD kernel config

Oliver Pinter + (14):
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

ae (1):
MFC r297820: Fix the problem, when gpart(8) can't write both bootcode and partcode in one command due to wrong file size limit. Do not use bootcode size to calculate partsize limit. Also add report message about successful partcode writing.

avg (3):
MFC r297709: zio write issue threads should have lower (numerically greater) priority
MFC r297513: remove emulation of VFS_HOLD and VFS_RELE from opensolaris compat
MFC r297846: [amd64] dtrace_invop handler is to be called only for kernel exceptions

bapt (2):
MFC: r298111 r298114
MFC: 298112

cem (10):
HBSD-MFC: drm2(4): Fix double-free in low-memory error path
HBSD-MFC: kgssapi(4): Fix string overrun in Kerberos principal construction
HBSD-MFC: pty(4): Use strlcpy to guarantee destination buffer isn't overrun
HBSD-MFC: kgssapi(4): Don't allow user-provided arguments to overrun stack buffer
HBSD-MFC: sound(4): Don't use-after-free in midi module unload
HBSD-MFC: sym(4): Don't double-free 'sim' in failure case
HBSD MFC: aacraid(4): Fix some mostly trivial buffer overruns
HBSD MFC: iscsi_initiator(4): Fix use-after-free, double-free
HBSD MFC: ciss(4): Fix overrun of array
HBSD MFC: kgssapi: Don't leak memory in error cases

emaste (5):
Fix compiled-in keymap generation for sc/vt consoles
MFC r297685: Add option to specify built-in keymap for kbdmux
MFC r275940 (imp): Bump the largest record we can cope with from 1k to 8k.
MFC r277205 (imp):
MFC r288490: Add debug file extension to kldxref(8)

jhb (2):
MFC 295677,295678: Fetch the current thread and it's syscall state from the trussinfo object instead of passing some of that state as arguments to print_syscall() and print_syscallret(). This just makes the calls of these functions shorter and easier to read.
MFC 295930: Add support for displaying thread IDs to truss(1).

kib (2):
MFC r298043: Avoid NULL pointer dereference.
MFC r298101: Add x86 CPU features definitions published in the Intel SDM rev. 58.

kp (1):
HBSD MFC: msdosfs: Prevent buffer overflow when expanding win95 names

markj (1):
MFC r298173: Use a loop instead of a goto in sysctl_kern_proc_kstack().

ngie (4):
MFC r298303:
MFC r298024,r298196:
MFC r297836:
MFC r297282,r297456,r298012,r298013,r298014:

pfg (7):
MFC r297527, r297688: chdone(): Prevent returning uninitialized scalar value.
MFC r297791: UFS: replace 0 with NULL for pointers.
MFC r297796: ext2fs: replace 0 with NULL for pointers.
MFC r298482: Cleanup redundant parenthesis from existing howmany()/roundup() macro uses.
HBSD MFC: msdosfs_rename: Unused value
HBSD MFC: msdosfs_rename: yet another unused value.
HBSD MFC: fs misc: for pointers replace 0 with NULL.

sbruno (1):
HBSD-MFC: Avoid a possible heap overflow in our nlm code

wblock (3):
MFC r298005:
MFC r298156:
MFC r298176:

HardenedBSD-10-STABLE-v44.2

Oliver Pinter (1):
opBSD: properly initialize logging

Oliver Pinter + (24):
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

ache (1):
MFC r297557: SJIS encoding don't have single byte characters >= 224

asomers (1):
MFC 297838

avg (2):
MFC r297520: zfs receive: -u can be ignored sometimes
MFC r297521: fix zfs set canmount=off on an unmounted filesystem

bdrewery (1):
MFC r297626:

brooks (2):
MFC r297475:
MFC r297476:

davidcs (2):
MFC r297873 1. Process tx completions in bxe_periodic_callout_func() and restart transmissions if possible. 2. For SIOCSIFFLAGS call bxe_init_locked() only if !BXE_STATE_DISABLED 3. remove code not needed in bxe_init_internal_common()
MFC r297884 Add support for Flash Update

dchagin (1):
MFCR r297519, r297525 (by pfg@):

emaste (5):
MFC r296769: boot/efi: Prefer nm to objdump
MFC r275430: libelf: Fix cross-endian ELF note file / memory conversion
MFC r296685: libelf: correct byte count in cross-endian note translation
MFC r296926: kbdcontrol: add -P path option to add keymap search paths
Bump __FreeBSD_version for kbdcontrol's -P option

gahr (1):
MFC 297678: Enhance uuencode with a -r option to produce raw output.

glebius (1):
Merge r285713 (by zec@) from head: Prevent null-pointer dereferencing.

gnn (1):
MFC 297358 Add ethertype reserved for network testing

jilles (9):
MFC r295385: semget(): Check for [EEXIST] error first.
MFC r278818: sh: Add stsavestr(), like savestr() but allocates using stalloc().
MFC r297360: sh: Fix use-after-free if a trap replaces itself.
MFC r287753: setuid(2): Suggest O_CLOEXEC instead of fcntl(F_SETFD).
MFC r281086: utimensat: Correct Capsicum required capability rights.
MFC r258799: test: Simplify the code by unifying op_num and op_type.
MFC r259017: test: Avoid looking up again the type of a known binary operator.
MFC r277645: cp,mv,touch: Set timestamps with nanosecond precision.
MFC r278817: touch: Fix some subtle bugs related to NULL times fallback:

kevlo (1):
MFC r297479, r297695:

kib (3):
MFC r297308: Style: wrap long lines.
MFC r297311: Ensure that TRIMs are finished before unmount destroys ufsmount.
MFC r297535: Remove unused variable.

loos (3):
MFC r284777, r284814, r284863 and r298088:
Fix the build.
MFC r287009, r287120 and r298131:

markj (1):
MFC r297827: libdtrace: Add a missing unlock to an error handler.

mav (3):
MFC r297386: Add support for AMD FCH watchdog timers.
MFC r297387: Add some device IDs found on AMD FCH shipsets.
MFC r297672: Alike to r293708 relax pool check in vdev_geom_open_by_path().

mp (1):
MFC 297673:

ngie (1):
MFC r297637:

pfg (2):
MFC r297618: fsck_msdosfs(8): Optimimize memsets
MFC 297942: libgssapi: avoid NULL pointer dereferences.

sbruno (3):
HBSD: hptmv(4) Fix potential buffer overflow in hpt_set_info.
HBSD: avoid merge conflict when edd3a7f gets MFCs
HBSD: aacraid(4): Sanely copyin userland pointers and ensure that we don't get anything janky from a user. (cturt)

scottl (4):
MFC r297925, r297926:
Partial MFC of r297933
MFC r298004:
Merge r298008

thomas (1):
MFC r295749:

vangyzen (1):
MFC r295012

wblock (1):
MFC r297571:

HardenedBSD-11-CURRENT-v44

Oliver Pinter (6):
Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master
HBSD: fix merge conflict in etc/rc.d/abi file
HBSD: fix noexec's paxflags parser
HBSD: update UPDATING-HardenedBSD
HBSD: bump __HardenedBSD_version after ASLR and NOEXEC changes
HBSD: fix the accidentally deleted line in kbdmux.c

Oliver Pinter + (128):
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master
Merge branch 'freebsd/current/master' into hardened/current/master

Shawn Webb (13):
HBSD: Update LATT-SEC kernel
HBSD: More HardenedBSD cleanup.
HBSD: Fix tabbing.
HBSD: Do not report ASLR deltas in jail ddb
HBSD: Bump __HardenedBSD_version to 43
HBSD: Update UPDATING-HardenedBSD
...

HardenedBSD-10-STABLE-v44.1

Oliver Pinter + (22):
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

ae (1):
MFC r296984: Change in6_selectsrc() to allow usage of non-local IPv6 addresses in IPV6_PKTINFO ancillary data when IPV6_BINDANY socket option is set.

asomers (2):
MFC 270231
MFC r294924

davidcs (1):
MFC r297155 Modifications to achieve a common source base from FreeBSD7.x thru 10.x

dchagin (3):
MFC r297296:
MFC r297297:
MFC r297309:

dim (1):
MFC r297212:

dumbbell (1):
CAM: Generalize 4k quirk to all Samsung MZ7* SSDs

hselasky (9):
MFC r296902: Improve detection of extended QSFP diagnostics.
MFC r296342: Allow for overlapping quirk device ranges. Prior to this patch only the first device entry matching the USB vendor, product and revision would be searched for quirks. After this patch all device entries will be searched for quirks.
MFC r294526: Add missing atomic wrapper macro.
MFC r296909: Fix witness panic in the ipoib_ioctl() function when unloading the ipoib module.
MFC r296910: Use hardware computed Toeplitz hash for incoming flowids
MFC r296987: Add missing curly brackets in for loop.
MFC r296934: Fix crash in krping when run as a client due to NULL pointer access. Initialize pointer in question which is used only when fast registers mode is selected.
MFC r297444: Fix bugs in currently unused bit searching loop.
MFC r294520: LinuxKPI atomic fixes: - Fix implementation of atomic_add_unless(). The atomic_cmpset_int() function returns a boolean and not the previous value of the atomic variable. - The atomic counters should be signed according to Linux. - Some minor cosmetics and styling while at it.

jhibbits (1):
MFC r295186

jilles (1):
MFC r295384: semget(2): Add missing [EINVAL] conditions.

kevlo (1):
MFC r297335:

kib (1):
MFC r297139: From libthr, remove special and strange code to set up session and control terminal, activated when running with pid 1.

kp (1):
MFC 296932: pf: Improve forwarding detection

marius (2):
Now that 10.3-RELEASE is out, move stable/10 back to STABLE.
MFC: r292563

mav (13):
r297229 (by hselasky): Add more UHCI PCI IDs.
MFC r287109 (by trasz): Make it possible to forcibly unmount devfs.
MFC r270382 (by delphij): MFV r270197:
MFC r277450 (by will): Use the "zfs_gfs" tag for GFS vnodes to make them easier to identify.
MFC r277504 (by will): Remove commented log messages.
MFC r297232: Unify ignoring EEXIST from zvol_create_minor().
MFC r297337: Pass through error code from make_dev_p().
MFC r297420: Switch from using make_dev_p() to make_dev_s() to close races.
MFC r297421: Plug open count leak on zvol rename.
MFC r297179: Optimize IPMI watchdog patting.
MFC r286890 (by fabient): Add ichwd TCO version 3 support (Bay Trail / Rangeley...)
MFC r297255: Unify ichwd(4) attachment messages in dmesg.
MFC r266615: Increase taskqueue thread priority from idle to PRIBIO.

ngie (1):
MFC r297183:

np (1):
MFC r297298: Plug leak in m_unshare.

pfg (1):
MFC r296278: mbtowc(3): set errno to EILSEQ if an incomplete character is passed.

sbruno (4):
MFC r297488
MFC 290102
MFC r297237
Revert svn 297681 as it has been deprecated by svn 297575.

ume (1):
MFC r295147: Make dynamic link of libiconv from ports work again. The symbols of libiconv from ports were changed to have prefixed. Since we have iconv in our libc these days, we don't need it on 10.X and later. However, 9.X still need this.

wblock (2):
MFC r297330:
MFC r297364:

HardenedBSD-10-STABLE-v44

Oliver Pinter (3):
HBSD: fix noexec's paxflags parser
HBSD: update UPDATING-HardenedBSD
HBSD: bump __HardenedBSD_version after ASLR and NOEXEC changes

Oliver Pinter + (23):
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

Shawn Webb (7):
HBSD: More HardenedBSD cleanup.
HBSD: Fix tabbing.
HBSD: Do not report ASLR deltas in jail ddb
HBSD: Bump __HardenedBSD_version to 43
HBSD: Update UPDATING-HardenedBSD
HBSD: Fix building with FREEBSD_COMPAT32
HBSD: Change ASLR defaults for 32bit systems.

ae (1):
MFC r296557: Add support for IPPROTO_IPV6 socket layer for getsockopt/setsockopt calls. Also add mapping for several options from RFC 3493 and 3542.

allanjude (1):
MFC: r296988 Remove 50% ZFS conditional from bsdinstall/zfsboot

asomers (2):
MFC r293229, r293833 to usr.sbin/rpcbind
MFC r295900, r295768 to usr.sbin/iostat

bdrewery (6):
MFC r296623:
MFC r296643:
MFC r296707:
MFC r296819:
MFC r296526:
MFC r296585:

dchagin (7):
MFC r297061;
MFC r297062:
MFC r297063: Whitespaces, style(9) fixes. No functional changes.
MFC r296503, r296504:
MFC r296502, r296543, r296546, r297060:
MFC r296501:
Revert r297303.

dumbbell (1):
drm: Fix dev->ioctl_count references leak

hselasky (1):
MFC r292254:

jgh (1):
MFC: 296167

kib (5):
MFC r296388: Pass MNTK_NO_IOPF and MNTK_UNMAPPED_BUFS flags from the lower filesystem to the nullfs mount.
MFC r296467: Convert all panics from the link_elf_obj kernel linker for object files format into printfs and errors to caller.
MFC r297137: Fix typo.
MFC r296652: Do not perform unneccessary shared recursion on the allproc_lock in pfs_visible().
MFC r297206: Fix locking mistake in softdep_waitidle().

mav (66):
MFC r296653: Allow standard commands for "unknown" classes in RESCUE mode.
MFC r296919: Fix small memory leak on attempt to access deleted snapshot.
MFC r256612: MFprojects/camlock r254685: Remove TQ_FLAGS_PENDING flag, softly duplicating queue emptiness status.
MFC r256613, r256862: MFprojects/camlock r254763: Move tq_enqueue() call out of the queue lock for known handlers (actually I have found no others in the base system). This reduces queue lock hold time and congestion spinning under active multithreaded enqueuing.
MFC r264670: MFV r264667:
MFC r271781i (by will): bpobj_iterate_impl(): Close a refcount leak iterating on a sublist.
MFC r277492 (by will): Add vfs.zfs.reference_tracking_enable sysctl/tunable.
MFC r271788 (by will): Enable ZFS debug flags to be modified via vfs.zfs.debug_flags.
MFC r269222: Reschedule the 'deadman' callout after handling, this makes our code behave more like it is on Solaris.
MFC r271785: Reorder sysctls for spa.c global tunables; add sysctl for ccw_retry_interval.
MFC r277300 (by smh): Mechanically convert cddl sun #ifdef's to illumos
MFC r274304 (by delphij): MFV r274272 and diff reduction with upstream.
MFC r286223 (by smh): Fix KSTACK_PAGES check in ZFS module
MFC r277501 (by will): Eliminate an #ifdef illumos for zfs_ioc_rename().
MFC r277503 (by will): Ignore sync requests from the system syncher, i.e. VFS_SYNC(waitfor=MNT_LAZY).
MFC r272359 (by will): zfsvfs_create(): Refuse to mount datasets whose names are too long.
MFC r262990: MFV r262983:
MFV r258597 (by pjd): When append-only, immutable or read-only flag is set don't allow for hard links creation. This matches UFS behaviour.
MFC r274627 (by avg): Revert r269093 which introduced physical zio alignment transform
MFC r290266 (by avg): zfs: allow the lookup of extended attributes of an unlinked file
MFC r291637 (by bdrewery): Fix the build for non-amd64.
MFC r292653 (by bapt): Report an error if zdb cannot initialize zfs
MFC r293677 (by asomers): Record physical path information in ZFS Vdevs
MFC r294625 (by trasz): Fix ru_oublocks accounting for ZFS. There are two code paths that can be called from zfs_write() - one of them, through dmu_write(), was handled correctly; the other wasn't.
MFC r294794: MFV r294793: 6367 spa_config_tryenter incorrectly handles the multiple-lock case
MFC r294797: MFV r294796: 6319 assertion failed in zio_ddt_write: bp->blk_birth == txg
MFC r294799: MFV r294798: 6292 exporting a pool while an async destroy is running can leave entries in the deferred tree
MFC r294801: MFV r294800: 6385 Fix unlocking order in zfs_zget
MFC r294803: MFV r294802: 6334 Cannot unlink files when over quota
MFC r294805: MFV r294804: 6386 Fix function call with uninitialized value in vdev_inuse
MFC r294807: MFV r294806: 6388 Failure of userland copy should return EFAULT
MFC r294809: MFV r294808: 6421 Add missing multilist_destroy calls to arc_fini
MFC r294811: MFV r294810: 6414 vdev_config_sync could be simpler
MFC r294813: MFV r294812: 6434 sa_find_sizes() may compute wrong SA header size
MFC r294815: MFV r294814: 6393 zfs receive a full send as a clone
MFC r294817: MFV r294816: 4986 receiving replication stream fails if any snapshot exceeds refquota
MFC r294820: MFV r294819: 6495 Fix mutex leak in dmu_objset_find_dp
MFC r295047: MFV 295046: 6358 A faulted pool with only unavailable vdevs triggers assertion failure in libzfs
MFC r295125: MFV r294821: 6529 Properly handle updates of variably-sized SA entries.
MFC r296021 (by smh): Removed unused label and fix mutex_exit order
MFC r296510, r296563, r296567: MFV r296505: 6531 Provide mechanism to artificially limit disk performance
MFC r296512: MFV r296511: 6537 Panic on zpool scrub with DEBUG kernel
MFC r296514: MFV r296513: 6450 scrub/resilver unnecessarily traverses snapshots created after the scrub started
MFC r296516: MFV r296515: 6536 zfs send: want a way to disable setting of DRR_FLAG_FREERECORDS
MFC r296519: MFV r296518: 5027 zfs large block support (add copyright)
MFC r296521: MFV r296520: 6562 Refquota on receive doesn't account for overage
MFC r296523: MFV r296522: 6541 Pool feature-flag check defeated if "verify" is included in the dedup property value
MFC r296528: MFV r296527: 6659 nvlist_free(NULL) is a no-op
MFC r296530: MFV r296529: 6672 arc_reclaim_thread() should use gethrtime() instead of ddi_get_lbolt() 6673 want a macro to convert seconds to nanoseconds and vice-versa
MFC r296533: MFV r296532: 6637 replacing "dontclose" with "should_close"
MFC r296535: MFV r296534: 6550 cmd/zfs: cleanup gcc warnings
MFC r296537: MFV r296536: 6551 cmd/zpool: cleanup gcc warnings
MFC r296539: MFV r296538: 6544 incorrect comment in libzfs.h about offline status
MFC r296541: MFV r296540: 4448 zfs diff misprints unicode characters
MFC r296613: Make ZFS more picky to GEOM stripe sizes and offsets.
MFC r296615: Make ZFS ignore stripe sizes above SPA_MAXASHIFT (8KB).
MFC r296617: Revert r292074 (by smh): Limit stripesize reported from nvd(4) to 4K
MFC r277629 (by will): When creating or updating a node, use vfs_timestamp() for "now" instead of gethrestime(), to allow the administrator to decide the appropriate timestamp precision instead of always using nanosecond precision.
MFC r296449: Update meaning of -n argument.
MFC r275137 (by adrian): Add PCI ID for Intel Lynx Point LP controller.
MFC r295463 (by hselasky): Correct PCI device description.
MFC r297049: Add IDs for Intel Wellsburg USB controllers.
MFC r297051: Fix incorrect (fortunately bigger) malloc size.
MFC r296654: Use geom disk list instead camcontrol identify.
MFC r296655, r296673, r296776: Unify and improve metadata wiping.
MFC r296656: Don't bother to invoke gmirror or zpool if the module is not loaded.

mp (1):
MFC 296416:

ngie (1):
MFC r296766:

n...

HardenedBSD-10-STABLE-v42.2

Warning! This is a security update, contains the following FreeBSD SAs and ENs:
https://www.freebsd.org/security/advisories/FreeBSD-SA-16:15.sysarch.asc
https://www.freebsd.org/security/advisories/FreeBSD-SA-16:14.openssh.asc
https://www.freebsd.org/security/advisories/FreeBSD-EN-16:05.hv_netvsc.asc
https://www.freebsd.org/security/advisories/FreeBSD-EN-16:04.hyperv.asc

Oliver Pinter + (8):
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

bdrewery (2):
MFC r296524:
MFC r296525:

cy (1):
MFC r296299 - Remove redundant NULL pointer comparison.

davidcs (1):
MFC r296579 Fix code so that buf_ring allocation for Tx Queues and their mutexes is done during during bxe_attach() and freed during bxe_detach()

glebius (1):
Merge r296956:

ian (3):
MFC r296807:
Revert r296940, it contained unintended changes, and will be redone.
MFC r296807: (this time with 100% fewer unintended changes mixed in)...

kib (3):
MFC r296320: Adjust _callout_stop_safe() return value for the subr_sleepqueue.c needs when migrating callout was blocked, but running one was not.
MFC r296319: Fix handling of DT_TEXTREL for an object with more than one read-only segment.
MFC r296908: Force the desired alignment of the user save area.

ngie (4):
MFC r293621,r293622,r293815:
MFC r294973:
MFC r293821:
MFC r293878,r293880,r295116,r295117,r295477:

HardenedBSD-10-STABLE-v42.1

Oliver Pinter (3):
Merge remote-tracking branch 'origin/freebsd/10-stable/master' into hardened/10-stable/master
HBSD: fix merge conflict in libexec/rtld-elf/rtld.c
HBSD: fix merge conflict in etc/rc.d/abi

Oliver Pinter + (1):
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

bdrewery (15):
MFC r295976:
MFC r295977:
MFC r295980:
MFC r295994,r296000:
MFC r296002,r296012:
MFC r295161,r296014:
MFC r296286,r296470,r296472,r296473,r296575:
MFC r296322:
MFC r296122:
MFC r296554:
MFC r296148:
MFC r294878:
MFC r294873:
MFC r268620,r294876,r294877:
MFC r295416:

dchagin (1):
MFC r296542: Load linux64 module for amd64 if Linux abi enabled.

des (1):
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug) MFH (r296634): re-add aes-cbc to server-side default cipher list MFH (r296651, r296657): fix gcc build of pam_ssh

dim (2):
Pull in r219512 from upstream llvm trunk (by Hal Finkel):
Add patch corresponding to r296800.

kib (6):
MFC r257811 (by markj): Include rtld itself when iterating over loaded ELF objects in dl_iterate_phdr(3).
MFC r295488: Finish r173600. There is no need to test a condition if both cases result in the same value.
MFC r295489: Remove useless checks for NULL before calling free(9), in the kernel elf linkers.
MFC r295352: Do not call vn_fullpath(9) (through the pmc_getfilename() wrapper) when its result is immediately ignored, i.e. for kernel processes forked from the user process. Do not test for non-null before freeing string.
MFC r295391: Remove the assert which outlived its usefulness.
MFC r295407: Make libc __pthread_map_stacks_exec() interposed.

ngie (15):
MFC r295118:
MFC r295119:
MFC r295121:
MFC r295341,r295345:
MFC r294894:
MFC r295079:
MFC r294899:
MFC r293434:
MFC r293436:
MFC r293437:
MFC r293438:
MFC r293441:
MFC r293442:
MFC r293443:
MFC r294891:

HardenedBSD-10-STABLE-v42

CTurt (2):
HBSD: Remove info leak
HBSD: Fix ctl memory leak

Oliver Pinter (1):
HBSD: garbage collect old unused SPX_HACK options / kernel knob

Oliver Pinter + (13):
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10-stable/master
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master
Merge branch 'freebsd/10-stable/master' into hardened/10-stable/master

Shawn Webb (3):
HBSD: Prevent RTLD from creating executable per-thread stacks.
HBSD: Bump HardenedBSD version to 42 after rtld noexec change
HBSD: Fix dates in UPDATING-HardenedBSD

ae (2):
MFC r295967: Fix useless check. m_pkthdr.len should be equal to orglen.
MFC r296348: Use correct size for malloc.

davidcs (1):
MFC r296071 Upgrade the firmware carried in driver and loaded during hardware initialization (a.k.a STORM firmware) to version 7.13.1 (latest version)

dim (3):
MFC r295844:
MFC r295901:
MFC r296419 (by kib):

dwmalone (1):
MFC: r295924: Make sure that hash-based db files fsync befor closing/syncing. r295925: We no longer need O_SYNC pwd_mkd r295465: We no longer need O_SYNC on services_mkdb r295800: We no longer need O_SYNC on cap_mkdb

gnn (1):
MFC 285730 Only report the lack of ALTQ support if pfctl is using verbose (-v) mode.

hrs (2):
- Use FPI and catalog resolution instead of system entities. This change fixes build with a non-standard DOC_PREFIX, but it is still a temporal measure because some of them should be done by using XInclude, not by entity reference.
Trim old entries.

hselasky (3):
MFC r295608: Fix variable assignment inside if-clause in the smsc driver. Found by D5245 / PVS.
MFC r295923: Be more verbose when truncating number of HID items.
MFC r295928: Configure the correct bMaxPacketSize for control endpoints before requesting the initial complete device descriptor and not as part of the subsequent babble error recovery. Babble means that the received USB packet was bigger than than configured maximum packet size. This only affects enumeration of FULL speed USB devices which use a bMaxPacketSize different from 8 bytes. This patch might help fix enumeration of USB devices which exhibit USB I/O errors in dmesg during boot.

jgh (1):
MFC 296280:

jkim (1):
Re-enable SSLv2 support to restore ABI.

kib (3):
MFC r295998: Remove references to Giant in the description of vrele(9). Add notes about vnode lock and sleeping.
MFC r296009: In bpf_getdltlist(), do not call copyout(9) while holding bpf lock. Copy the data into temprorary malloced buffer and drop the lock for copyout.
MFC r295966: Return dst as the result from memcpy(9) on amd64.

kp (2):
MFC: r296025:
MFC r295836: ifconfig(8): can't use 'name' or 'description' when creating interface with auto numbering

marius (1):
- Reset stable/10 back to -PRERELEASE status now that releng/10.3 has been branched. - Update __FreeBSD_version to reflect the new -STABLE branch.

mav (3):
MFC r295324: Add error check to not leak logs with syntax errors in case of failed zpool history.
MFC r295562: Don't check CmdSN for initial login request.
MFC r296392: Set bhsdi_target_transfer_tag to reserved value, which is 0xffffffff.

pfg (5):
MFC r295810: firewire: fix a mismatch introduced in r230558.
MFC r295861:
MFC r295671: cron: use (char *)NULL instead of (char *)0 in execle.
MFC r295672: crontab: ftruncate() with ftello() instead of ftell().
MFC r295675: Fix "naive" use of ftell(3).

rpokala (1):
MFC r295276: Add defines for WRITE_UNCORRECTABLE ATA command, and improve command logging

sbruno (1):
Spell "maximum" correctly.

smh (1):
MFC r296610:

truckman (1):
MFC r283869 (by araujo)

vangyzen (1):
MFC r281920,r284247,r284248,r295651

HardenedBSD-11-CURRENT-v42

CTurt (2):
HBSD: Fix ctl memory leak
HBSD: Remove info leak

Mark Felder (1):
HBSD: fix the comments in HardenedBSD.conf

Oliver Pinter (25):
HBSD: fix hbsd-update-build's hbsd_version
HBSD: remove unneeded sysctls from ASLR implementation
HBSD: move pax_disallow_map32bit_active() to it's place in pax.h
HBSD: remove stale function declaration
HBSD: convert the PAX_NOTEs kernel private
HBSD: fix build on i386
HBSD: rework the base hbsd structure
HBSD: remove unused PAX_FEATURE_UNKNOWN_STATUS state
HBSD: remove dead code from hbsd_pax_{common,hardening}.c
HBSD: added skeleton feature implementation
HBSD: remove ptrace_hardening
HBSD: add hbsd related sysctl macros: SYSCTL_HBSD_{2,4}STATE
HBSD: start using the newly intorduced SYSCTL_HBSD_{2,4}STATE in ASLR
HBSD: fix rtld build after the PAX_NOTES conversion (b8faf65680d366cfb9b865f534fe6abfb4c46faa)
HBSD: start using the newly intorduced SYSCTL_HBSD_{2,4}STATE in hbsd_pax_hardening.c
HBSD: start using the newly intorduced SYSCTL_HBSD_{2,4}STATE in hbsd_pax_log.c
HBSD: start using the newly intorduced SYSCTL_HBSD_{2,4}STATE in hbsd_pax_segvguard.c
HBSD: start using the newly intorduced SYSCTL_HBSD_{2,4}STATE in hbsd_pax_noexec.c
HBSD: start using the newly intorduced SYSCTL_HBSD_{2,4}STATE in hbsd_pax_SKEL.c
HBSD: bump __HardenedBSD_version to 41 after recent changes
HBSD: fixed the comment in hbsd_pax_aslr.c
HBSD: add HBSD_EXTRA environment variable to newvers.sh
HBSD: implement mirror selection logic for hardenedbsd
HBSD: null the freed point to prevent future surprises
HBSD: fix the distsets path in mirrorselect

Oliver Pinter + (72):
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge remote-tracking branch 'freebsd/master' into hardened/current/master

Shawn Webb (14):
HBSD: Update aslr(4) manpage.
HBSD: Document shared library loading order randomization bugs.
HBSD: aslr(4) manpage cleanup
Merge remote-tracking branch 'origin/master' into hardened/current/master
HBSD: Use the right path for jls(8).
HBSD: Skip /root/.cshrc on update.
HBSD: Prevent RTLD from creating executable per-thread stacks.
HBSD: Bump HardenedBSD version to 42 after rtld noexec change
HBSD: Fix dates in UPDATING-HardenedBSD
Merge remote-tracking branch 'origin/master' into hardened/current/master
HBSD: Fix merge conflict
Merge remote-tracking branch 'origin/master' into hardened/current/master
HBSD: Fix merge conflict in share/man/man5/src.conf.5.
HBSD: Fix build

adrian (10):
Allow MIPS INTRNG code to be built without FDT support.
document some ACPI related sysctls.
Fixes to make it compile under gcc-4.2.
Migrate UNCOMPRESS -> UZIP
Bring over the initial rewrite of the broadcom bus support found in their SoCs and various chips (including, famously, their wifi chips.)
Add modules support for the bhnd code.
Begin abstracting out the access method for ath(4) ioctls.
Migrate athstats to use the new stats API.
Migrate athregs over to use the new stats API.
Fix up the ath(4) device names for QCA chipsets.

ae (3):
Fix useless check. m_pkthdr.len should be equal to orglen.
Fix bug in filling and handling ipfw's O_DSCP opcode. Due to integer overflow CS4 token was handled as BE.
Use correct size for malloc.

andrew (35):
Remove an unused include.
Create the twsi device option in preparation to move the driver to a common location. The device is also found in Allwinner SoCs.
Move the twsi driver source to be under iicbus. It is in a separate directory as it is expected multiple attachments will be added for the SoC families that use this hardware.
Add support for the Allwinner i2c device. This is similar to the existing Marvell twsi part, however uses different register locations, as such split the existing driver into Marvell and Allwinner attachments.
Remove an unused static inline function.
Remove an unused FDT header, fdt_common.h should only be needed in a few places, mostly in sys/dev/fdt and le...