4863 Commits

Author SHA1 Message Date
kevlo
aeb145cca6 MFC r285669:
Since the IETF has redefined the meaning of the tos field to accommodate
a set of differentiated services, set IPTOS_PREC_* macros using
IPTOS_DSCP_* macro definitions.

While here, add IPTOS_DSCP_VA macro according to RFC 5865.

Differential Revision:	https://reviews.freebsd.org/D3119
Reviewed by:	gnn
2015-07-31 03:40:09 +00:00
eri
3082d2efe1 MFC 285325
Correct issue presented in r285051 by properly initializing variable.

Differential Revision:	 https://reviews.freebsd.org/D3036
2015-07-29 17:50:14 +00:00
eri
b2cc8257fa MFC r285051
Avoid doing multiple route lookups for the same destination IP during forwarding.

Differential Revision:	https://reviews.freebsd.org/D2964
2015-07-29 17:46:16 +00:00
delphij
d3ecbb9019 Fix patch(1) shell injection vulnerability. [SA-15:14]
Fix resource exhaustion in TCP reassembly. [SA-15:15]

Fix OpenSSH multiple vulnerabilities. [SA-15:16]
2015-07-28 19:58:44 +00:00
hiren
141df3ac09 MFC r284941:
Avoid a situation where we do not set persist timer after a zero window
condition.
If you send a 0-length packet, but there is data is the socket buffer, and
neither the rexmt or persist timer is already set, then activate the persist
timer.

PR:		192599
Approved by:	re (delphij)
2015-07-22 15:05:45 +00:00
delphij
457165363e Fix resource exhaustion due to sessions stuck in LAST_ACK state.
Security:	CVE-2015-5358
Security:	SA-15:13.tcp
Submitted by:	Jonathan Looney (Juniper SIRT)
Approved by:	re (so blanket)
2015-07-21 23:42:17 +00:00
pkelsey
04fd70b7f2 MFC r285567:
Check TCP timestamp option flag so that the automatic receive buffer
scaling code does not use an uninitialized timestamp echo reply value
from the stack when timestamps are not enabled.

Approved by: re (gjb)
2015-07-21 18:38:31 +00:00
eri
5d11dcc720 MFC r284512: Properly handle locking on the ARP protocol request sending. 2015-06-24 19:06:54 +00:00
tuexen
b52cec9e00 MFC r284596:
When setting the primary address, return an error whenever it fails.
2015-06-22 05:34:13 +00:00
tuexen
094ec02dc8 MFC r284526:
Fix a bug related to flow assignment I introduced in
https://svnweb.freebsd.org/base?view=revision&revision=275483
2015-06-20 08:28:47 +00:00
tuexen
103d48d60e MFC r284515:
Add FIB support for SCTP.
This fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200379

PR:	200379
2015-06-20 08:25:27 +00:00
hiren
4aefd42d20 MFC r266420 (by adrian)
Ensure that the flowid hashtype is assigned to the inp if the flowid
is also assigned.

Spotted by:	gallatin
Tested by:	gallatin
2015-06-19 19:36:21 +00:00
tuexen
6d0b3bca71 MFC r284393:
Correctly detect the case where the last address is removed.
2015-06-17 09:44:02 +00:00
tuexen
1c50eac2f6 MFC r284384:
Stop the heartbeat timer when removing a net.
Thanks to the reporter of
https://code.google.com/p/sctp-refimpl/issues/detail?id=14
for reporting the issue.
2015-06-17 09:39:40 +00:00
hselasky
27c0e6c5bd MFC r280991:
Extend fixes made in r278103 and r38754 by copying the complete packet
header and not only partial flags and fields. Firewalls can attach
classification tags to the outgoing mbufs which should be copied to
all the new fragments. Else only the first fragment will be let
through by the firewall. This can easily be tested by sending a large
ping packet through a firewall. It was also discovered that VLAN
related flags and fields should be copied for packets traversing
through VLANs. This is all handled by "m_dup_pkthdr()".

Regarding the MAC policy check in ip_fragment(), the tag provided by
the originating mbuf is copied instead of using the default one
provided by m_gethdr().

Tested by:		Karim Fodil-Lemelin <fodillemlinkarim at gmail.com>
Sponsored by:		Mellanox Technologies
PR:			7802
2015-06-17 07:21:43 +00:00
tuexen
7a06d6261d MFC r284332:
Fix the reporting of the PMTUD state for specific paths.
2015-06-16 08:26:33 +00:00
tuexen
5e6d50bc8c MFC r284331:
Code cleanup.
2015-06-16 08:24:08 +00:00
tuexen
74eb079379 MFC r284326:
In case of an output error, continue with the next net, don't try to
continue sending on the same net.

This fixes a bug where an invalid mbuf chain was constructed, if a
full size frame of control chunks should be sent and there is a
output error.

Based on a discussion with rrs@, change move to the next net. This fixes
the bug and improves the behaviour.

