Commit Graph

195714 Commits

Author SHA1 Message Date
ume
6f5c5395e9 MFH r266813: Don't break the legacy applications which set
just 2 bytes to salt.
2014-06-05 15:16:44 +00:00
marius
226f09e56e Fix mismerge in r267049 and put makeoptions DEBUG=-gdwarf-2 instead of
DEBUG=-g back.
Still, the original comment should be restored in head and then be MFCed
along with r263749.
2014-06-05 13:08:08 +00:00
delphij
4eacd73a8c Fix OpenSSL multiple vulnerabilities.
Security:	CVE-2014-0195, CVE-2014-0221, CVE-2014-0224,
		CVE-2014-3470
Security:	SA-14:14.openssl
2014-06-05 12:32:38 +00:00
marck
36860d519d MFC r266859:
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
2014-06-05 11:48:36 +00:00
mav
7fadfb7030 MFC r266538:
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>
2014-06-05 05:36:55 +00:00
wblock
b1be605bc6 MFC r266828:
Correct the description of characters allowed.  Based on pw_checkname in
usr.sbin/pw/pw_user.c.  Modified version of patch submitted by
venture37.
2014-06-05 01:20:25 +00:00
kib
4deeb9da7c MFC r266848:
Add support for the unmapped i/o to mfi(4).
2014-06-05 00:43:32 +00:00
kib
e6adf4e57f MFC r266846:
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.
2014-06-05 00:40:48 +00:00
jhb
9a61bc9a83 MFC 266281:
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
2014-06-04 18:21:33 +00:00
jhb
9464d250b6 MFC 260999:
Increase the block-layer backend maximum number of requests to match
the AHCI command queue depth.
2014-06-04 18:08:08 +00:00
jhb
79dc832193 MFC 260972:
There is no need to initialize the IOMMU if no passthru devices have been
configured for bhyve to use.
2014-06-04 17:57:48 +00:00
jhb
d820529bb0 MFC 263772: Fix build without SMP.
PR:		187854
2014-06-04 17:50:47 +00:00
roberto
3af9d4776e Fix syntax error thrown at the point of creating the root pool, caused by
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
2014-06-04 15:31:57 +00:00
kib
ff1d21a86c MFC r266780:
Remove the assert which can be triggered by the userspace.
2014-06-04 15:18:46 +00:00
roberto
912232c83b MFC r266107,r266108,r266109:
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.
2014-06-04 14:58:51 +00:00
marius
b421df8fef MFC: r266821 (partial)
- 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.
2014-06-04 12:03:51 +00:00
marius
dc8ade23a0 MFC: r266820 (partial)
- Shrink the list of excluded modules to what actually still doesn't build
  as of r267043.
- Some style cleanups.
2014-06-04 11:06:38 +00:00
hselasky
105e4e05fc MFC r266664:
Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API
from sourceforge.

PR:		usb/190204
2014-06-04 10:40:43 +00:00
hselasky
0718341c3a MFC r266798 and r266803:
Fix for big-endian architectures.
2014-06-04 10:33:30 +00:00
marius
a42890a6a4 MFC: r266793, r266799, r266808
- 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
2014-06-04 09:54:01 +00:00
marius
805e679fac MFC: r266792
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
2014-06-04 09:44:05 +00:00
nwhitehorn
722f33f118 MFC r266778:
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
2014-06-04 06:21:54 +00:00
hselasky
fc10e3fceb MFC r266833:
Add some more spinlocks to protect the state of the USB transfer
queue. Rename some functions to indicate locking requirements.
2014-06-04 06:15:45 +00:00
lwhsu
818690b07d MFC r266335:
Add axge(4) to LINT

Approved by:	kevlo
2014-06-04 03:03:34 +00:00
brueffer
51dec3635e MFC: r266709
Language cleanup.

Reviewed by:	mav, bcr, wblock
2014-06-03 19:25:39 +00:00
cy
9def490ad1 MFC r266605.
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)
2014-06-03 19:06:47 +00:00
delphij
e1c5226357 Fix incorrect error handling in PAM policy parser. [SA-14:13] 2014-06-03 19:02:18 +00:00
rodrigc
ca2a1ac305 MFC r266938:
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
2014-06-03 14:50:51 +00:00
mav
40e2c2f2d8 MFC r266468:
Add IOMMU PCI subclass, found on Tyan S8236 motherboard.

