From nobody Mon Jul 21 02:13:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4blkTy5QNNz61xvV; Mon, 21 Jul 2025 02:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4blkTx6HWfz3NfQ; Mon, 21 Jul 2025 02:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753064037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liGzPgikJ3zb8iwPapXj6Df7u66Rq00cz7p/9aaQUPo=; b=n8D9IZSKWJHTv8KGD7Z0+ebfGGxJYwBPsqFhEsCdSdT/FVBB6sBc6nvP53UiXvT70zqBfw NHFc2yrbhPeObkCZoeePLIpmWYi0fTOl5t/izqKOu2ff+w2HyClRw+1/KffF2UyXfrHeT5 3ge7ccVZatkc6Ic3hu02VVQt7+VL1CfVNP2c0zKQyJdsp5vFdggAYI/C4tFp94NEtMCKYB YbAsWY2ILsE8ZxUexwGT/7wLU4vEp/L8XlLgbydQ/UEpG7tSUjKrYVDzfY+f9miNWhuIAk +sCEfxnqLdn9KkeRyyDNqRYjxhMPZoPOeGviO/ngbnE87SAyq6MvT9c+wltY1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753064037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liGzPgikJ3zb8iwPapXj6Df7u66Rq00cz7p/9aaQUPo=; b=H+SKgcJ7l4Dzg4hk7jHJg8qY6l6o6ixKnJZ365kCuAP43BVUZeX2KlkTDdtkbqxp+Dx6Mj bf2ELyNjAbDQIaatzvvltRA7gxiHNIW8uHm16FIU+AlA0YByrFV0Q/6qrVqgOINtZ8dsRz YwIYqpWw59/h3NMjGldYaiwI496t5oY0A9WMntQX3BBmpqBZJKlK/KLrZ9kxQxzQoNMVp/ TJsLj2e9bjg1apawIt4ng5m2L0SZyv0SMjNV3yQQMNPNq5sZ9HwGzNAR/U0Qoi9jAz5DD8 lZ1FjKF7zfLNbvJiOFvHJf6sK6BOIpVijXFZgvUxpCQ6enh7hHe5HccAEkaowQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753064037; a=rsa-sha256; cv=none; b=LKv4DXjl3wd547IrUYq0Z526yC837G831ouFZKsTsLGH8fx1tX6c4ezPPJQ7legduUO8Kq yL5SpashD2yhmd6bEmBlT2iAYnMaU5vhoiDK/Ou+B+iodTBT3rNd29YoczpnC2szVONd+0 +CKc9Sgz/f7gM+18gRcQ+30xwafT9otL7FIuqKLFfZot6XEOSSq9acITKmYlvoYWQ2kdNO UjUtf+uvWAWQirjNuM9RBnQ/FhW30+9SWozyfqMx7Hi4gqNiAPCEdUI2fp+YZeFDrZIhcj LcvEFzMwmRhw1xwdy4GNf7JNrgazaDypKhcxRwt42UL7bR42OCw9t9cKrs9K9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4blkTx5NLVzfcD; Mon, 21 Jul 2025 02:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56L2DvGL013907; Mon, 21 Jul 2025 02:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56L2DvBW013904; Mon, 21 Jul 2025 02:13:57 GMT (envelope-from git) Date: Mon, 21 Jul 2025 02:13:57 GMT Message-Id: <202507210213.56L2DvBW013904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d0b6c358e748 - stable/14 - kern: wg: split address/mask construction out of wg_aip_add() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0b6c358e7486ac560f99f9dfb8166f1f5d014e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d0b6c358e7486ac560f99f9dfb8166f1f5d014e4 commit d0b6c358e7486ac560f99f9dfb8166f1f5d014e4 Author: Kyle Evans AuthorDate: 2025-06-26 02:57:02 +0000 Commit: Kyle Evans CommitDate: 2025-07-21 02:12:28 +0000 kern: wg: split address/mask construction out of wg_aip_add() We'll re-use these in a future wg_aip_del() to perfectly reconstruct what we expect to find in a_addr/a_mask. Reviewed by: ivy, markj (both earlier version), Aaron LI, jhb (cherry picked from commit 2475a3dab0d5c5614e303c0022a834f725e2a078) --- sys/dev/wg/if_wg.c | 63 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 9e86e1074ef5..380e579eed07 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -312,7 +312,8 @@ static void wg_timers_run_send_keepalive(void *); static void wg_timers_run_new_handshake(void *); static void wg_timers_run_zero_key_material(void *); static void wg_timers_run_persistent_keepalive(void *); -static int wg_aip_add(struct wg_softc *, struct wg_peer *, sa_family_t, const void *, uint8_t); +static int wg_aip_add(struct wg_softc *, struct wg_peer *, sa_family_t, + const void *, uint8_t); static struct wg_peer *wg_aip_lookup(struct wg_softc *, sa_family_t, void *); static void wg_aip_remove_all(struct wg_softc *, struct wg_peer *); static struct wg_peer *wg_peer_create(struct wg_softc *, @@ -526,46 +527,62 @@ wg_peer_get_endpoint(struct wg_peer *peer, struct wg_endpoint *e) rw_runlock(&peer->p_endpoint_lock); } -/* Allowed IP */ static int -wg_aip_add(struct wg_softc *sc, struct wg_peer *peer, sa_family_t af, const void *addr, uint8_t cidr) +wg_aip_addrinfo(struct wg_aip *aip, const void *baddr, uint8_t cidr) { - struct radix_node_head *root; - struct radix_node *node; - struct wg_aip *aip; - int ret = 0; - - aip = malloc(sizeof(*aip), M_WG, M_WAITOK | M_ZERO); - aip->a_peer = peer; - aip->a_af = af; + struct aip_addr *addr, *mask; - switch (af) { + addr = &aip->a_addr; + mask = &aip->a_mask; + switch (aip->a_af) { #ifdef INET case AF_INET: if (cidr > 32) cidr = 32; - root = sc->sc_aip4; - aip->a_addr.in = *(const struct in_addr *)addr; - aip->a_mask.ip = htonl(~((1LL << (32 - cidr)) - 1) & 0xffffffff); - aip->a_addr.ip &= aip->a_mask.ip; - aip->a_addr.length = aip->a_mask.length = offsetof(struct aip_addr, in) + sizeof(struct in_addr); + addr->in = *(const struct in_addr *)baddr; + mask->ip = htonl(~((1LL << (32 - cidr)) - 1) & 0xffffffff); + addr->ip &= mask->ip; + addr->length = mask->length = offsetof(struct aip_addr, in) + sizeof(struct in_addr); break; #endif #ifdef INET6 case AF_INET6: if (cidr > 128) cidr = 128; - root = sc->sc_aip6; - aip->a_addr.in6 = *(const struct in6_addr *)addr; - in6_prefixlen2mask(&aip->a_mask.in6, cidr); + addr->in6 = *(const struct in6_addr *)baddr; + in6_prefixlen2mask(&mask->in6, cidr); for (int i = 0; i < 4; i++) - aip->a_addr.ip6[i] &= aip->a_mask.ip6[i]; - aip->a_addr.length = aip->a_mask.length = offsetof(struct aip_addr, in6) + sizeof(struct in6_addr); + addr->ip6[i] &= mask->ip6[i]; + addr->length = mask->length = offsetof(struct aip_addr, in6) + sizeof(struct in6_addr); break; #endif default: - free(aip, M_WG); return (EAFNOSUPPORT); } + return (0); +} + +/* Allowed IP */ +static int +wg_aip_add(struct wg_softc *sc, struct wg_peer *peer, sa_family_t af, + const void *baddr, uint8_t cidr) +{ + struct radix_node_head *root = NULL; + struct radix_node *node; + struct wg_aip *aip; + int ret = 0; + + aip = malloc(sizeof(*aip), M_WG, M_WAITOK | M_ZERO); + aip->a_peer = peer; + aip->a_af = af; + + ret = wg_aip_addrinfo(aip, baddr, cidr); + if (ret != 0) { + free(aip, M_WG); + return (ret); + } + + root = af == AF_INET ? sc->sc_aip4 : sc->sc_aip6; + MPASS(root != NULL); RADIX_NODE_HEAD_LOCK(root); node = root->rnh_addaddr(&aip->a_addr, &aip->a_mask, &root->rh, aip->a_nodes); if (node == aip->a_nodes) {