diff options
author | Kyle Evans <kevans@FreeBSD.org> | 2021-03-15 02:25:40 +0000 |
---|---|---|
committer | Kyle Evans <kevans@FreeBSD.org> | 2021-03-15 04:52:04 +0000 |
commit | 74ae3f3e33b810248da19004c58b3581cd367843 (patch) | |
tree | b17ce98b77a3a1a86e8255dad7861d9c160222a9 /sys/dev/if_wg/include/sys/wg_module.h | |
parent | 3e5e9939cda3b24df37c37da5f195415a894d9fd (diff) | |
download | src-74ae3f3e33b810248da19004c58b3581cd367843.tar.gz src-74ae3f3e33b810248da19004c58b3581cd367843.zip |
if_wg: import latest fixup work from the wireguard-freebsd project
This is the culmination of about a week of work from three developers to
fix a number of functional and security issues. This patch consists of
work done by the following folks:
- Jason A. Donenfeld <Jason@zx2c4.com>
- Matt Dunwoodie <ncon@noconroy.net>
- Kyle Evans <kevans@FreeBSD.org>
Notable changes include:
- Packets are now correctly staged for processing once the handshake has
completed, resulting in less packet loss in the interim.
- Various race conditions have been resolved, particularly w.r.t. socket
and packet lifetime (panics)
- Various tests have been added to assure correct functionality and
tooling conformance
- Many security issues have been addressed
- if_wg now maintains jail-friendly semantics: sockets are created in
the interface's home vnet so that it can act as the sole network
connection for a jail
- if_wg no longer fails to remove peer allowed-ips of 0.0.0.0/0
- if_wg now exports via ioctl a format that is future proof and
complete. It is additionally supported by the upstream
wireguard-tools (which we plan to merge in to base soon)
- if_wg now conforms to the WireGuard protocol and is more closely
aligned with security auditing guidelines
Note that the driver has been rebased away from using iflib. iflib
poses a number of challenges for a cloned device trying to operate in a
vnet that are non-trivial to solve and adds complexity to the
implementation for little gain.
The crypto implementation that was previously added to the tree was a
super complex integration of what previously appeared in an old out of
tree Linux module, which has been reduced to crypto.c containing simple
boring reference implementations. This is part of a near-to-mid term
goal to work with FreeBSD kernel crypto folks and take advantage of or
improve accelerated crypto already offered elsewhere.
There's additional test suite effort underway out-of-tree taking
advantage of the aforementioned jail-friendly semantics to test a number
of real-world topologies, based on netns.sh.
Also note that this is still a work in progress; work going further will
be much smaller in nature.
MFC after: 1 month (maybe)
Diffstat (limited to 'sys/dev/if_wg/include/sys/wg_module.h')
-rw-r--r-- | sys/dev/if_wg/include/sys/wg_module.h | 121 |
1 files changed, 0 insertions, 121 deletions
diff --git a/sys/dev/if_wg/include/sys/wg_module.h b/sys/dev/if_wg/include/sys/wg_module.h deleted file mode 100644 index cc662104d640..000000000000 --- a/sys/dev/if_wg/include/sys/wg_module.h +++ /dev/null @@ -1,121 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2019-2020 Rubicon Communications, LLC (Netgate) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ -#ifndef MODULE_H_ -#define MODULE_H_ - -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> -#include <net/if_var.h> -#include <sys/support.h> - - -#include <sys/types.h> -#include <sys/epoch.h> -#include <sys/lock.h> -#include <sys/mutex.h> - - - -#include <crypto/curve25519.h> -#include <zinc/chacha20poly1305.h> -#include <crypto/blake2s.h> - - -enum noise_lengths { - NOISE_PUBLIC_KEY_LEN = CURVE25519_KEY_SIZE, - NOISE_SYMMETRIC_KEY_LEN = CHACHA20POLY1305_KEY_SIZE, - NOISE_TIMESTAMP_LEN = sizeof(uint64_t) + sizeof(uint32_t), - NOISE_AUTHTAG_LEN = CHACHA20POLY1305_AUTHTAG_SIZE, - NOISE_HASH_LEN = BLAKE2S_HASH_SIZE -}; - -#define noise_encrypted_len(plain_len) ((plain_len) + NOISE_AUTHTAG_LEN) - -enum cookie_values { - COOKIE_SECRET_MAX_AGE = 2 * 60, - COOKIE_SECRET_LATENCY = 5, - COOKIE_NONCE_LEN = XCHACHA20POLY1305_NONCE_SIZE, - COOKIE_LEN = 16 -}; - -enum limits { - REKEY_TIMEOUT = 5, - INITIATIONS_PER_SECOND = 50, - MAX_PEERS_PER_DEVICE = 1U << 20, - KEEPALIVE_TIMEOUT = 10, - MAX_TIMER_HANDSHAKES = 90 / REKEY_TIMEOUT, - MAX_QUEUED_INCOMING_HANDSHAKES = 4096, /* TODO: replace this with DQL */ - MAX_STAGED_PACKETS = 128, - MAX_QUEUED_PACKETS = 1024 /* TODO: replace this with DQL */ -}; - -#define zfree(addr, type) \ - do { \ - explicit_bzero(addr, sizeof(*addr)); \ - free(addr, type); \ - } while (0) - -struct crypt_queue { - union { - struct { - int last_cpu; - }; - }; -}; - -#define __ATOMIC_LOAD_SIZE \ - ({ \ - switch (size) { \ - case 1: *(uint8_t *)res = *(volatile uint8_t *)p; break; \ - case 2: *(uint16_t *)res = *(volatile uint16_t *)p; break; \ - case 4: *(uint32_t *)res = *(volatile uint32_t *)p; break; \ - case 8: *(uint64_t *)res = *(volatile uint64_t *)p; break; \ - } \ -}) - -static inline void -__atomic_load_acq_size(volatile void *p, void *res, int size) -{ - __ATOMIC_LOAD_SIZE; -} - -#define atomic_load_acq(x) \ - ({ \ - union { __typeof(x) __val; char __c[1]; } __u; \ - __atomic_load_acq_size(&(x), __u.__c, sizeof(x)); \ - __u.__val; \ -}) - - -int wg_ctx_init(void); -void wg_ctx_uninit(void); - - -#endif |