summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MFC of r286641:Luiz Otavio O Souza2016-02-181-2/+2
| | | | | | | | | | Use correct src/dst ports when removing states. Submitted by: Milosz Kaniewski <m.kaniewski@wheelsystems.com>, UMEZAWA Takeshi <umezawa@iij.ad.jp> (original) Reviewed by: glebius Approved by: pjd (mentor) Obtained from: OpenBSD
* Importing pfSense patch pfaltq_interface_bw.diffLuiz Otavio O Souza2016-02-171-8/+5
| | | | Sets default speed to 1G.
* Revert "Importing pfSense patch pfaltq_interface_bw.diff"Luiz Otavio O Souza2016-02-171-5/+8
| | | | This reverts commit 9b3c3fc58b6b3162259b33fc56746f42a48e0301.
* Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-1723-165/+287
|\
| * MFH (r295536): fix double-free error when SSL connection failsdes2016-02-171-1/+0
| | | | | | | | | | | | PR: 206774 Submitted by: Christian Heckendorf <heckendorfc@gmail.com> Approved by: re (glebius)
| * MFH (r295535): use insecure-lan-zones option instead of hardcoded listdes2016-02-1715-139/+269
| | | | | | | | | | Approved by: re (glebius) Relnotes: yes
| * MFH (r295533): remove broken unbound-control-setup scriptdes2016-02-173-2/+2
| | | | | | | | | | Approved by: re (glebius) Relnotes: yes
| * MFC r295455bapt2016-02-161-1/+2
| | | | | | | | | | | | | | Fix make universe when running with non POSIX/C locales using a locale sensitive pattern Approved by: re@ (gjb, marius)
| * MFC 295418,295419:jhb2016-02-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hangs or panics when misbehaved kernel threads return from their main function. 295418: Mark proc0 as a kernel process via the P_KTHREAD flag. All other kernel processes have this flag set and all threads in proc0 (including thread0) have the similar TDP_KTHREAD flag set. 295419: Call kthread_exit() rather than kproc_exit() for a premature kthread exit. Kernel threads (and processes) are supposed to call kthread_exit() (or kproc_exit()) to terminate. However, the kernel includes a fallback in fork_exit() to force a kthread exit if a kernel thread's "main" routine returns. This fallback was added back when the kernel only had processes and was not updated to call kthread_exit() instead of kproc_exit() when threads were added to the kernel. This mistake was particularly exciting when the errant thread belonged to proc0. Due to the missing P_KTHREAD flag the fallback did not kick in and instead tried to return to userland via whatever garbage was in the trapframe. With P_KTHREAD set it tried to terminate proc0 resulting in other amusements. PR: 204999 Approved by: re (glebius)
| * MFC r295497: Update uefi.8 for ZFS and multi device boot supportemaste2016-02-161-20/+12
| | | | | | | | Approved by: re (gjb)
* | Import patch from https://reviews.freebsd.org/D5186Renato Botelho2016-02-154-7/+11
| | | | | | | | | | This is a new approach to fix pfSense ticket #4523. The fix we had in place works but makes the process really slow for big user databases.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-1510-25/+43
|\ \ | |/
| * drm/i915: Restore pci_enable_busmaster() call in the init pathdumbbell2016-02-155-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a GPU hang on i945GM. While here, merge some minor fixes to DRM core and i915: * Remove obsolete drm_agp_*_memory() prototypes * Fix comment in drm_fops.c (outisde -> outside) * Fix some formatting issues in drm_stub.c (spaces -> tabs) Approved by: re (marius) MFC of: r288653, r288952, r293851 Submitted by: <s3erios@gmail.com> Differential Revision: https://reviews.freebsd.org/D3413
| * MFC r295495 - Update leapsecond file in non-chroot environments.cy2016-02-141-4/+4
| | | | | | | | | | | | PR: 207095 Submitted by: madpilot Approved by: re (marius)
| * MFC r295496: Document boot1.efi's handling of /boot.configemaste2016-02-141-1/+12
| | | | | | | | Approved by: re (marius)
| * MFC r294598:kib2016-02-141-5/+10
| | | | | | | | | | | | In tty_dealloc(), clear the queues. Approved by: re (marius)
| * MFC r294596:kib2016-02-141-2/+3
| | | | | | | | | | | | | | Limit the accesses to file' f_advice member to VREG vnodes only. Recheck that f_advice is not NULL after lock is taken. Approved by: re (marius)
| * MFC r294595:kib2016-02-141-0/+7
| | | | | | | | | | | | | | | | When devfs dirent is freed, a vnode might still keep a pointer to it, apparently. Interlock and clear the pointer to avoid free memory dereference. Approved by: re (marius)
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-02-1384-1260/+2931
|\ \ | |/
| * Update stable/10 to BETA2 in preparation for 10.3-BETA2 builds.marius2016-02-121-1/+1
| | | | | | | | Approved by: re (implicit)
| * Merge from current r294767,294769,295408imp2016-02-112-15/+186
| | | | | | | | | | | | | | | | r294767: Parse command line arguments in loader.fi r294769: Allow newlines to be treated as whitespace when parsing args r295408: Implement -P command line option in for EFI booting. Approved by: re@ (gjb@)
| * MFC r295320, r295356 (Partial)smh2016-02-115-181/+517
| | | | | | | | | | | | | | Fix EFI multi device boot support Approved by: re (marius) Sponsored by: Multiplay
| * MFC r294768:smh2016-02-111-1/+37
| | | | | | | | | | | | | | Process /boot/config and /boot.config during EFI boot Approved by: re (marius) Sponsored by: Multiplay
| * Fix ia64 build failures in EFI platformsmh2016-02-113-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MFC of the recent EFI work to stable/10 caused build breakage under ia64. It was not apparent that there was EFI code outside the EFI tree as this is not the case in HEAD, however in stable/10 there is for ia64. This change does the following: * Re-enables libefi for ia64 under gcc. * Adds the ignore for unsupported pragma's when building libefi for ia64. * Adds the missing parameter to efi_handle_lookup in the ia64 loader. This is a direct commit as ia64 is no longer supported after 10.x Approved by: re (marius) Sponsored by: Multiplay
| * MFC 295174:jhb2016-02-112-5/+6
| | | | | | | | | | | | | | - Note that devctl(8) will appear in 10.3 first. - Add missing devctl_set_driver entry to namelist in devlist(3). Approved by: re (gjb)
| * MFC r294795smh2016-02-112-49/+86
| | | | | | | | | | | | | | ixgbe sysctl hardware defaults Approved by: re (marius) Sponsored by: Multiplay
| * MFC r295356 (Partial)smh2016-02-111-1/+1
| | | | | | | | | | | | | | Fix EFI platform build failures on arm.armeb Approved by: re (marius) Sponsored by: Multiplay
| * MFC r294734, r295093 & r295094 ixgbe fixessmh2016-02-117-8/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MFC r294734 Fix ixgbe compliation with DBG 1 MFC r295093 Configure ixgbe phy & gbic power MFC r295094 Fix ixgbe flow control autoneg reporting Approved by: re (marius) Sponsored by: Multiplay
| * MFC r295467arybchik2016-02-115-0/+284
| | | | | | | | | | | | | | | | | | | | | | | | sfxge: implement SIOCGI2C to read information from phy modules The IOCTL is used by 'ifconfig -v' to show SFP+/QSFP+ information including inventory information and dianostics (temperature, light levels, voltage etc). Reviewed by: gnn,melifaro Approved by: re (gjb) Sponsored by: Solarflare Communications, Inc.
| * Revert sysctl description change introduced in r295008 to correctlysbruno2016-02-111-1/+2
| | | | | | | | | | | | | | | | | | reflect the maximum number of queues supported (8) by this driver. Submitted by: jwd Reviewed by: erj Approved by: re (gjb) Sponsored by: Intel Corporation and Limelight Networks
| * MFC r292674sbruno2016-02-1122-676/+1029
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ixgbe(4) to Intel FreeBSD Networking Group version 3.1.13-k. MFC r292571 and r292697 Add support for X552 and X550T. MFC r293334 Fix SFP module insertion post boot. MFC r293338 Fix VF handling of VLANs for Amazon Cloud. Reviewed by: erj smh ngie jeffrey.e.pieper@intel.com Approved by: re (marius) Relnotes: Yes Sponsored by: Intel Corporation and Limelight Networks Differential Revision: https://reviews.freebsd.org/D5117
| * MFC: r295159, kill foreign VCS files.sobomax2016-02-112-46/+0
| | | | | | | | Approved by: re (marius)
| * Adjust initialization of random(9) so it is usable earlier.jhb2016-02-107-19/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few existing SYSINITs expect the in-kernel PRNG (random(9)) to be useable at SI_SUB_RANDOM / SI_ORDER_ANY. However, the random(4) overhaul merged for 10.0 performs all of its initialization at SI_SUB_DRIVERS (since it is tied in with creating the /dev/random character device). This has changed in HEAD where the random initialization is split such that the in-kernel random(9) is initialized at SI_SUB_RANDOM and the supporting bits for userland random(4) (such as /dev/random) are initialized later. However, the changes in HEAD are large and invasive. Instead, this change is being directly committed to stable/10. This change moves most of the random(9)/random(4) initialization to SI_SUB_RANDOM with the exception that the creation of the harvesting kernel process and the /dev/random character device are deferred to new SYSINITs that run at SI_SUB_DRIVERS. This fixes the "random device not loaded; using insecure entropy" message output during boot on some systems. PR: 205800 Reviewed by: markm, so@ Approved by: so Approved by: re (gjb) Tested by: Mark Saad <nonesuch@longcount.org>
| * Catch the EFI loader up to the latest ZFS Boot Environment Menu featuresallanjude2016-02-105-56/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MFC: r294072 Move init_zfs_bootenv to sys/boot/zfs/zfs.c instead of having a copy in each loader MFC: r294073 Connect the ZFS boot environment menu to the UEFI loader MFC: r295357 Do not set vfs.root.mountfrom unnecessarily when initializing ZFS BE menu Approved by: re (marius) Relnotes: yes Sponsored by: ScaleEngine Inc.
| * MFC r289421, r293037, r294773, and r294884.cy2016-02-1010-1/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ntp leap-leapseconds support. r289421: Add default leap-seconds file. This should help ntp networks get the leap second date correct Updates to the file can be obtained from ftp://time.nist.gov/pub/ or ftp://tycho.usno.navy.mil/pub/ntp/. r293037: Update leap-seconds to latest. This will satisfy the ntpd leap-second version check. r294773: Add support for automatic leap-second file updates. The working copy of leapfile resides in /var/dbntpd.leap-seconds.list. /etc/ntp/leap-seconds (periodically updated from ftp://time.nist.gov/pub/ or ftp://tycho.usno.navy.mil/pub/ntp/) contains the master copy should automatic leapfile updates be disabled (default). Automatic leapfile updates are fetched from $ntp_leapfile_sources, defaulting to https://www.ietf.org/timezones/data/leap-seconds.list, within $ntp_leapfile_expiry_days (default 30 days) from leap-seconds file expiry. Automatic updates can be enabled by setting $daily_ntpd_leapfile_enable="YES" in periodic.conf. To avoid congesting the ntp leapfile source the automatic update randomized by default but can be disabled through daily_ntpd_avoid_congestion="NO" in periodic.conf. r294884: Allow specification of fetch options for ntp leap-seconds fetch. Approved by: re (gjb)
| * MFC 287442,287537,288944:jhb2016-02-1010-24/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix corruption of coredumps due to procstat notes changing size during coredump generation. The changes in r287442 required some reworking since the 'fo_fill_kinfo' file op does not exist in stable/10. 287442: Detect badly behaved coredump note helpers Coredump notes depend on being able to invoke dump routines twice; once in a dry-run mode to get the size of the note, and another to actually emit the note to the corefile. When a note helper emits a different length section the second time around than the length it requested the first time, the kernel produces a corrupt coredump. NT_PROCSTAT_FILES output length, when packing kinfo structs, is tied to the length of filenames corresponding to vnodes in the process' fd table via vn_fullpath. As vnodes may move around during dump, this is racy. So: - Detect badly behaved notes in putnote() and pad underfilled notes. - Add a fail point, debug.fail_point.fill_kinfo_vnode__random_path to exercise the NT_PROCSTAT_FILES corruption. It simply picks random lengths to expand or truncate paths to in fo_fill_kinfo_vnode(). - Add a sysctl, kern.coredump_pack_fileinfo, to allow users to disable kinfo packing for PROCSTAT_FILES notes. This should avoid both FILES note corruption and truncation, even if filenames change, at the cost of about 1 kiB in padding bloat per open fd. Document the new sysctl in core.5. - Fix note_procstat_files to self-limit in the 2nd pass. Since sometimes this will result in a short write, pad up to our advertised size. This addresses note corruption, at the risk of sometimes truncating the last several fd info entries. - Fix NT_PROCSTAT_FILES consumers libutil and libprocstat to grok the zero padding. 287537: Follow-up to r287442: Move sysctl to compiled-once file Avoid duplicate sysctl nodes. 288944: Fix core corruption caused by race in note_procstat_vmmap This fix is spiritually similar to r287442 and was discovered thanks to the KASSERT added in that revision. NT_PROCSTAT_VMMAP output length, when packing kinfo structs, is tied to the length of filenames corresponding to vnodes in the process' vm map via vn_fullpath. As vnodes may move during coredump, this is racy. We do not remove the race, only prevent it from causing coredump corruption. - Add a sysctl, kern.coredump_pack_vmmapinfo, to allow users to disable kinfo packing for PROCSTAT_VMMAP notes. This avoids VMMAP corruption and truncation, even if names change, at the cost of up to PATH_MAX bytes per mapped object. The new sysctl is documented in core.5. - Fix note_procstat_vmmap to self-limit in the second pass. This addresses corruption, at the cost of sometimes producing a truncated result. - Fix PROCSTAT_VMMAP consumers libutil (and libprocstat, via copy-paste) to grok the new zero padding. Approved by: re (gjb)
| * MFC boot loader path and RBX constant deduplicationemaste2016-02-0911-196/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r294765 (imp) Move all the separate copies of the same strings into paths.h. There's nothing machine specific about these. r294765 (imp) RBX_ defines are in rbx.h, move it there. r294847 (imp) Remove static from these two. They slipped through the cracks. r294925 (imp) Fix mistake when transitioning to the new defines with ZFS loader. I hate adding yet another define, but it is the lessor of the evil choices available. Kill another evil by removing PATH_BOOT3 and replacing it with PATH_LOADER or PATH_LOADER_ZFS as appropriate. Approved by: re (gjb)
* | Reduce the console spam. Only print this warning when boot verbose is enabled.Luiz Otavio O Souza2016-02-111-1/+1
| | | | | | | | | | | | This can get pretty annoying (and useless) in some systems. Ticket #4219
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-02-09481-24733/+46220
|\ \ | |/
| * Merge r264915: fix NULL pointer derefernce with special sequence ofglebius2016-02-081-1/+3
| | | | | | | | | | | | | | DIOCADDADDR and DIOCADDRULE. PR: 206933 Approved by: re (marius)
| * MFC r294732:kib2016-02-081-5/+7
| | | | | | | | | | | | Minor fixes for ddb tty-related commands. Approved by: re (gjb)
| * MFC r294735:kib2016-02-081-3/+6
| | | | | | | | | | | | | | Don't allow opening the callout device when the callin device is already open (in disguise as the console device). Approved by: re (gjb)
| * MFC r292601,292654:bz2016-02-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since r256624 (head) we have been leaking routing table allocations on vnet enabled jail shutdown. Call the provided cleanup routines for IP versions 4 and 6 to plug these leaks. Sponsored by: The FreeBSD Foundation Reviewed by: gnn Differential Revision:https://reviews.freebsd.org/D4530 Approved by: re (gjb)
| * MFC r294514:bz2016-02-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The variable is write once only and not used. Recover the vertical space. Sponsored by: The FreeBSD Foundation Obtained from: p4 CH=180830 Reviewed by: gnn, hiren Differential Revision:https://reviews.freebsd.org/D4898 Approved by: re (marius, gjb)
| * MFC r295202:bz2016-02-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to fix a bug introduced in r228623 (head). We started to copy the ifa_msghdr as otherwise platforms with strict alignment would break. It is unclear to me if there's also a problem with access to the address list following the structure. However we never copied the address list after the structure and thus are pointing at random memory. For now just use a pointer to the original memory for accessing the address list making it at least work on platforms with weak memory access. PR: 195445 Reported by: wolfgang lyxys.ka.sub.org Tested by: wolfgang lyxys.ka.sub.org (x86) Approved by: re (marius)
| * MFC r295234:ume2016-02-071-4/+4
| | | | | | | | | | | | Make sure to enable aliases for SHIFT_JIS. Approved by: re (marius)
| * MFH (r265214, r294333, r294407, r294467): misc prop fixesdes2016-02-07470-24607/+46090
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MFH (r285975, r287143): register mergeinfo for security fixes MFH (r294497, r294498, r295139): internal documentation MFH (r294328): upgrade to openssh 6.7p1, re-add libwrap MFH (r294332): upgrade to openssh 6.8p1 MFH (r294367): update pam_ssh for api changes MFH (r294909): switch usedns back on MFH (r294336): upgrade to openssh 6.9p1 MFH (r294495): re-enable dsa keys MFH (r294464): upgrade to openssh 7.0p1 MFH (r294496): upgrade to openssh 7.1p2 Approved by: re (gjb) Relnotes: yes
| * MFC r295277:kib2016-02-071-1/+20
| | | | | | | | | | | | | | When matching brand to the ELF binary by notes, try to find a brand with interpreter name exactly matching one wanted by the binary. Approved by: re (delphij)
| * MFC r295209;pfg2016-02-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | Revert r294695; passthrough any extra timestamps to the dinode struct. The original ext2fs change worked fine on disks formated with default values, but it was the cause of a regression when inodes are small. Revert it for now, while we figure out safer ways pass such values, PR: 206820 Approved by: re
| * MFC r294597:wblock2016-02-061-1/+6
| | | | | | | | | | | | Add a standards compliance note for strtok_r Approved by: re (marius@)
OpenPOWER on IntegriCloud