From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 9B6A832ED4E for ; Thu, 7 May 2026 08:13:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778141620; cv=none; b=l6/WR7YOHZAzs6PSZLWWaasg+hmkmpFSOqndqcuXQp6CKF8ZOwlErtvEWNwSZTxp/0lir1OZU99naewxOFsT23Tmk6zoSCig0u8YJum52FC6Ef/Twi94PTbr5MYWY5kngM/3sI+g4JxKESa7qLyuMTMqkzHOBs8cuFZRmbogI2c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778141620; c=relaxed/simple; bh=FaEYkUuwidhWTJrVVQ0ppkOqXBWsGRgHNbEDUKlzs5A=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Zmjwj1O08azkqEDPr7AU+syfpt+V09Mw8ujC4ZoweyHceUsDUzdttc/2aDGxEMIV2eDXzewW0KWZhsiX7/uUea/0rdjg4HRvnhRNs2tz5wzn7Lg9FugCyQhl+B0LM+SUIBsVYnr1aJ/Y6r3gBQGyh0uZTlTLuJ7UtdVCgFjvLnE= 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=j1YL8TLJ; arc=none smtp.client-ip=209.85.210.182 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="j1YL8TLJ" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-8353ca0f1f1so254818b3a.1 for ; Thu, 07 May 2026 01:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778141618; x=1778746418; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jmcGf2SHjwA2B4ur5jp+MpD0/Te+9S1vu4UT9Gm+oPs=; b=j1YL8TLJgCOui6zO+0FsmjiMImaVLn07vE4ek45MHZNmb+WI9F4nNYuXDxIH/X2g2w ZmJaaO4f8r1yj4+IoL4Go+kNgisgy4qyH0rJ70wdbq2NrpN38S055vl3qA8rjeJW3C22 u88eQ2P3jy+6CxmF7wOhT+ZwiMiWaxYYL5gNAzT3MbWWJQB0P2JixBDzSDHaGBM8Obca o5VumDVQr5PF1Zwq3nHV3OvVlTmJM/BdzMezgFqdIbt8W0i4lSzsXkm9GUFE75pVFRO3 Ucs0dhsMoL9XUtQTctFruN+AbRPrRGmvd8wDKE2/q66v92Lz6xNcW83JENH7Qk4335Xf qImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778141618; x=1778746418; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jmcGf2SHjwA2B4ur5jp+MpD0/Te+9S1vu4UT9Gm+oPs=; b=HMHHQ5IIGuy9EqW79OAvzkeA85Qmq2z03hPEuYaxn5sC3JeEV13pozQ6g0mpu9HRUv qnps+b/5oy3GDTQH3lO20gyNrwBe7WTnycCaJREZs0RSIPCZpf86kQMXFhtRxnNsseWM 5eGtvlWNMyGA4x4bPNme6FniUJaEP266Rj+KyPpVfqchqjue8N/QK53wRKvShuAl75Je YcC1vyIQPoUc+5OSJEWIqpu4h5utb3/sPW5mMlz1WSPzsbKEDsP7Br8Q9RRzaB6K+6oO 4qcwl3M/512/skxb72GsvVNWcp+jZ3RsPPupoPzndJqXm0Q/tvOv6gTDJw9LdjgiGh4a j6rw== X-Forwarded-Encrypted: i=1; AFNElJ+fE/DWnQPcqhFppcRx4iK1RuCPV3GN5PQ/sADSzV2uiErQj3P0k4XQ/d5qulPKg3kjcqTCRwk=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/NuD5KKinxaL+6r1Gwp+r+CKh9IJA50cv1upT6WA7QzLI9m1d 1wRyAzt0PONKEFobZDdniCLZ/uoEJfX2ePJHyaFhd04Lx4o2C/m//TQI X-Gm-Gg: AeBDietuHctIj4iLl2BEvsC9TOmMYk874rxjbQ/K9rlFMxLSXFC+uUO6qxR8kRbzw85 PbP7wTVm6erJ12yYXUW7/aXZvt8wQ0e8RF2pVARFFK5rzbHEevURftIZr5aJwRJlGW3jka/vP8l E9g8KE2vRutgUUhPBPNBx4QAEbVy1f8fpLUpufc0MbEiLmceVj+LsHAdeBFL4mTTOuNoQtPu7Dw /o/hGu9aCpBZoLZNZS0yZr/p6CDPtRWewV5foN77Q4hZsiSTz+yM72KP26KhLoYxjsUri8OYJOu oWVNXNBsFojCAYv/wr7qRF1Bbnxllbd7SjcOibj7Br5H+G/dD2/YA0wlFahAOZ7Y9TEclEC5T4q /e2QaDQeyEiYrN0rGWEr7dBcrFUdz8PGP+LW9OFVjVx6hEmI54Fe4P3ftxYQxnj1ulSRWXeK4pa dY1/rD3jyBUxI1J+DzWXy+HFu/DZEsLWWVN8qET0Id6ewJHTv/8zdrcJZ6/L4= X-Received: by 2002:a05:6a00:4219:b0:82f:53f1:1937 with SMTP id d2e1a72fcca58-83bb868db3emr2037579b3a.27.1778141617904; Thu, 07 May 2026 01:13:37 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-839679c8c1bsm9756886b3a.34.2026.05.07.01.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 01:13:37 -0700 (PDT) From: Maoyi Xie To: Allison Henderson Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, linux-kernel@vger.kernel.org, Maoyi Xie , Praveen Kakkolangara Subject: [PATCH net v2] rds: filter RDS_INFO_* getsockopt by caller's netns Date: Thu, 7 May 2026 16:13:32 +0800 Message-Id: <20260507081332.2868770-1-maoyixie.tju@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Maoyi Xie The RDS_INFO_* family of getsockopt(2) options reads several file-scope global lists that are not per-netns: rds_sock_info / rds6_sock_info, rds_sock_inc_info / rds6_sock_inc_info -> rds_sock_list rds_tcp_tc_info / rds6_tcp_tc_info -> rds_tcp_tc_list rds_conn_info / rds6_conn_info, rds_conn_message_info_cmn (for the *_SEND_MESSAGES and *_RETRANS_MESSAGES variants), rds_for_each_conn_info (for RDS_INFO_IB_CONNECTIONS) -> rds_conn_hash[] The handlers do not filter by the caller's network namespace. rds_info_getsockopt() has no netns or capable() check, and rds_create() has no capable() check, so AF_RDS is reachable from an unprivileged user namespace. As a result, an unprivileged caller in a fresh user_ns plus netns can read the bound address and sock inode of every RDS socket on the host, the peer address of incoming messages on every RDS socket on the host, the peer address and TCP sequence numbers of every rds-tcp connection on the host, and the peer address and RDS sequence numbers of every RDS connection on the host. The rds-tcp transport is reachable from a non-initial netns (see rds_set_transport()), so a one-shot init_net gate at rds_info_getsockopt() would deny legitimate per-netns visibility to rds-tcp callers. Instead, filter at each handler by comparing the netns of the caller's socket to the netns of the list entry, or to rds_conn_net(conn) for connection paths. Only copy entries whose netns matches the caller. Counters (RDS_INFO_COUNTERS) are aggregate statistics and remain global. Reproducer (KASAN VM, rds and rds_tcp loaded): an AF_RDS socket binds 127.0.0.1:4242 in init_net as root. A child process enters a fresh user_ns plus netns and opens AF_RDS there, then calls getsockopt(SOL_RDS, RDS_INFO_SOCKETS). Before this change, the child sees the init_net socket. After this change, the child sees zero entries. Suggested-by: Allison Henderson Reviewed-by: Allison Henderson Co-developed-by: Praveen Kakkolangara Signed-off-by: Praveen Kakkolangara Signed-off-by: Maoyi Xie --- v2: rebased onto net/main tip (b266bacba) so patchwork can apply. No code changes. Carries forward Reviewed-by from v1 review. Re-verified on KASAN VM with the same PoC: attacker in fresh user_ns plus netns sees zero RDS_INFO_SOCKETS entries while init_net access is preserved. v1: https://lore.kernel.org/r/20260506075031.2238596-1-maoyixie.tju@gmail.com net/rds/af_rds.c | 24 ++++++++++++++++++++++-- net/rds/connection.c | 13 +++++++++++++ net/rds/tcp.c | 25 +++++++++++++++++++++---- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index 76f625986..98f3cfd48 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c @@ -735,6 +735,7 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len, struct rds_info_iterator *iter, struct rds_info_lengths *lens) { + struct net *net = sock_net(sock->sk); struct rds_sock *rs; struct rds_incoming *inc; unsigned int total = 0; @@ -744,6 +745,9 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len, spin_lock_bh(&rds_sock_lock); list_for_each_entry(rs, &rds_sock_list, rs_item) { + /* Only show sockets in the caller's netns. */ + if (!net_eq(sock_net(rds_rs_to_sk(rs)), net)) + continue; /* This option only supports IPv4 sockets. */ if (!ipv6_addr_v4mapped(&rs->rs_bound_addr)) continue; @@ -774,6 +778,7 @@ static void rds6_sock_inc_info(struct socket *sock, unsigned int len, struct rds_info_iterator *iter, struct rds_info_lengths *lens) { + struct net *net = sock_net(sock->sk); struct rds_incoming *inc; unsigned int total = 0; struct rds_sock *rs; @@ -783,6 +788,9 @@ static void rds6_sock_inc_info(struct socket *sock, unsigned int len, spin_lock_bh(&rds_sock_lock); list_for_each_entry(rs, &rds_sock_list, rs_item) { + /* Only show sockets in the caller's netns. */ + if (!net_eq(sock_net(rds_rs_to_sk(rs)), net)) + continue; read_lock(&rs->rs_recv_lock); list_for_each_entry(inc, &rs->rs_recv_queue, i_item) { @@ -806,6 +814,7 @@ static void rds_sock_info(struct socket *sock, unsigned int len, struct rds_info_iterator *iter, struct rds_info_lengths *lens) { + struct net *net = sock_net(sock->sk); struct rds_info_socket sinfo; unsigned int cnt = 0; struct rds_sock *rs; @@ -820,6 +829,9 @@ static void rds_sock_info(struct socket *sock, unsigned int len, } list_for_each_entry(rs, &rds_sock_list, rs_item) { + /* Only show sockets in the caller's netns. */ + if (!net_eq(sock_net(rds_rs_to_sk(rs)), net)) + continue; /* This option only supports IPv4 sockets. */ if (!ipv6_addr_v4mapped(&rs->rs_bound_addr)) continue; @@ -847,17 +859,24 @@ static void rds6_sock_info(struct socket *sock, unsigned int len, struct rds_info_iterator *iter, struct rds_info_lengths *lens) { + struct net *net = sock_net(sock->sk); struct rds6_info_socket sinfo6; + unsigned int cnt = 0; struct rds_sock *rs; len /= sizeof(struct rds6_info_socket); spin_lock_bh(&rds_sock_lock); - if (len < rds_sock_count) + if (len < rds_sock_count) { + cnt = rds_sock_count; goto out; + } list_for_each_entry(rs, &rds_sock_list, rs_item) { + /* Only show sockets in the caller's netns. */ + if (!net_eq(sock_net(rds_rs_to_sk(rs)), net)) + continue; sinfo6.sndbuf = rds_sk_sndbuf(rs); sinfo6.rcvbuf = rds_sk_rcvbuf(rs); sinfo6.bound_addr = rs->rs_bound_addr; @@ -867,10 +886,11 @@ static void rds6_sock_info(struct socket *sock, unsigned int len, sinfo6.inum = sock_i_ino(rds_rs_to_sk(rs)); rds_info_copy(iter, &sinfo6, sizeof(sinfo6)); + cnt++; } out: - lens->nr = rds_sock_count; + lens->nr = cnt; lens->each = sizeof(struct rds6_info_socket); spin_unlock_bh(&rds_sock_lock); diff --git a/net/rds/connection.c b/net/rds/connection.c index c10b7ed06..7c8ab8e97 100644 --- a/net/rds/connection.c +++ b/net/rds/connection.c @@ -568,6 +568,7 @@ static void rds_conn_message_info_cmn(struct socket *sock, unsigned int len, struct rds_info_lengths *lens, int want_send, bool isv6) { + struct net *net = sock_net(sock->sk); struct hlist_head *head; struct list_head *list; struct rds_connection *conn; @@ -590,6 +591,9 @@ static void rds_conn_message_info_cmn(struct socket *sock, unsigned int len, struct rds_conn_path *cp; int npaths; + /* Only show connections in the caller's netns. */ + if (!net_eq(rds_conn_net(conn), net)) + continue; if (!isv6 && conn->c_isv6) continue; @@ -688,6 +692,7 @@ void rds_for_each_conn_info(struct socket *sock, unsigned int len, u64 *buffer, size_t item_len) { + struct net *net = sock_net(sock->sk); struct hlist_head *head; struct rds_connection *conn; size_t i; @@ -700,6 +705,9 @@ void rds_for_each_conn_info(struct socket *sock, unsigned int len, for (i = 0, head = rds_conn_hash; i < ARRAY_SIZE(rds_conn_hash); i++, head++) { hlist_for_each_entry_rcu(conn, head, c_hash_node) { + /* Only show connections in the caller's netns. */ + if (!net_eq(rds_conn_net(conn), net)) + continue; /* Zero the per-item buffer before handing it to the * visitor so any field the visitor does not write - @@ -733,6 +741,7 @@ static void rds_walk_conn_path_info(struct socket *sock, unsigned int len, u64 *buffer, size_t item_len) { + struct net *net = sock_net(sock->sk); struct hlist_head *head; struct rds_connection *conn; size_t i; @@ -747,6 +756,10 @@ static void rds_walk_conn_path_info(struct socket *sock, unsigned int len, hlist_for_each_entry_rcu(conn, head, c_hash_node) { struct rds_conn_path *cp; + /* Only show connections in the caller's netns. */ + if (!net_eq(rds_conn_net(conn), net)) + continue; + /* XXX We only copy the information from the first * path for now. The problem is that if there are * more than one underlying paths, we cannot report diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 654e23d13..ef9e958ca 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -235,20 +235,27 @@ static void rds_tcp_tc_info(struct socket *rds_sock, unsigned int len, struct rds_info_iterator *iter, struct rds_info_lengths *lens) { + struct net *net = sock_net(rds_sock->sk); struct rds_info_tcp_socket tsinfo; struct rds_tcp_connection *tc; + unsigned int cnt = 0; unsigned long flags; spin_lock_irqsave(&rds_tcp_tc_list_lock, flags); - if (len / sizeof(tsinfo) < rds_tcp_tc_count) + if (len / sizeof(tsinfo) < rds_tcp_tc_count) { + cnt = rds_tcp_tc_count; goto out; + } list_for_each_entry(tc, &rds_tcp_tc_list, t_list_item) { struct inet_sock *inet = inet_sk(tc->t_sock->sk); if (tc->t_cpath->cp_conn->c_isv6) continue; + /* Only show connections in the caller's netns. */ + if (!net_eq(rds_conn_net(tc->t_cpath->cp_conn), net)) + continue; tsinfo.local_addr = inet->inet_saddr; tsinfo.local_port = inet->inet_sport; @@ -263,10 +270,11 @@ static void rds_tcp_tc_info(struct socket *rds_sock, unsigned int len, tsinfo.tos = tc->t_cpath->cp_conn->c_tos; rds_info_copy(iter, &tsinfo, sizeof(tsinfo)); + cnt++; } out: - lens->nr = rds_tcp_tc_count; + lens->nr = cnt; lens->each = sizeof(tsinfo); spin_unlock_irqrestore(&rds_tcp_tc_list_lock, flags); @@ -281,19 +289,27 @@ static void rds6_tcp_tc_info(struct socket *sock, unsigned int len, struct rds_info_iterator *iter, struct rds_info_lengths *lens) { + struct net *net = sock_net(sock->sk); struct rds6_info_tcp_socket tsinfo6; struct rds_tcp_connection *tc; + unsigned int cnt = 0; unsigned long flags; spin_lock_irqsave(&rds_tcp_tc_list_lock, flags); - if (len / sizeof(tsinfo6) < rds6_tcp_tc_count) + if (len / sizeof(tsinfo6) < rds6_tcp_tc_count) { + cnt = rds6_tcp_tc_count; goto out; + } list_for_each_entry(tc, &rds_tcp_tc_list, t_list_item) { struct sock *sk = tc->t_sock->sk; struct inet_sock *inet = inet_sk(sk); + /* Only show connections in the caller's netns. */ + if (!net_eq(rds_conn_net(tc->t_cpath->cp_conn), net)) + continue; + tsinfo6.local_addr = sk->sk_v6_rcv_saddr; tsinfo6.local_port = inet->inet_sport; tsinfo6.peer_addr = sk->sk_v6_daddr; @@ -306,10 +322,11 @@ static void rds6_tcp_tc_info(struct socket *sock, unsigned int len, tsinfo6.last_seen_una = tc->t_last_seen_una; rds_info_copy(iter, &tsinfo6, sizeof(tsinfo6)); + cnt++; } out: - lens->nr = rds6_tcp_tc_count; + lens->nr = cnt; lens->each = sizeof(tsinfo6); spin_unlock_irqrestore(&rds_tcp_tc_list_lock, flags); base-commit: b266bacba796ff5c4dcd2ae2fc08aacf7ab39153 -- 2.34.1