Commit Graph

194919 Commits

Author SHA1 Message Date
glebius
f937dcf2bd Bulk sync of pf changes from head, in attempt to fixup broken build I
made in r263029.

Merge r257186,257215,257349,259736,261797.

These changesets split pfvar.h into several smaller headers and make
userland utilities to include only some of them.
2014-03-12 10:45:58 +00:00
hselasky
eeff801556 MFC r262732:
Add new quirk.

PR:             usb/187188
2014-03-12 08:32:01 +00:00
hselasky
94dc79faf2 MFC r262795:
- Temporary fix for race in RUN driver which can
cause freed memory to be accessed.
- Properly lock callout_reset()'s.
2014-03-12 08:25:25 +00:00
hselasky
2e7d226fc3 MFC r262477:
Updates for WSP driver.
2014-03-12 08:23:27 +00:00
brueffer
8a10179d87 MFC: r261710
Only count table lookups when we're actually processing packets.

PR:		183462
Submitted by:	Sven-Thorsten Dietrich <thebigcorporation at gmail.com>
Reviewed by:	bms
2014-03-12 08:15:15 +00:00
mav
b589beb47e MFC r262789, r262847:
Remove custom bus scanner code and fix use of CAM's default scanner.

This fixes kernel panic during boot, caused by incompatibility of recent
CAM locking changes and this bus scanner code.

Submitted by:	Microsoft
2014-03-12 07:27:05 +00:00
hselasky
cc379b8b7b MFC r262417, r262439, r262454, r262455 and r262478:
- Several updates and improvements to ATP driver.
- Start effort merging WSP and ATP driver.
2014-03-12 07:15:41 +00:00
edwin
6aa8774c6d MFC of 263041, tzdata2014a:
- Fix historical info about asia/Zion, Ukraine
- Fiji starts DST at 02:00 instead of 03:00
- Turkey will move to DST at 31 March this year.
2014-03-11 20:47:01 +00:00
glebius
71d3a4f585 Merge r261882, r261898, r261937, r262760, r262799:
Once pf became not covered by a single mutex, many counters in it became
  race prone. Some just gather statistics, but some are later used in
  different calculations.

  A real problem was the race provoked underflow of the states_cur counter
  on a rule. Once it goes below zero, it wraps to UINT32_MAX. Later this
  value is used in pf_state_expires() and any state created by this rule
  is immediately expired.

  Thus, make fields states_cur, states_tot and src_nodes of struct
  pf_rule be counter(9)s.
2014-03-11 15:43:06 +00:00
jhb
cbdb898ddf MFC 261030:
Similar to cap_mkdb(1), add endianness support to services_mkdb(1)
to support cross-builds once this is invoked during releases.
2014-03-11 15:28:41 +00:00
glebius
6f16f3acfd Merge r261029: remove NULL pointer dereference. 2014-03-11 15:20:47 +00:00
glebius
c517ab4bf1 Merge r261028: fix resource leak and simplify code for DIOCCHANGEADDR. 2014-03-11 15:19:11 +00:00
glebius
67ee44d895 Merge r261169: Fix compilation with IGB_LEGACY_TX defined.
PR:		185909
2014-03-11 15:17:04 +00:00
achim
d9fd2797e5 MFC r257847, r260243: Update aacraid to version 3.2.5.
Approved by:	emaste (co-mentor)
2014-03-11 14:59:34 +00:00
jhb
c157604f42 MFC 261243:
Some BIOSes incorrectly use standard memory resource ranges to list
the memory ranges that they decode for downstream devices rather than
creating ResourceProducer range resource entries.  The result is that
we allocate the full range to the PCI root bridge device causing
allocations in child devices to all fail.

As a workaround, ignore any standard memory resources on a PCI root
bridge device.  It is normal for a PCI root bridge to allocate an I/O
resource for the I/O ports used for PCI config access, but I have not
seen any PCI root bridges that legitimately allocate a memory resource.
2014-03-11 14:33:42 +00:00
bapt
cc2de0e857 r262400,r262401,r262418
Sync pkg(7) with head
2014-03-11 13:16:03 +00:00
bapt
f5e5e1abc3 MFC: r262398,r262399,r262410,r262975
Import libucl into head

