Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Mar 2017 22:05:18 +0000
From:      bugzilla-noreply@freebsd.org
To:        freebsd-net@FreeBSD.org
Subject:   [Bug 212018] Enable IPSEC_NAT_T in GENERIC kernel configuration
Message-ID:  <bug-212018-2472-XHoGc4I0qA@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-212018-2472@https.bugs.freebsd.org/bugzilla/>
References:  <bug-212018-2472@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D212018

--- Comment #6 from commit-hook@freebsd.org ---
A commit references this bug:

Author: ae
Date: Sat Mar 18 22:04:22 UTC 2017
New revision: 315514
URL: https://svnweb.freebsd.org/changeset/base/315514

Log:
  MFC r304572 (by bz):
    Remove the kernel optoion for IPSEC_FILTERTUNNEL, which was deprecated
    more than 7 years ago in favour of a sysctl in r192648.

  MFC r305122:
    Remove redundant sanity checks from ipsec[46]_common_input_cb().

    This check already has been done in the each protocol callback.

  MFC r309144,309174,309201 (by fabient):
    IPsec RFC6479 support for replay window sizes up to 2^32 - 32 packets.

    Since the previous algorithm, based on bit shifting, does not scale
    with large replay windows, the algorithm used here is based on
    RFC 6479: IPsec Anti-Replay Algorithm without Bit Shifting.
    The replay window will be fast to be updated, but will cost as many bits
    in RAM as its size.

    The previous implementation did not provide a lock on the replay window,
    which may lead to replay issues.

    Obtained from:      emeric.poupon@stormshield.eu
    Sponsored by:       Stormshield
    Differential Revision:      https://reviews.freebsd.org/D8468

  MFC r309143,309146 (by fabient):
    In a dual processor system (2*6 cores) during IPSec throughput tests,
    we see a lot of contention on the arc4 lock, used to generate the IV
    of the ESP output packets.

    The idea of this patch is to split this mutex in order to reduce the
    contention on this lock.

    Update r309143 to prevent false sharing.

    Reviewed by:        delphij, markm, ache
    Approved by:        so
    Obtained from: emeric.poupon@stormshield.eu
    Sponsored by:       Stormshield
    Differential Revision:      https://reviews.freebsd.org/D8130

  MFC r313330:
    Merge projects/ipsec into head/.

     Small summary
     -------------

    o Almost all IPsec releated code was moved into sys/netipsec.
    o New kernel modules added: ipsec.ko and tcpmd5.ko. New kernel
      option IPSEC_SUPPORT added. It enables support for loading
      and unloading of ipsec.ko and tcpmd5.ko kernel modules.
    o IPSEC_NAT_T option was removed. Now NAT-T support is enabled by
      default. The UDP_ENCAP_ESPINUDP_NON_IKE encapsulation type
      support was removed. Added TCP/UDP checksum handling for
      inbound packets that were decapsulated by transport mode SAs.
      setkey(8) modified to show run-time NAT-T configuration of SA.
    o New network pseudo interface if_ipsec(4) added. For now it is
      build as part of ipsec.ko module (or with IPSEC kernel).
      It implements IPsec virtual tunnels to create route-based VPNs.
    o The network stack now invokes IPsec functions using special
      methods. The only one header file <netipsec/ipsec_support.h>
      should be included to declare all the needed things to work
      with IPsec.
    o All IPsec protocols handlers (ESP/AH/IPCOMP protosw) were removed.
      Now these protocols are handled directly via IPsec methods.
    o TCP_SIGNATURE support was reworked to be more close to RFC.
    o PF_KEY SADB was reworked:
      - now all security associations stored in the single SPI namespace,
        and all SAs MUST have unique SPI.
      - several hash tables added to speed up lookups in SADB.
      - SADB now uses rmlock to protect access, and concurrent threads
        can do SA lookups in the same time.
      - many PF_KEY message handlers were reworked to reflect changes
        in SADB.
      - SADB_UPDATE message was extended to support new PF_KEY headers:
        SADB_X_EXT_NEW_ADDRESS_SRC and SADB_X_EXT_NEW_ADDRESS_DST. They
        can be used by IKE daemon to change SA addresses.
    o ipsecrequest and secpolicy structures were cardinally changed to
      avoid locking protection for ipsecrequest. Now we support
      only limited number (4) of bundled SAs, but they are supported
      for both INET and INET6.
    o INPCB security policy cache was introduced. Each PCB now caches
      used security policies to avoid SP lookup for each packet.
    o For inbound security policies added the mode, when the kernel does
      check for full history of applied IPsec transforms.
    o References counting rules for security policies and security
      associations were changed. The proper SA locking added into xform
      code.
    o xform code was also changed. Now it is possible to unregister xforms.
      tdb_xxx structures were changed and renamed to reflect changes in
      SADB/SPDB, and changed rules for locking and refcounting.

    Obtained from:      Yandex LLC
    Relnotes:   yes
    Sponsored by:       Yandex LLC
    Differential Revision:      https://reviews.freebsd.org/D9352

  MFC r313331:
    Add removed headers into the ObsoleteFiles.inc.

  MFC r313561 (by glebius):
    Move tcp_fields_to_net() static inline into tcp_var.h, just below its
    friend tcp_fields_to_host(). There is third party code that also uses
    this inline.

  MFC r313697:
    Remove IPsec related PCB code from SCTP.

    The inpcb structure has inp_sp pointer that is initialized by
    ipsec_init_pcbpolicy() function. This pointer keeps strorage for IPsec
    security policies associated with a specific socket.
    An application can use IP_IPSEC_POLICY and IPV6_IPSEC_POLICY socket
    options to configure these security policies. Then ip[6]_output()
    uses inpcb pointer to specify that an outgoing packet is associated
    with some socket. And IPSEC_OUTPUT() method can use a security policy
    stored in the inp_sp. For inbound packet the protocol-specific input
    routine uses IPSEC_CHECK_POLICY() method to check that a packet conforms
    to inbound security policy configured in the inpcb.

    SCTP protocol doesn't specify inpcb for ip[6]_output() when it sends
    packets. Thus IPSEC_OUTPUT() method does not consider such packets as
    associated with some socket and can not apply security policies
    from inpcb, even if they are configured. Since IPSEC_CHECK_POLICY()
    method is called from protocol-specific input routine, it can specify
    inpcb pointer and associated with socket inbound policy will be
    checked. But there are two problems:
    1. Such check is asymmetric, becasue we can not apply security policy
    from inpcb for outgoing packet.
    2. IPSEC_CHECK_POLICY() expects that caller holds INPCB lock and
    access to inp_sp is protected. But for SCTP this is not correct,
    becasue SCTP uses own locks to protect inpcb.

    To fix these problems remove IPsec related PCB code from SCTP.
    This imply that IP_IPSEC_POLICY and IPV6_IPSEC_POLICY socket options
    will be not applicable to SCTP sockets. To be able correctly check
    inbound security policies for SCTP, mark its protocol header with
    the PR_LASTHDR flag.

    Differential Revision:      https://reviews.freebsd.org/D9538

  MFC r313746:
    Add missing check to fix the build with IPSEC_SUPPORT and without MAC.

  MFC r313805:
    Fix LINT build for powerpc.

    Build kernel modules support only when both IPSEC and TCP_SIGNATURE
    are not defined.

  MFC r313922:
    For translated packets do not adjust UDP checksum if it is zero.

    In case when decrypted and decapsulated packet is an UDP datagram,
    check that its checksum is not zero before doing incremental checksum
    adjustment.

  MFC r314339:
    Document that the size of AH ICV for HMAC-SHA2-NNN should be half of
    NNN bits as described in RFC4868.

    PR:         215978

  MFC r314812:
    Introduce the concept of IPsec security policies scope.

    Currently are defined three scopes: global, ifnet, and pcb.
    Generic security policies that IKE daemon can add via PF_KEY interface
    or an administrator creates with setkey(8) utility have GLOBAL scope.
    Such policies can be applied by the kernel to outgoing packets and chec=