Thanks to Irene Ruengeler for spending a lot of time in narrowing this
problem down.
2015-06-16 08:21:58 +00:00
jch
c82317e784 MFC r284245:
Fix a callout race condition introduced in TCP timers callouts with r281599.
In TCP timer context, it is not enough to check callout_stop() return value
to decide if a callout is still running or not, previous callout_reset()
return values have also to be checked.
2015-06-11 13:44:06 +00:00
tuexen
8b8722aae0 MFC r283988:
Export a pointer to the SCTP socket. This is needed to add SCTP support
to sockstat.
2015-06-08 07:06:33 +00:00
ian
ac9f7bc3c6 MFC r279236:
Change struct attribute to avoid aligned operations mismatch
  Previous __alignment(4) allowed compiler to assume that operations are
  performed on aligned region. On ARM processor, this led to alignment fault
2015-06-06 20:14:58 +00:00
ae
f1be259e6a MFC r276148:
Remove in_gif.h and in6_gif.h files. They only contain function
  declarations used by gif(4). Instead declare these functions in C files.
  Also make some variables static.

MFC r276215:
  Extern declarations in C files loses compile-time checking that
  the functions' calls match their definitions. Move them to header files.
2015-06-06 13:26:13 +00:00
ae
920800a21f MFC r274246:
Overhaul if_gre(4).

  Split it into two modules: if_gre(4) for GRE encapsulation and
  if_me(4) for minimal encapsulation within IP.

  gre(4) changes:
  * convert to if_transmit;
  * rework locking: protect access to softc with rmlock,
    protect from concurrent ioctls with sx lock;
  * correct interface accounting for outgoing datagramms (count only payload size);
  * implement generic support for using IPv6 as delivery header;
  * make implementation conform to the RFC 2784 and partially to RFC 2890;
  * add support for GRE checksums - calculate for outgoing datagramms and check
    for inconming datagramms;
  * add support for sending sequence number in GRE header;
  * remove support of cached routes. This fixes problem, when gre(4) doesn't
    work at system startup. But this also removes support for having tunnels with
    the same addresses for inner and outer header.
  * deprecate support for various GREXXX ioctls, that doesn't used in FreeBSD.
    Use our standard ioctls for tunnels.

  me(4):
  * implementation conform to RFC 2004;
  * use if_transmit;
  * use the same locking model as gre(4);

  PR:		164475

MFC r274289 (by bz):
  gcc requires variables to be initialised in two places.  One of them
  is correctly  used only under the same conditional though.

  For module builds properly check if the kernel supports INET or INET6,
  as otherwise various mips kernels without IPv6 support would fail to build.

MFC r274964:
  Add ip_gre.h to ObsoleteFiles.inc.
2015-06-06 12:44:42 +00:00
ae
c84e575eec MFC r271918 (by hrs):
- Virtualize interface cloner for gre(4).  This fixes a panic when destroying
    a vnet jail which has a gre(4) interface.

  - Make net.link.gre.max_nesting vnet-local.
2015-06-05 08:10:08 +00:00
ae
fcbaea9548 MFC r275392:
Remove route chaching support from ipsec code. It isn't used for some time.
  * remove sa_route_union declaration and route_cache member from struct secashead;
  * remove key_sa_routechange() call from ICMP and ICMPv6 code;
  * simplify ip_ipsec_mtu();
  * remove #include <net/route.h>;

Sponsored by:	Yandex LLC
2015-06-02 03:14:42 +00:00
ae
8272d42d32 MFC r282965:
Add an ability accept encapsulated packets from different sources by one
  gif(4) interface. Add new option "ignore_source" for gif(4) interface.
  When it is enabled, gif's encapcheck function requires match only for
  packet's destination address.

  Differential Revision:	https://reviews.freebsd.org/D2004
  Sponsored by:	Yandex LLC
2015-05-31 22:58:41 +00:00
tuexen
baef3fdea0 MFC r283691:
Remove printf() noise...
2015-05-31 13:07:22 +00:00
tuexen
5cacc4c33e MFC r283666:
Report the MTU consistently as specified in
https://tools.ietf.org/html/rfc6458
Thanks to Irene Ruengeler for helping me to fix this bug.
2015-05-31 13:04:38 +00:00
tuexen
bbe91198b3 MFC r283665:
Take source and destination address into account when determining
the scope.
This fixes a problem when a client with a global address
connects to a server with a private address.
Thanks to Irene Ruengeler in helping me to find the issue.
2015-05-31 13:01:58 +00:00
tuexen
3a8e5cd397 MFC r283664:
Retire SCTP_DONT_DO_PRIVADDR_SCOPE which was never defined.
2015-05-31 12:59:22 +00:00
tuexen
f2a969c70c MFC r283662:
Fix a bug where messages would not be sent in SHUTDOWN_RECEIVED state.
This problem was reported by Mark Bonnekessel and Markus Boese.
Thanks to Irene Ruengeler for helping me to fix the cause of
the problem. It can be tested with the following packetdrill script:

