From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9EE6537BE75 for ; Mon, 23 Feb 2026 22:38:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771886337; cv=none; b=Gmf15CJSe/SDiXA4AL40HwLxOyD/A2fY7oR8Rx549xnthwseUkgcHhw0psQuKvcBiXCAbLRq0df15fnARWeFv/8zg2h779aRWyTHJHeb8utvM1hJdgvAU4KLJn5jUCvsCg4oytJyfgQAjtHVmB5uGNJ+MF916VLihxNb93dHXyY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771886337; c=relaxed/simple; bh=WgeYmElNUd8JWXtDscMvKbTYKQRR4nvqCMrxNQNtld4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W0tLqgJBOH63LiEGGBZ/CCfUcka4JSS+ZqaooKuiWcMguo+1LbcHCa1a4wFXXvrbxube52MNm1cwT3m1ELLcKJajpBRMKZcblTRMW7fTqNY1nLXIG4EwMTp6KsOPLYigs64Yoo3A3MHbijDjABYbqnYXOuGxcfnc53mdRfcFFsg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jE8odhRp; arc=none smtp.client-ip=209.85.128.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jE8odhRp" Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-79827d28feaso26961387b3.3 for ; Mon, 23 Feb 2026 14:38:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771886335; x=1772491135; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=g/yCmM+X3z1/BoTwo6svOrTqbVDwyb97Jpk/MjzyWmU=; b=jE8odhRpi+A5fYcaIkttPI6rdvQvXlTeFUD7oqhwWKK6ZsCv/rkRijElk2BkBcw7ID kXl7UaVfk4gq5d3fmJ4x035+0JYeBZZTI48hPI0DhyTAoqhCFWm58tFnUxbd/SPqOy9P 3TH52LdyySAvIMZjRgh8NU6vvZIN3i+dBqOTm75rK26J1qtUnGDFYJwDV3yMGLRlHK31 5tTKoW/TAaloqxP7wX29sXv8grKlph030P7cgpHQyEIH5g1C00Eqs1Z0W70jhq0NRAL6 JFj3JCRrc9piWD6in6TC4q1bok4Y+LqAUWQAKy1e07hS1o/YAN1c+hp0EVLb799Qu4uh BDbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771886335; x=1772491135; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=g/yCmM+X3z1/BoTwo6svOrTqbVDwyb97Jpk/MjzyWmU=; b=dPmB9kuOAek3KUYhTBEQdJrWmgVhgd5mB2Z7bhDzR18kZ+Lgy19fM/vOdjNRJKdnMo 45QAD+twUJ1dBCXbuB6UdoLn7XccfGeTswonJRNEH8AOGQBUNoPq6B67p0/RP9ik4Mxd RUKMUekKHNpXrLXycaKgHYlvt1ZqntIbcbJyTUhLu/9RzMeMJ7QA0QQlNanXNhXUb45s IdWtSbQpLxu/alnx5mvHJkcPng/LI7RapWutzenQxBvSqYaFEvP8Wb4grOiR6Z8XH5fx Fin3orgMMG8QkfiN8m5P3vcjVdbktGmVtOKRBsxI/V9+DDC2Kj0lXkShWhm8OtuRsyKn UNKw== X-Forwarded-Encrypted: i=1; AJvYcCUefx8hwa6h1weT46qKlUh18rjsqKA345dKOFo/KuObwpAP54374s9jmP2aXMnJaL0/d0sAkTQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwwjW4spitGY3/eJsgXSaURpZ5wLj5ep9WsQEfacSx4PsEF7+QL XT29a7WnTvYje61XAH8qvyfhBpXqg1ZiA3t0+GjDtLecz2v8VOfkAKRZ X-Gm-Gg: ATEYQzws+EGbJ2ad7WOe+Ws+Mr8JKAhl0JEkNThvchtSaDY4dQoLHvZ72KNQ6GMoQ3r qHBAZDqyY8nCrUZL7zZS1ujMBQjqjl0Fl+zd9tQr50BJnr49Yl2UmUCeJKRix7QpS9DcuzJHOkN E8tv0eCnMiGDFra+jtk6X/kQo01whSegt76i4S2CI2LQ9c9d4q44Eu+QcUTeFoXYw6lOqN+RiC8 iTuTQdQitXNMJP1CY7zCCri0AqJK0HzGz+FSHM2snTmeWxDMt3ma+E4cV2/L+hIHaFzJeewLPSS 93kloXspB+JNFOQLBHfhghVqdUBQ+CgKDAr4juC/Q++RJZpSVTZEpMoyuJrP+Jhbz/hXjBqqbbb tgqurrpTmqaMNaICnl7Tn0LuWyL42Icz1xrIMQAUd3fXuj3zh3fSEID4K90jbTtOHaq8XYWOanz G6wa7i0qme+Osh7rHfi3CUF7R210K/E9Ax X-Received: by 2002:a05:690c:a:b0:794:c01a:18e6 with SMTP id 00721157ae682-7982903c9aamr91568337b3.47.1771886334599; Mon, 23 Feb 2026 14:38:54 -0800 (PST) Received: from localhost ([2a03:2880:25ff:54::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbdf23dsm37723417b3.21.2026.02.23.14.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 14:38:54 -0800 (PST) From: Bobby Eshleman Date: Mon, 23 Feb 2026 14:38:33 -0800 Subject: [PATCH net v3 2/3] vsock: lock down child_ns_mode as write-once Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260223-vsock-ns-write-once-v3-2-c0cde6959923@meta.com> References: <20260223-vsock-ns-write-once-v3-0-c0cde6959923@meta.com> In-Reply-To: <20260223-vsock-ns-write-once-v3-0-c0cde6959923@meta.com> To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefan Hajnoczi , Shuah Khan , Bobby Eshleman , "Michael S. Tsirkin" , Jonathan Corbet , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, kuniyu@google.com, ncardwell@google.com, Daan De Meyer X-Mailer: b4 0.14.3 From: Bobby Eshleman Two administrator processes may race when setting child_ns_mode as one process sets child_ns_mode to "local" and then creates a namespace, but another process changes child_ns_mode to "global" between the write and the namespace creation. The first process ends up with a namespace in "global" mode instead of "local". While this can be detected after the fact by reading ns_mode and retrying, it is fragile and error-prone. Make child_ns_mode write-once so that a namespace manager can set it once and be sure it won't change. Writing a different value after the first write returns -EBUSY. This applies to all namespaces, including init_net, where an init process can write "local" to lock all future namespaces into local mode. Fixes: eafb64f40ca4 ("vsock: add netns to vsock core") Suggested-by: Daan De Meyer Suggested-by: Stefano Garzarella Co-developed-by: Stefano Garzarella Signed-off-by: Stefano Garzarella Signed-off-by: Bobby Eshleman --- include/net/af_vsock.h | 13 +++++++++++-- include/net/netns/vsock.h | 3 +++ net/vmw_vsock/af_vsock.c | 15 ++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index d3ff48a2fbe0..533d8e75f7bb 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -276,10 +276,19 @@ static inline bool vsock_net_mode_global(struct vsock_sock *vsk) return vsock_net_mode(sock_net(sk_vsock(vsk))) == VSOCK_NET_MODE_GLOBAL; } -static inline void vsock_net_set_child_mode(struct net *net, +static inline bool vsock_net_set_child_mode(struct net *net, enum vsock_net_mode mode) { - WRITE_ONCE(net->vsock.child_ns_mode, mode); + int new_locked = mode + 1; + int old_locked = 0; /* unlocked */ + + if (try_cmpxchg(&net->vsock.child_ns_mode_locked, + &old_locked, new_locked)) { + WRITE_ONCE(net->vsock.child_ns_mode, mode); + return true; + } + + return old_locked == new_locked; } static inline enum vsock_net_mode vsock_net_child_mode(struct net *net) diff --git a/include/net/netns/vsock.h b/include/net/netns/vsock.h index b34d69a22fa8..dc8cbe45f406 100644 --- a/include/net/netns/vsock.h +++ b/include/net/netns/vsock.h @@ -17,5 +17,8 @@ struct netns_vsock { enum vsock_net_mode mode; enum vsock_net_mode child_ns_mode; + + /* 0 = unlocked, 1 = locked to global, 2 = locked to local */ + int child_ns_mode_locked; }; #endif /* __NET_NET_NAMESPACE_VSOCK_H */ diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 9880756d9eff..50044a838c89 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -90,16 +90,20 @@ * * - /proc/sys/net/vsock/ns_mode (read-only) reports the current namespace's * mode, which is set at namespace creation and immutable thereafter. - * - /proc/sys/net/vsock/child_ns_mode (writable) controls what mode future + * - /proc/sys/net/vsock/child_ns_mode (write-once) controls what mode future * child namespaces will inherit when created. The initial value matches * the namespace's own ns_mode. * * Changing child_ns_mode only affects newly created namespaces, not the * current namespace or existing children. A "local" namespace cannot set - * child_ns_mode to "global". At namespace creation, ns_mode is inherited - * from the parent's child_ns_mode. + * child_ns_mode to "global". child_ns_mode is write-once, so that it may be + * configured and locked down by a namespace manager. Writing a different + * value after the first write returns -EBUSY. At namespace creation, ns_mode + * is inherited from the parent's child_ns_mode. * - * The init_net mode is "global" and cannot be modified. + * The init_net mode is "global" and cannot be modified. The init_net + * child_ns_mode is also write-once, so an init process (e.g. systemd) can + * set it to "local" to ensure all new namespaces inherit local mode. * * The modes affect the allocation and accessibility of CIDs as follows: * @@ -2853,7 +2857,8 @@ static int vsock_net_child_mode_string(const struct ctl_table *table, int write, new_mode == VSOCK_NET_MODE_GLOBAL) return -EPERM; - vsock_net_set_child_mode(net, new_mode); + if (!vsock_net_set_child_mode(net, new_mode)) + return -EBUSY; } return 0; -- 2.47.3