ked
    agains inbound packets after IPsec processing.
    Security policies created by if_ipsec(4) interfaces have IFNET scope.
    Such policies are applied to packets that are passed through if_ipsec(4)
    interface.
    And security policies created by application using setsockopt()
    IP_IPSEC_POLICY option have PCB scope. Such policies are applied to
    packets related to specific socket. Currently there is no way to list
    PCB policies via setkey(8) utility.

    Modify setkey(8) and libipsec(3) to be able distinguish the scope of
    security policies in the `setkey -DP` listing. Add two optional flags:
    '-t' to list only policies related to virtual *tunneling* interfaces,
    i.e. policies with IFNET scope, and '-g' to list only policies with GLO=
BAL
    scope. By default policies from all scopes are listed.

    To implement this PF_KEY's sadb_x_policy structure was modified.
    sadb_x_policy_reserved field is used to pass the policy scope from the
    kernel to userland. SADB_SPDDUMP message extended to support filtering
    by scope: sadb_msg_satype field is used to specify bit mask of requested
    scopes.

    For IFNET policies the sadb_x_policy_priority field of struct sadb_x_po=
licy
    is used to pass if_ipsec's interface if_index to the userland. For GLOB=
AL
    policies sadb_x_policy_priority is used only to manage order of security
    policies in the SPDB. For IFNET policies it is not used, so it can be u=
sed
    to keep if_index.

    After this change the output of `setkey -DP` now looks like:
    # setkey -DPt
    0.0.0.0/0[any] 0.0.0.0/0[any] any
        in ipsec
        esp/tunnel/87.250.242.144-87.250.242.145/unique:145
        spid=3D7 seq=3D3 pid=3D58025 scope=3Difnet ifname=3Dipsec0
        refcnt=3D1
    # setkey -DPg
    ::/0 ::/0 icmp6 135,0
        out none
        spid=3D5 seq=3D1 pid=3D872 scope=3Dglobal
        refcnt=3D1

    Obtained from:      Yandex LLC
    Sponsored by:       Yandex LLC
    Differential Revision:      https://reviews.freebsd.org/D9805

  PR:           212018
  Relnotes:     yes
  Sponsored by: Yandex LLC