UCL is heavily infused by nginx configuration as the example of a convenient
configuration system. However, UCL is fully compatible with JSON format and is
able to parse json files.

UCL is used by pkg(8) for its configuration file as well for the manifest format
in packages, it will be used in base for the pkg boostrap (signature checking
and configuration file parsing.)

libucl has been developped and is maintained by vsevolod@
2014-03-11 13:06:09 +00:00
jhay
a8ce2796e7 MFC r262020:
Make it possible to use the env kernel config file option for AVILA
and CAMBRIA boards that does not use loader to load the kernel. This
is basically how it was done for i386. This way tunables can also be
set. For example in config file:

env "/conf/AVILA.env"

And in AVILA.env:

vfs.unmapped_buf_allowed=0
2014-03-11 12:58:45 +00:00
jhay
817ea2b238 MFC r262036
etcupdate should use the src tree from where the release is built, not
the default (/usr/src) tree.
2014-03-11 12:04:58 +00:00
kevlo
9b70439221 MFC r262822:
Fix a logic error when enabling MAC.
2014-03-11 07:33:33 +00:00
rpaulo
f0f92bba4e MFC r262930
Call ieee80211_dump_pkt() based on IFF_DUMPPKTS().
2014-03-11 05:58:52 +00:00
jkim
b04308525e MFC: r262746, r262748, r262750, r262752
Move fpusave() wrapper for suspend hander to sys/amd64/amd64/fpu.c.
2014-03-10 20:47:24 +00:00
markj
7086b821e4 MFC r261535:
Add support for MegaRAID Fury cards. The main change needed to boot from a
9341-4i controller was to ensure that scatter/gather lists are ended with
an end-of-list marker. Both the mrsas and Linux megaraid_sas drivers use
this marker with Invader cards as well, so we do the same thing, though
it is apparently not strictly necessary.

PR:		187312
2014-03-10 02:31:50 +00:00
eadler
4ff78f8cbc MFC r262890:
libc man pages: Remove reference to non-existent FreeBSD Security
	Architecture
2014-03-10 00:53:37 +00:00
ache
5da4ff2e94 MFC r262689:
Add fetch and patch to .PHONY and .NOTMAIN only if PORTNAME is defined.
Unconditional addition cause real fetch(1) and patch(1) programs are
builded every time.
2014-03-09 23:47:34 +00:00
dim
e1a0ecea9b MFC r262805:
Pull in r199848 from upstream libc++ trunk:

  Const qualify __mem_fn call operator

  QOI improvement.

  Differential Revision: http://llvm-reviews.chandlerc.com/D2059

This should help with building recent versions of Mesa.  See also:
https://bugs.freedesktop.org/show_bug.cgi?id=75505

Reported by:	dumbbell
2014-03-09 21:02:23 +00:00
jmmv
80efbcbbcd Sync sh(1) in stable/10 to head.
This is a MFC of all the commits listed below.

My original goal of this change was to only merge the move of the tests
from tools/regression/bin/ into the new layout (which include tests for
sh(1) and other tools as well).  However, doing so is tricky due to the
ongoing work in sh(1) and, especially, the many changes to its tests
since stable/10 was first branched.

Merging everything is the simplest way to achieve this goal and, as a
bonus point, we get various fixes and miscellaneous improvements into
the branch.

Per jilles' suggestion, I'm avoiding the merge of a couple of changes
(r256850 and r257506) that required depending kernel changes.  I'm also
avoiding very recent changes that have not had a long enough time to be
validated in current.

This is "make tinderbox" clean.