Submitted by:	Dmitry Luhtionov <dmitryluhtionov@gmail.com>
2014-06-03 06:48:35 +00:00
dchagin
e871acf5e4 MFC r266925:
To allow to run the interpreter itself add a new ELF branding type.
Allow Linux ABI to run ELF interpreter.
2014-06-03 04:31:42 +00:00
dchagin
403ddf0c10 MFC r266924:
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
2014-06-03 04:29:26 +00:00
kevlo
a879e1050f MFC r266490, r266738:
- 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
2014-06-03 01:39:55 +00:00
ae
af0a9c5a59 MFC r266444:
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.
2014-06-02 10:14:03 +00:00
np
7bdc535062 MFC r266908:
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.
2014-06-02 05:01:08 +00:00
jilles
5b93c96241 MFC r264480: mergemaster: Avoid "/var/tmp/temproot disappeared" if there is
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
2014-06-01 18:52:21 +00:00
bjk
5eb02565b3 MFC r266285,266866:
------------------------------------------------------------------------
    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)
2014-06-01 18:41:33 +00:00
brueffer
aa8badda28 MFC: r266270
Remove some unused variables.
2014-05-31 11:08:22 +00:00
dchagin
2cd37748cf MFC r266782:
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.
2014-05-31 05:59:55 +00:00
hiren
21dae9b420 MFC r263446
Update hwpmc to support core events for Atom Silvermont microarchitecture.
(Model 0x4D as per Intel document 330061-001 01/2014)
2014-05-31 00:40:13 +00:00
gnn
cc6785bd5f MFC: 266209
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
2014-05-30 15:02:29 +00:00
gnn
96656f614a MFC: 266166
Extend the size of the function or symbol that can be annotated.
2014-05-30 15:00:50 +00:00
gnn
596189a0ee MFC: 266171, 266174
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.
2014-05-30 14:58:06 +00:00
cy
1c777cb932 MFC r264235:
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)
2014-05-29 02:55:07 +00:00
delphij
fd2ac9967d MFC r265995:
Switch using the new $2b$ format by default, when bcrypt is used.

Relnotes:	default Blowfish crypt(3) format have been changed to $2b$.
2014-05-28 18:51:49 +00:00
marck
207aa6a18b MFC: r266483
Document VMware-related filesystems additions.

	Reviewed by:	jmg
2014-05-28 15:02:42 +00:00
marius
9dc1c50248 MFC: r264177
Make some unwise casts. On i386 these casts wind up being safe. Rather
than disturb the API, go with these casts to shut gcc up.
2014-05-28 09:06:36 +00:00
dim
357551c7e1 MFC r266674:
Pull in r209489 from upstream clang trunk (by Akira Hatanaka):

  Fix a bug in xmmintrin.h.

  The last step of _mm_cvtps_pi16 should use _mm_packs_pi32, which is a function
  that reads two __m64 values and packs four 32-bit values into four 16-bit
  values.

  <rdar://problem/16873717>
2014-05-28 06:38:42 +00:00
delphij
c49d771309 MFC r266520:
Explicitly link libzfs against libavl as it is done in OpenSolaris
(4543:12bb2876a62e).  Without this, some third party applications
may break because the lack of AVL related symbols.

FreeBSD base system are not affected because the FreeBSD ZFS command
line tools were all linked against libavl and thus hide the underlying
issue.

PR:	bin/183081
2014-05-27 18:22:52 +00:00
ian
4be89b4268 MFC 266621: Eliminte spurious interrupts caused by ARM weak memory ordering. 2014-05-27 16:17:25 +00:00
ian
ffc031ceb6 MFC r264096, r264097, r264099 r264100, r264101, r264102, r264119:
Fixes to the ti_sdhci and sdhci drivers (fix clock divisor calcs).

Use the ti_sdhci driver instead of ti_mmchs for Pandaboard.
2014-05-27 15:30:24 +00:00