summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MFC r263779asomers2014-06-063-5/+5
| | | | | | | | | | | | | | | | | | | | | | Correct ARP update handling when the routes for network interfaces are restricted to a single FIB in a multifib system. Restricting an interface's routes to the FIB to which it is assigned (by setting net.add_addr_allfibs=0) causes ARP updates to fail with "arpresolve: can't allocate llinfo for x.x.x.x". This is due to the ARP update code hard coding it's lookup for existing routing entries to FIB 0. sys/netinet/in.c: When dealing with RTM_ADD (add route) requests for an interface, use the interface's assigned FIB instead of the default (FIB 0). sys/netinet/if_ether.c: In arpresolve(), enhance error message generated when an lla_lookup() fails so that the interface causing the error is visible in logs. tests/sys/netinet/fibs_test.sh Clear ATF expected error.
* MFC r264417: realpath(): Properly fail "." or ".." components afterjilles2014-06-061-20/+6
| | | | | | | | | | | | | | non-directories. If realpath() is called on pathnames like "/dev/null/." or "/dev/null/..", it should fail with [ENOTDIR]. Pathnames like "/dev/null/" already failed as they should. Also, put the check for non-directories after lstatting the previous component instead of when the empty component (consecutive or trailing slashes) is detected, saving an lstat() call and some lines of code. PR: 82980
* MFC r266880:ae2014-06-063-8/+16
| | | | | Use g_conf_printf_escaped() to escape symbols, which can break an XML tree.
* MFC r266903: Update default callchain depth to 16 to match kernelemaste2014-06-061-1/+1
|
* MFC r266915: MFV 266913+266914:delphij2014-06-061-5/+12
| | | | | 3897 zfs filesystem and snapshot limits (fix leak) 4901 zfs filesystem/snapshot limit leaks
* Document r267113, newsyslog.conf(5) includes in conf.d.gjb2014-06-051-0/+6
| | | | Sponsored by: The FreeBSD Foundation
* MFC r266463:bdrewery2014-06-053-2/+13
| | | | | - Include /etc/newsyslog.conf.d/* and /usr/local/etc/newsyslog.conf.d/* by default for newsyslog(8).
* MFH r266813: Don't break the legacy applications which setume2014-06-051-1/+5
| | | | just 2 bytes to salt.
* Fix mismerge in r267049 and put makeoptions DEBUG=-gdwarf-2 instead ofmarius2014-06-051-1/+1
| | | | | | DEBUG=-g back. Still, the original comment should be restored in head and then be MFCed along with r263749.
* Fix OpenSSL multiple vulnerabilities.delphij2014-06-055-3/+36
| | | | | | Security: CVE-2014-0195, CVE-2014-0221, CVE-2014-0224, CVE-2014-3470 Security: SA-14:14.openssl
* MFC r266859:marck2014-06-051-9/+10
| | | | | | | | | | | Change examples to have master skew above 0 to have ability to overwrite this from the slave (for example, when master is failing on disk IO and could not be logged into or execute cronjob). Commented out examples changed too to simplify future merging. Idea by: kaa@zvuki.ru Discussed with: glebius
* MFC r266538:mav2014-06-051-4/+33
| | | | | | | | | Make ng_mppc to not disable the node in case of multiple packet loss. Quite often it can be just packet reorder, and killing link in such case is inconvenient. Add few sysctl's to control that behavior. PR: kern/182212 Submitted by: Eugene Grosbein <egrosbein@rdtc.ru>
* MFC r266828:wblock2014-06-051-7/+17
| | | | | | Correct the description of characters allowed. Based on pw_checkname in usr.sbin/pw/pw_user.c. Modified version of patch submitted by venture37.
* MFC r266848:kib2014-06-055-15/+25
| | | | Add support for the unmapped i/o to mfi(4).
* MFC r266846:kib2014-06-051-3/+20
| | | | | | When usermode loaded non-default segment selector into the %gs, correctly prepare KGSBASE msr to restore the user descriptor base on the last swapgs during return to usermode.
* MFC 266281:jhb2014-06-041-0/+1
| | | | | | | | Clear the data buffer length field when freeing a command structure so that it doesn't leak through when the command structure is reused for a user command without a data buffer. PR: 189668
* MFC 260999:jhb2014-06-041-1/+1
| | | | | Increase the block-layer backend maximum number of requests to match the AHCI command queue depth.
* MFC 260972:jhb2014-06-044-7/+34
| | | | | There is no need to initialize the IOMMU if no passthru devices have been configured for bhyve to use.
* MFC 263772: Fix build without SMP.jhb2014-06-041-1/+5
| | | | PR: 187854
* Fix syntax error thrown at the point of creating the root pool, caused byroberto2014-06-041-12/+17
| | | | | | | | | | | | | | | | | an embedded newline appearing within the options string surrounded by double-quotes. Rework the logic that goes into setting dataset options on the root pool dataset while we're here -- added two new variables (which can be altered via scripting) ZFSBOOT_POOL_CREATE_OPTIONS and also ZFSBOOT_BOOT_POOL_CREATE_OPTIONS for setting pool/dataset attributes at the time of pool creation. The former is for setting options on the root pool (zroot) and the latter is for setting options on the optional separate boot pool (bootpool) implicitly enabled when using either GELI or MBR. The default value for the root pool variable (ZFSBOOT_POOL_CREATE_OPTIONS) is "-O compress=lz4 -O atime=off" and the default value for separate boot pool variable (ZFSBOOT_BOOT_POOL_CREATE_OPTIONS) is NULL (no additional options for the separate boot pool dataset). Reviewed by: allanjude
* MFC r266780:kib2014-06-041-4/+1
| | | | Remove the assert which can be triggered by the userspace.
* MFC r266107,r266108,r266109:roberto2014-06-041-27/+108
| | | | | | | | | | | | | | | | | | | | | | | | Here is a patch for the bsdinstall root-on-zfs stuff that adds optional encryption for swap, and optional gmirror for swap (which can be combined) Updates to the datasets created by zfsboot. Set compress=lz4 for the entire pool, removing it from the individual datasets Remove exec=no from /usr/src, breaks the test suite. Fix the "disks" variable reuse. It starts off being used to track the grammar for the number of disks (singular vs plural) and then it is reused as the list of available disks. Replace the variable with disks_grammar and move 'disk' and 'disks' to msg_ vars so they can be translated in the future. Submitted by: Allan Jude <freebsd@allanjude.com> Reviewed by: roberto Sponsored by: ScaleEngine Inc.
* MFC: r266821 (partial)marius2014-06-041-4/+2
| | | | | | | | - Actually, modules are built correctly when compiled along the kernel as they then pick up an opt_global.h from KERNBUILDDIR having PAE defined. Thus, build all modules by default except those which still really are defective as of r267043. - Minor style cleanup.
* MFC: r266820 (partial)marius2014-06-041-5/+4
| | | | | | - Shrink the list of excluded modules to what actually still doesn't build as of r267043. - Some style cleanups.
* MFC r266664:hselasky2014-06-041-0/+2
| | | | | | | Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API from sourceforge. PR: usb/190204
* MFC r266798 and r266803:hselasky2014-06-041-1/+0
| | | | Fix for big-endian architectures.
* MFC: r266793, r266799, r266808marius2014-06-041-7/+8
| | | | | | | | | | | - Fix compilation with PAE support enabled by merging r233362 and, thus, doing away with the unnecessary uint8_t pointer casting. physical addresses. - Nuke the unused softc of emujoy(4). - Use DEVMETHOD_END. - Use NULL instead of 0 for pointers. Sponsored by: Bally Wulff Games & Entertainment GmbH
* MFC: r266792marius2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | Fix DMA handling in radeon_dummy_page_init(): - Based on actual usage and on what Linux does, dummy_page.addr should contain the physical bus address of the dummy page rather than its virtual one. As a side-effect, correcting this bug fixes compilation with PAE support enabled by getting rid of an inappropriate cast. - Also based on actual usage of dummy_page.addr, theoretically Radeon devices could do a maximum of 44-bit DMA. In reality, though, it is more likely that they only support 32-bit DMA, at least that is what radeon_gart_table_ram_alloc() sets up for, too. However, passing ~0 to drm_pci_alloc() as maxaddr parameter translates to 64-bit DMA on amd64/64-bit machines. Thus, use BUS_SPACE_MAXSIZE_32BIT instead, which the existing 32-bit DMA limits within the drm2 code spelled as 0xFFFFFFFF should also be changed to. Reviewed by: dumbbell Sponsored by: Bally Wulff Games & Entertainment GmbH
* MFC r266778:nwhitehorn2014-06-042-4/+4
| | | | | | | | | | Repair nested signal handling on PowerPC. The signal trampoline code was not allocating space for the parameter save area in the stack frame. If the compiler chose to save the argument to the signal handler on the stack, it would overwrite the first 32 bits of the sigaction struct with it, corrupting it for a subsequent invocation. PR: powerpc/183040
* MFC r266833:hselasky2014-06-041-27/+38
| | | | | Add some more spinlocks to protect the state of the USB transfer queue. Rename some functions to indicate locking requirements.
* MFC r266335:lwhsu2014-06-041-0/+2
| | | | | | Add axge(4) to LINT Approved by: kevlo
* MFC: r266709brueffer2014-06-031-16/+26
| | | | | | Language cleanup. Reviewed by: mav, bcr, wblock
* MFC r266605.cy2014-06-031-8/+6
| | | | | | | | Move mutex creation from ipf_log_soft_init() to ipf_log_soft_create() to be consistent with mutex destruction in ipf_log_soft_destroy(). As a result mutex destruction in ipf_log_soft_fini() is redundant. Approved by: glebius (mentor)
* Fix incorrect error handling in PAM policy parser. [SA-14:13]delphij2014-06-031-7/+33
|
* MFC r266938:rodrigc2014-06-031-0/+11
| | | | | | | | | | | | Allow customization of the brand displayed in the boot menu. If the user specifies in /boot/loader.conf: loader_brand="mycustom-brand" Then "mycustom-brand" will be executed instead of "fbsd-logo". Submitted by: alfred Obtained from: FreeNAS
* MFC r266468:mav2014-06-033-0/+3
| | | | | | Add IOMMU PCI subclass, found on Tyan S8236 motherboard. Submitted by: Dmitry Luhtionov <dmitryluhtionov@gmail.com>
* MFC r266925:dchagin2014-06-034-4/+34
| | | | | To allow to run the interpreter itself add a new ELF branding type. Allow Linux ABI to run ELF interpreter.
* MFC r266924:dchagin2014-06-031-31/+40
| | | | | | | | | | | | | | | | | Glibc was switched to the FUTEX_WAIT_BITSET op and CLOCK_REALTIME flag has been added instead of FUTEX_WAIT to replace the FUTEX_WAIT logic which needs to do gettimeofday() calls before the futex syscall to convert the absolute timeout to a relative timeout. Before this the CLOCK_MONOTONIC used by the FUTEX_WAIT_BITSET op. When the FUTEX_CLOCK_REALTIME is specified the timeout is an absolute time, not a relative time. Rework futex_wait to handle this. On the side fix the futex leak in error case and remove useless parentheses. Properly calculate the timeout for the CLOCK_MONOTONIC case. Tested by: Hans Petter Selasky
* MFC r266490, r266738:kevlo2014-06-033-246/+223
| | | | | | | | - Configure Rx bulk - Announce flow control capability to PHY drivers - Improve performance by fixing incorrect Rx/Tx handling - Rename definition of AXGE_* to reflect reality - Add new USB IDs
* MFC r266444:ae2014-06-021-0/+8
| | | | | | | | | | We have two functions from where a geom orphan method could be called: g_orphan_register and g_resize_provider_event. Both are called from the event queue. Also we have GEOM_DEV class, which does deferred destroy for its consumers via g_dev_destroy (also called from the event queue). So it is possible, that for some consumers an orphan method will be called twice. This triggers panic in g_dev_orphan. Check that consumer isn't already orphaned before call orphan method.
* MFC r266908:np2014-06-021-2/+6
| | | | | | | cxgbe(4): Fix a NULL dereference when the very first call to get_scatter_segment() in get_fl_payload() fails. While here, fix the code to adjust fl_bufs_used when a failure occurs for any other scatter segment.
* MFC r264480: mergemaster: Avoid "/var/tmp/temproot disappeared" if there isjilles2014-06-011-1/+1
| | | | | | | | | | | | | | | | | nothing to compare. Because of the change to find in SVN r253886, the entire temproot would be deleted if it became empty, leading to a confusing message "*** FATAL ERROR: The temproot directory ${TEMPROOT} has disappeared!" Note that mergemaster does not do anything useful in this situation anyway (e.g. put IGNORE_FILES="/etc/group /etc/master.passwd" in /etc/mergemaster.rc and run mergemaster -p). As noted in that commit, add -mindepth 1. PR: bin/188485 Submitted by: David Boyd
* MFC r266285,266866:bjk2014-06-011-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------------------ r266285 | bjk | 2014-05-16 23:05:52 -0400 (Fri, 16 May 2014) | 9 lines Correct documentation of the limit on how much memory can be mlock()ed vm.max_wired is a system-wide limit, not per-process. Reword the section to make this more clear. PR: docs/189214 Submitted by: Lawrence Chen (original text) Approved by: hrs (mentor) ------------------------------------------------------------------------ r266866 | bjk | 2014-05-29 22:16:28 -0400 (Thu, 29 May 2014) | 5 lines Minor mdoc fix Submitted by: hrs Approved by: hrs (mentor, implicit) ------------------------------------------------------------------------ PR: docs/189214 Approved by: hrs (mentor)
* MFC: r266270brueffer2014-05-318-20/+3
| | | | Remove some unused variables.
* MFC r266782:dchagin2014-05-311-13/+16
| | | | | | | | | | | In r218101 I have not changed properly the futex syscall definition. Some Linux futex ops atomically verifies that the futex address uaddr (uval) contains the value val. Comparing signed uval and unsigned val may lead to an unexpected result, mostly to a deadlock. So copyin uaddr to an unsigned int to compare the parameters correctly. While here change ktr records to print parameters in more readable format.
* MFC r263446hiren2014-05-318-38/+763
| | | | | Update hwpmc to support core events for Atom Silvermont microarchitecture. (Model 0x4D as per Intel document 330061-001 01/2014)
* MFC: 266209gnn2014-05-303-3/+51
| | | | | | | | Add a command line argument (-l) to end event collection after some number of seconds. The number of seconds may be a fraction. Submitted by: Julien Charbon <jcharbon@versign.com> Relnotes: yes
* MFC: 266166gnn2014-05-301-2/+2
| | | | Extend the size of the function or symbol that can be annotated.
* MFC: 266171, 266174gnn2014-05-301-5/+5
| | | | | | | Extend the size of the function or symbol that can be annotated. Update the amount of data we can collect for hwpmc(4) by default to work with modern processors and available memory.
* MFC r264235:cy2014-05-295-87/+117
| | | | | | | | | | Implement the final missing sysctls by moving ipf_auth_softc_t from ip_auth.c to ip_auth.h. ip_frag_soft_t moves from ip_frag.c to ip_frag.h. mlfk_ipl.c creates sysctl MIBs that reference control blocks that are dynamically created when IP Filter is loaded. This necessitated creating them on-the-fly rather than statically at compile time. Approved by: glebius (mentor)
OpenPOWER on IntegriCloud