r256735	sh: Remove one syscall when waiting for a foreground job.
r257399	sh: Allow trapping SIGINT/SIGQUIT after ignore because of '&'.
r257504	sh: Reorder union node to reduce its size on 64-bit platforms.
r257920	sh: Add a test case for would-be assignments that are not due to quoting.
r257929	sh: Properly quote alias output from command -v.
r258489	sh: Add tests for the </dev/null implicit in a background command.
r258533	sh: Add more tests for the </dev/null implicit in a background command.
r258535	sh: Make <&0 disable the </dev/null implicit in a background command.
r258776	sh: Prefer memcpy() to strcpy() in most cases. Remove the scopy macro.
r259047	sh: Split set -x output into a separate function.
r259210	Migrate tools/regression/bin/ tests to the new layout.
r259844	sh: Remove an unused variable.
r259846	sh: Initialize OPTIND=1 even if it came from the environment.
r259874	sh: Simplify code related to PPID variable.
r259946	sh: Don't check input for non-whitespace if history is disabled.
r260246	sh(1): Discourage use of -e.
r260506	Run the sh(1) and test(1) tests as unprivileged.
r260586	Mark the bin/pax tests as requiring perl.
r260634	Use TAP_TESTS_PERL to register the legacy_test in bin/pax.
r260635	Replace hand-crafted Kyuafiles with automatic generation.
r260654	sh: Remove SIGWINCH handler and just check for resize before every read.
r261121	sh: Add test for nested alias.
r261125	sh: Solve the alias recursion problem in a less hackish way.
r261141	sh: Do not depend on parse/execute split in new alias test.
r261160	sh: Add tests for alias names after another alias.
r261192	sh: Allow aliases to force alias substitution on the following word.
r262533	sh: Make expari() static.
r262565	sh: Do not corrupt internal representation if LINENO inner expansion fails.
r262697	sh: Simplify expari().

Reviewed by:	jilles
2014-03-09 17:04:31 +00:00
rwatson
f3010cfb7d Merge r262690 from head to stable/10:
When querying a process's umask via sysctl in libprocstat(), don't
  print a warning if EPERM is returned as this is an expected failure
  mode rather than error -- similar to current handling of ESRCH.
  This makes the output of 'procstat -as' vastly more palatable.

  Sponsored by: DARPA, AFRL
2014-03-09 13:23:49 +00:00
pfg
d439a6998f MFC r262869:
ext2fs: Fix a bug when sorting htree entries.

This a typo introduced when bringing the original code from NetBSD.

Reported by:	Mike Ma
2014-03-09 04:16:00 +00:00
brueffer
b3a8c13b83 MFC: r262333
Simplify the way the end of a singly linked list is followed (for adding
items), so it is more obvious that we aren't going to indirect through
a NULL pointer.

PR:		144723
Submitted by:	Garrett Cooper <yaneurabeya at gmail.com>
Obtained from:	NetBSD r1.19
2014-03-08 12:24:47 +00:00
eadler
9ccdbaa535 MFC r262645,r262647:
ssh-copy-id: avoid sending private keys; add -v option

To help avoid confusion: when attempting to send a key file check to see if a
	file of the same name exists with a '.pub' suffix and send that instead.  This
	mimics the behavior of other ssh-copy-id scripts.

	Add -v passthrough.

ssh-copy-id: add restorecon call

	In certain situations when creating an authorized_key file on a Linux machine
	restorecon(1) may need to be called.  Therefore, attempt to run it if it exists.
2014-03-08 03:54:49 +00:00
jilles
a48226bb43 MFC r261859: fts: Fix double-free with conflicting concurrent modifications.
If rare conditions such as concurrent conflicting manipulation of the
filesystem occur, fts_read() frees the current FTSENT without adjusting
the pointers in the FTS accordingly. A later fts_close() then frees the
same FTSENT again.
2014-03-07 16:43:08 +00:00
jhb
a887dd1976 Bump __FreeBSD_version for the MFC of vt(4).
Submitted by:	Koop Mast
2014-03-07 14:44:13 +00:00
brueffer
9cff8027cb MFC: r262603
mdoc cleanup.
2014-03-07 12:20:01 +00:00
asomers
ca8eab6508 MFC r262133
test_eagain_*_* should've been using nonblocking sockets instead of blocking
sockets.  The error was not exposed as long as the kernel suffered from PR
kern/185812.  Now corrected, these tests pass on DragonFlyBSD 3.6.0.
2014-03-06 21:47:22 +00:00
jhb
59b6242e90 MFC 259016,259019,259049,259071,259102,259110,259129,259130,259178,259179,
259203,259221,259261,259532,259615,259650,259651,259667,259680,259727,
259761,259772,259776,259777,259830,259882,259915,260160,260449,260450,
260688,260888,260953,261269,261547,261551,261552,261553,261585:
Merge the vt(4) driver (newcons) to stable/10.