+0.0 socket(..., SOCK_STREAM, IPPROTO_SCTP) = 3
+0.0 fcntl(3, F_GETFL) = 0x2 (flags O_RDWR)
+0.0 fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0
// Check the handshake with an empty(!) cookie
+0.1 connect(3, ..., ...) = -1 EINPROGRESS (Operation now in progress)
+0.0 > sctp: INIT[flgs=0, tag=1, a_rwnd=..., os=..., is=..., tsn=0, ...]
+0.1 < sctp: INIT_ACK[flgs=0, tag=2, a_rwnd=10000, os=1, is=1, tsn=0, STATE_COOKIE[len=4, val=...]]
+0.0 > sctp: COOKIE_ECHO[flgs=0, len=4, val=...]
+0.1 < sctp: COOKIE_ACK[flgs=0]
+0.0 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
+0.0 write(3, ..., 1024) = 1024
+0.0 > sctp: DATA[flgs=BE, len=1040, tsn=0, sid=0, ssn=0, ppid=0]
+0.0 write(3, ..., 1024) = 1024 // Pending due to Nagle
+0.0 < sctp: SHUTDOWN[flgs=0, cum_tsn=0]
+0.0 > sctp: DATA[flgs=BE, len=1040, tsn=1, sid=0, ssn=1, ppid=0]
+0.0 < sctp: SACK[flgs=0, cum_tsn=1, a_rwnd=10000, gaps=[], dups=[]] // Do we need another SHUTDOWN here?
+0.0 > sctp: SHUTDOWN_ACK[flgs=0]
+0.0 < sctp: SHUTDOWN_COMPLETE[flgs=0]
+0.0 close(3) = 0
2015-05-31 12:56:22 +00:00
tuexen
c07a13950d MFC r283658:
Use macros for overhead in a consistent way. No functional change.
Thanks to Irene Ruengeler for suggesting the change.
2015-05-31 12:53:16 +00:00
tuexen
4cc7a6bb7a MFC r283654:
Some more debug info cleanup.
2015-05-31 12:50:10 +00:00
tuexen
beb47cc587 MFC r283650:
Fix and cleanup the debug information. This has no user-visible changes.
Thanks to Irene Ruengeler for proving a patch.
2015-05-31 12:46:40 +00:00
tuexen
b583c15e81 MFC r283648:
Address some compiler warnings. No functional change.
2015-05-31 12:42:34 +00:00
tuexen
09fd91eb46 MFC r282810:
Ensure that the COOKIE-ACK can be sent over UDP if the COOKIE-ECHO was
received over UDP.
Thanks to Felix Weinrank for makeing me aware of the problem and to
Irene Ruengeler for providing the fix.
2015-05-29 13:37:04 +00:00
tuexen
a2dbf980ab MFC r282042:
Don't panic under INVARIANTS when receiving a SACK which cumacks
a TSN never sent.
While there, fix two typos.
2015-05-29 13:34:31 +00:00
tuexen
65d8b9f172 MFC r280714:
Improve the selection of the destination address of SACK chunks.
This fixes
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196755
and is joint work with rrs@.
2015-05-29 13:26:05 +00:00
tuexen
443fcce7c9 MFC r280642:
Make sure that we don't free an SCTP shared key too early.
Thanks to Pouyan Sepehrdad from Qualcomm Product Security Initiative
for reporting the issue.
2015-05-29 13:23:16 +00:00
tuexen
6fa1d035cb MFC r280634:
Use the reference count of the right SCTP inp.
Joint work with rrs@
2015-05-29 13:20:39 +00:00
tuexen
6e64233ed9 MFC r280459:
Fix two bugs which resulted in a screwed up end point list:
* Use a save way to walk throught a list while manipulting it.
* Have to appropiate locks in place.
Joint work with rrs@
2015-05-29 13:18:10 +00:00
tuexen
d8c5ad4ada MFC r280440:
Fix the bug in the handling of fragmented abandoned SCTP user messages reported in
https://code.google.com/p/sctp-refimpl/issues/detail?id=11
Thanks to Lally Singh for reporting it.
2015-05-29 13:13:12 +00:00
tuexen
ae995cba15 MFC r280439:
Fix an accounting bug related to the per stream chunk counter.
While there, don't refer to a net articifically.
2015-05-29 13:11:13 +00:00
tuexen
b42d72caa3 MFC r280404:
When an ICMP message is received and the MTU shrinks, only
mark outstanding chunks for retransmissions.
2015-05-29 13:08:43 +00:00
tuexen
d21c3896b9 MFC r280371:
Remove a useless assignment.
2015-05-29 13:06:15 +00:00
tuexen
a29e8c28ca MFC r279886:
Fix the adaptation of the path state when thresholds are changed
using the SCTP_PEER_ADDR_THLDS socket option.
2015-05-29 13:02:00 +00:00
tuexen
16fb87c63d MFC r279867:
Keep track on the socket lock state. This fixes a bug showing up on
Mac OS X.
2015-05-29 12:59:18 +00:00
tuexen
b21153d463 MFC r279863:
Unlock the stcb when using setsockopt() for the SCTP_PEER_ADDR_THLDS option.
2015-05-29 12:57:04 +00:00
tuexen
10635a0e4c MFC r279859:
Add a SCTP socket option to limit the cwnd for each path.
2015-05-29 12:54:30 +00:00
tuexen
44f9f670c9 MFC r279841:
Fix a typo.
2015-05-29 12:50:53 +00:00