From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99768C65C1D for ; Sun, 7 Oct 2018 14:13:07 +0000 (UTC) Received: from krantz.zx2c4.com (krantz.zx2c4.com [192.95.5.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D16F20882 for ; Sun, 7 Oct 2018 14:13:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ohh/Maa9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D16F20882 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=wireguard-bounces@lists.zx2c4.com Received: from krantz.zx2c4.com (localhost [IPv6:::1]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id a142c254; Sun, 7 Oct 2018 14:11:36 +0000 (UTC) Received: from krantz.zx2c4.com (localhost [127.0.0.1]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id db7b7c27 for ; Sun, 7 Oct 2018 14:11:34 +0000 (UTC) Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id b23a753c for ; Sun, 7 Oct 2018 14:11:20 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id 185-v6so5880053wmt.2 for ; Sun, 07 Oct 2018 07:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DdYnhls9yLDEcU/rX7aDvP+jfYx7NaN/ejZjrfFSP8s=; b=ohh/Maa9SnD/1BKyFLnirBiKel3a3U2/eZVDCDbCjED0hoFiUs6w+oloj8o5xpILSz RqECnUNd21dEzBSgqCJtLpufhA0ZQpoqIj9xNsQvKiyuqNCNTl2RDpCkDVA/VsRmvlLN UalGiZ80xxULd4bjYs+Rjh/q2Q/wgzP+O/ikvcDzogPWnFm9aAUGJVIxF+OFVGTD80cW DnkildYca+c6yifoN/F7bvR25CzXlYQo1oV48EAanLNmtkiOkHv/WxT5TuaqQI6WUPko xB8zbXDyCKX9Q9xzf2eyrbkApV5+uHwHmQCryMODC4GFHWwgmianEWbPZ8A+ocSZV2Ns K/jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DdYnhls9yLDEcU/rX7aDvP+jfYx7NaN/ejZjrfFSP8s=; b=r7CXnMWFavtbqN5Uis3cXFlkVE5LttSnlp9/5DjFw/OGN3mQ7duAq1pFPPykJ0xtyV bnrEtCm8Ln2RM5idjtDOihSqhuJUhdf8Pxc/il/7iXoMNyDUZBntQSfLrOXtSctwtso+ 2vHVw/Xs5+r3/vUOVKw9wUBPpvChvAYvv+TFFAIeKSI96EgeaMSwAoh5h9FAH4UETcwE PPyzjlR7klncjDZ9fnZIK4XQSOXVFzDMHIrVKCZ3tUPUh3pbhA7msRFUEREm5RzzRbaF rP1mHbI/ojlZV87myLXm3LZBEAA2hMMyKUt0GkyfHFrvFPToL36bEmcUv22f+cqu/jMQ ZBqw== X-Gm-Message-State: ABuFfojcj7xIjg+NtNG4jtrSgDLr/ek0uJ134OIx0djM94eqyz6dtt0I lQxWhzm+/HftixY77NXGOLGWzRky X-Google-Smtp-Source: ACcGV61CjU9b3w33hgSIedllMRCeRfjUeuYNcDkyjlaYePu31w+CRjVAlNKvlo0MtW1M1IUg0qkB+g== X-Received: by 2002:a1c:8942:: with SMTP id l63-v6mr13355080wmd.66.1538921519274; Sun, 07 Oct 2018 07:11:59 -0700 (PDT) Received: from localhost.localdomain (p200300C55F2A9600228984FFFE70D494.dip0.t-ipconnect.de. [2003:c5:5f2a:9600:2289:84ff:fe70:d494]) by smtp.gmail.com with ESMTPSA id w72-v6sm28940116wrc.52.2018.10.07.07.11.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 07:11:58 -0700 (PDT) From: Julian Orth To: wireguard@lists.zx2c4.com Subject: [PATCH v4 08/12] netlink: allow modification of transit net Date: Sun, 7 Oct 2018 16:11:35 +0200 Message-Id: <20181007141139.26310-9-ju.orth@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181007141139.26310-1-ju.orth@gmail.com> References: <20181007141139.26310-1-ju.orth@gmail.com> MIME-Version: 1.0 X-BeenThere: wireguard@lists.zx2c4.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development discussion of WireGuard List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: wireguard-bounces@lists.zx2c4.com Sender: "WireGuard" This commit adds two new attributes of which at most one may be provided: * WGDEVICE_A_TRANSIT_NETNS_PID: NLA_U32 * WGDEVICE_A_TRANSIT_NETNS_FD: NLA_U32 The transit namespace is then set to this namespace. The caller must either be in this namespace or have CAP_NET_ADMIN in it. --- src/netlink.c | 48 +++++++++++++++++++++++++++++++------------- src/uapi/wireguard.h | 14 +++++++++---- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/netlink.c b/src/netlink.c index b6a66dd..1029b62 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -27,6 +27,8 @@ static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = { [WGDEVICE_A_PEERS] = { .type = NLA_NESTED }, [WGDEVICE_A_DEV_NETNS_PID] = { .type = NLA_U32 }, [WGDEVICE_A_DEV_NETNS_FD] = { .type = NLA_U32 }, + [WGDEVICE_A_TRANSIT_NETNS_PID] = { .type = NLA_U32 }, + [WGDEVICE_A_TRANSIT_NETNS_FD] = { .type = NLA_U32 }, }; static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = { @@ -353,23 +355,44 @@ static int get_device_done(struct netlink_callback *cb) return 0; } -static int set_port(struct wireguard_device *wg, u16 port) +static int set_socket(struct wireguard_device *wg, struct nlattr **attrs) { struct wireguard_peer *peer; - int ret; + struct nlattr *port_attr = attrs[WGDEVICE_A_LISTEN_PORT]; + u16 port; + struct net *net = NULL; + int ret = 0; + + net = get_attr_net(attrs[WGDEVICE_A_TRANSIT_NETNS_PID], + attrs[WGDEVICE_A_TRANSIT_NETNS_FD]); + if (IS_ERR(net)) + return PTR_ERR(net); + if (port_attr) + port = nla_get_u16(port_attr); + else + port = wg->incoming_port; - ret = test_socket_net_capable(wg->transit_net); + ret = test_socket_net_capable(net ? : wg->transit_net); if (ret) - return ret; - if (wg->incoming_port == port) - return 0; + goto out; + + if (wg->incoming_port == port && (!net || wg->transit_net == net)) + goto out; + list_for_each_entry (peer, &wg->peer_list, peer_list) wg_socket_clear_peer_endpoint_src(peer); if (!netif_running(wg->dev)) { wg->incoming_port = port; - return 0; + if (net) + wg_device_set_nets(wg, wg->dev_net, net); + goto out; } - return wg_socket_init(wg, wg->transit_net, port); + ret = wg_socket_init(wg, net ? : wg->transit_net, port); + +out: + if (net) + put_net(net); + return ret; } static int set_allowedip(struct wireguard_peer *peer, struct nlattr **attrs) @@ -566,12 +589,9 @@ static int set_device(struct sk_buff *skb, struct genl_info *info) wg_socket_clear_peer_endpoint_src(peer); } - if (info->attrs[WGDEVICE_A_LISTEN_PORT]) { - ret = set_port(wg, - nla_get_u16(info->attrs[WGDEVICE_A_LISTEN_PORT])); - if (ret) - goto out; - } + ret = set_socket(wg, info->attrs); + if (ret) + goto out; if (info->attrs[WGDEVICE_A_FLAGS] && nla_get_u32(info->attrs[WGDEVICE_A_FLAGS]) & diff --git a/src/uapi/wireguard.h b/src/uapi/wireguard.h index 4f60a02..d6173e6 100644 --- a/src/uapi/wireguard.h +++ b/src/uapi/wireguard.h @@ -88,16 +88,18 @@ * May only be called via NLM_F_REQUEST. The command must contain the following * tree of nested items. Exactly one of WGDEVICE_A_IFINDEX and WGDEVICE_A_IFNAME * must be provided. All other top-level items are optional. At most one of - * WGDEVICE_A_DEV_NETNS_PID and WGDEVICE_A_DEV_NETNS_FD may be provided. + * WGDEVICE_A_TRANSIT_NETNS_PID and WGDEVICE_A_TRANSIT_NETNS_FD may be provided. + * At most one of WGDEVICE_A_DEV_NETNS_PID and WGDEVICE_A_DEV_NETNS_FD may be + * provided. * * If WGDEVICE_A_DEV_NETNS_PID/FD is provided, the Wireguard device is looked up * in this network namespace. Otherwise it is looked up in the network namespace * of the netlink socket. The caller must have CAP_NET_ADMIN in the namespace of * the Wireguard device. * - * If WGDEVICE_A_LISTEN_PORT is provided and the calling process is not in the - * transit namespace, then the calling process must have CAP_NET_ADMIN the - * transit namespace. + * If WGDEVICE_A_TRANSIT_NETNS_PID/FD and/or WGDEVICE_A_LISTEN_PORT are provided + * and the calling process is not in the transit namespace, then the calling + * process must have CAP_NET_ADMIN the transit namespace. * * WGDEVICE_A_IFINDEX: NLA_U32 * WGDEVICE_A_IFNAME: NLA_NUL_STRING, maxlen IFNAMESIZ - 1 @@ -107,6 +109,8 @@ * WGDEVICE_A_LISTEN_PORT: NLA_U16, 0 to choose randomly * WGDEVICE_A_DEV_NETNS_PID: NLA_U32 * WGDEVICE_A_DEV_NETNS_FD: NLA_U32 + * WGDEVICE_A_TRANSIT_NETNS_PID: NLA_U32 + * WGDEVICE_A_TRANSIT_NETNS_FD: NLA_U32 * WGDEVICE_A_FWMARK: NLA_U32, 0 to disable * WGDEVICE_A_PEERS: NLA_NESTED * 0: NLA_NESTED @@ -181,6 +185,8 @@ enum wgdevice_attribute { WGDEVICE_A_PEERS, WGDEVICE_A_DEV_NETNS_PID, WGDEVICE_A_DEV_NETNS_FD, + WGDEVICE_A_TRANSIT_NETNS_PID, + WGDEVICE_A_TRANSIT_NETNS_FD, __WGDEVICE_A_LAST }; #define WGDEVICE_A_MAX (__WGDEVICE_A_LAST - 1) -- 2.19.0 _______________________________________________ WireGuard mailing list WireGuard@lists.zx2c4.com https://lists.zx2c4.com/mailman/listinfo/wireguard