Changes:
_U  stable/11/
  stable/11/ObsoleteFiles.inc
  stable/11/contrib/netcat/netcat.c
  stable/11/lib/libipsec/pfkey.c
  stable/11/lib/libipsec/pfkey_dump.c
  stable/11/sbin/ifconfig/Makefile
  stable/11/sbin/ifconfig/ifipsec.c
  stable/11/sbin/ipfw/ipfw.8
  stable/11/sbin/setkey/setkey.8
  stable/11/sbin/setkey/setkey.c
  stable/11/share/man/man4/Makefile
  stable/11/share/man/man4/if_ipsec.4
  stable/11/share/man/man4/ipsec.4
  stable/11/share/man/man4/tcp.4
  stable/11/share/man/man4/udp.4
  stable/11/sys/conf/NOTES
  stable/11/sys/conf/files
  stable/11/sys/conf/files.amd64
  stable/11/sys/conf/files.arm
  stable/11/sys/conf/files.arm64
  stable/11/sys/conf/files.i386
  stable/11/sys/conf/files.mips
  stable/11/sys/conf/files.pc98
  stable/11/sys/conf/files.powerpc
  stable/11/sys/conf/files.riscv
  stable/11/sys/conf/files.sparc64
  stable/11/sys/conf/kern.opts.mk
  stable/11/sys/conf/options
  stable/11/sys/libkern/arc4random.c
  stable/11/sys/modules/Makefile
  stable/11/sys/modules/ipsec/
  stable/11/sys/modules/tcp/tcpmd5/
  stable/11/sys/net/if_ipsec.c
  stable/11/sys/net/if_ipsec.h
  stable/11/sys/net/pfkeyv2.h
  stable/11/sys/netinet/in_pcb.c
  stable/11/sys/netinet/in_proto.c
  stable/11/sys/netinet/ip_input.c
  stable/11/sys/netinet/ip_ipsec.c
  stable/11/sys/netinet/ip_ipsec.h
  stable/11/sys/netinet/ip_output.c
  stable/11/sys/netinet/raw_ip.c
  stable/11/sys/netinet/sctp_input.c
  stable/11/sys/netinet/sctp_os_bsd.h
  stable/11/sys/netinet/sctp_pcb.c
  stable/11/sys/netinet/tcp_input.c
  stable/11/sys/netinet/tcp_output.c
  stable/11/sys/netinet/tcp_stacks/fastpath.c
  stable/11/sys/netinet/tcp_subr.c
  stable/11/sys/netinet/tcp_syncache.c
  stable/11/sys/netinet/tcp_usrreq.c
  stable/11/sys/netinet/tcp_var.h
  stable/11/sys/netinet/udp.h
  stable/11/sys/netinet/udp_usrreq.c
  stable/11/sys/netinet6/in6.h
  stable/11/sys/netinet6/in6_proto.c
  stable/11/sys/netinet6/ip6_forward.c
  stable/11/sys/netinet6/ip6_input.c
  stable/11/sys/netinet6/ip6_ipsec.c
  stable/11/sys/netinet6/ip6_ipsec.h
  stable/11/sys/netinet6/ip6_output.c
  stable/11/sys/netinet6/raw_ip6.c
  stable/11/sys/netinet6/sctp6_usrreq.c
  stable/11/sys/netinet6/udp6_usrreq.c
  stable/11/sys/netipsec/ipsec.c
  stable/11/sys/netipsec/ipsec.h
  stable/11/sys/netipsec/ipsec6.h
  stable/11/sys/netipsec/ipsec_input.c
  stable/11/sys/netipsec/ipsec_mbuf.c
  stable/11/sys/netipsec/ipsec_mod.c
  stable/11/sys/netipsec/ipsec_output.c
  stable/11/sys/netipsec/ipsec_pcb.c
  stable/11/sys/netipsec/ipsec_support.h
  stable/11/sys/netipsec/key.c
  stable/11/sys/netipsec/key.h
  stable/11/sys/netipsec/key_debug.c
  stable/11/sys/netipsec/key_debug.h
  stable/11/sys/netipsec/keydb.h
  stable/11/sys/netipsec/keysock.c
  stable/11/sys/netipsec/subr_ipsec.c
  stable/11/sys/netipsec/udpencap.c
  stable/11/sys/netipsec/xform.h
  stable/11/sys/netipsec/xform_ah.c
  stable/11/sys/netipsec/xform_esp.c
  stable/11/sys/netipsec/xform_ipcomp.c
  stable/11/sys/netipsec/xform_tcp.c
  stable/11/usr.bin/netstat/inet.c

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-212018-2472-XHoGc4I0qA>