Approved by:	ray
2014-03-06 18:30:56 +00:00
jmmv
fe643776c1 Import atf-0.20.
This is a MFC of r261897 and r262000 and should allow all of the atf
tests to pass.
2014-03-06 14:11:44 +00:00
jmmv
6c6bd8779d Install a symlink from /usr/tests/local to /usr/local/tests.
This is a MFC of r261959 and r261978.
2014-03-06 13:38:23 +00:00
mav
dbd9b17275 MFC r262575:
Restore SIM freeze/release match, broken at r253549.

This fixes problem with SIM left in frozen state after reinit, for example,
after firmware update.
2014-03-06 13:37:34 +00:00
jmmv
74e392eb6c MFC a couple of improvements to the test suite mk files.
- r260632 Support defining test program metadata from the Makefiles.
- r260633 Support perl-based TAP-compliant test programs.
2014-03-06 13:30:36 +00:00
mav
ccebcfd33b MFC r262553:
Pass proper pointer to bus_dmamem_free() in mps_iocfacts_free().

Passing there pointer into the middle of allocated area caused kernel
panic during reinit, for example, after firmware upgrade.
2014-03-06 13:24:51 +00:00
jmmv
16411e2c80 MFC various fixes for the ATF tests.
- r260505 Allow tests to provide a Kyuafile when they relied on auto-generation.
- r260525 Respect the original layout of the atf-{c,c++} tests.
- r260526 Fix path to the process_helpers for the libatf-c++ tests.
- r260576 Generate and install pkg-config files for atf.
- r260577 Add atf pkg-config files from the vendor branch.
- r260584 Prevent misc_helpers from running as a test.
2014-03-06 13:20:38 +00:00
brueffer
1d275c07c2 MFC: r262571
Add missing includes and remove two unused ones.

Reviewed by:	loos
2014-03-06 13:15:53 +00:00
trasz
2e120a0184 MFC r261748:
So, it turns out SIGCHLD is discarded by default, so we have to set up
a dummy handler to make it interrupt an ioctl(2) or select(2).

This makes those short-lived iscsid(8) zombies disappear.

Sponsored by:	The FreeBSD Foundation
2014-03-06 11:15:54 +00:00
trasz
222c71033f MFC r261747:
Empty data segment during Login Phase is rather unlikely, but it's not
a protocol error.

Sponsored by:	The FreeBSD Foundation
2014-03-06 11:14:36 +00:00
trasz
80217e6e6e MFC r261715:
The log_whatever() routines don't accept NULL for format strings,
so mark them as __printflike instead of __printf0like.

Sponsored by:	The FreeBSD Foundation
2014-03-06 11:13:26 +00:00
trasz
32f8fd7b16 MFC r262525:
There is no need to prevent iscsictl from adding iSER session when there
is no iSER support in ctld and/or kernel; should the user make that mistake,
the output from "iscsictl -L" is enough to determine what the problem is.

Sponsored by:	The FreeBSD Foundation
2014-03-06 11:10:57 +00:00
trasz
634638377a MFC r262247:
Make it clear that there are two ways to add a session using iscsictl(8),
and some options require configuration file.

Sponsored by:	The FreeBSD Foundation
2014-03-06 11:09:46 +00:00
trasz
9cc265a090 MFC r261714:
Make iscsictl(8) properly handle (optional) semicolons in iscsi.conf,
instead of ignoring them and echoing them to stdout.

Sponsored by:	The FreeBSD Foundation
2014-03-06 11:07:51 +00:00
trasz
b379e28a77 MFC r261713:
Simplify.

Sponsored by:	The FreeBSD Foundation
2014-03-06 11:05:35 +00:00