From nobody Sun Jun 14 07:36:20 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AC30255F2D; Fri, 1 May 2026 15:53:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777650796; cv=none; b=EOQ9Q03sGNAtD38Dvph0rzwc8d5QkeQ+OMN9eKHpH9TLcoX0fiAfDx3GqJVG2CrclvQ/1rTvv7IJD5I86F+bkvJiYkEpe7HOr3KgrNuMWBAZzdUwY1McYpzn94NDi5iEOGs4LO/rNVhgu9g6v0QSrToyJmDsx3UsdCQm7vjcRBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777650796; c=relaxed/simple; bh=2RzQAc1xCBTOApgSCT3b/XDOkjZpHj50sn+KhiO7Kv0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ue3NJqBBP8NTk9bw+83senZIqBydC36c9tCjjq6gZByW7661xp1X9BKX3i59O25wsNGvtroYuWpt3KMCCCX9qJzDLplQudsUIFW0DhRUqwtcabg3iorfDKgfJxkbriozwKmb6B5BBaMREccZ8P5WrtWRmWlUxKhA3Y0Es0NsbKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=LwvONb9C; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="LwvONb9C" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=wk6HrIetaG5h57CrSbWNYYlAjHlopMNgZIksPE136dQ=; b=LwvONb9CPQQlR7vWdEvRkY4wws 7gGbHNYxpdvSMLWAZvjhKMXIfbnSFfcPeCDSoMaWKrw8TdqTMwI+bX/22HyKGfX/HsUszFgJfgjbK NdAn5I2ZnY3NVzlIlDHR1458jglJX4p0950pwcDMSHPeDgWCb7LIPrl23yK6B+TJgBIkOOiveFc1S BMrdr9q2HuOndbFAxIpsL1Oiri8vT3NBWqYeexsRNIyZ7Qf2O0dMNPJfdlkawlKMGR0q73eoZ39XD cGemnjslRL7J00b+wLL2Ht3jUYExo1MRmEaiRIyu2E5NY4YeKxrAhwMud62gEDuhsBDmM7Ov/VV/K EikDVXtw==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) (envelope-from ) id 1wIqAy-008gXq-1b; Fri, 01 May 2026 15:53:12 +0000 From: Breno Leitao Date: Fri, 01 May 2026 08:52:51 -0700 Subject: [PATCH net-next 1/3] netlink: convert to getsockopt_iter Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260501-getsock_one-v1-1-810ce23ea70e@debian.org> References: <20260501-getsock_one-v1-0-810ce23ea70e@debian.org> In-Reply-To: <20260501-getsock_one-v1-0-810ce23ea70e@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefano Garzarella , Shuah Khan , sdf.kernel@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-453a6 X-Developer-Signature: v=1; a=openpgp-sha256; l=3187; i=leitao@debian.org; h=from:subject:message-id; bh=2RzQAc1xCBTOApgSCT3b/XDOkjZpHj50sn+KhiO7Kv0=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp9MxeOV3EhrpJhtSFkKpq6NyBuuzMgfbR2eN4m MnyhjsFZrOJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafTMXgAKCRA1o5Of/Hh3 bXDrD/kBVcq49jX6TQWTuCp94RKqjrrsPW2Bi5tVQQQaG35DyS+Nmp1yeVXXCsoys6m88H5hdro RQelY2vgG/k4qIdc+SIClvFua6QYgOtUDvnVJR6ciWqC9bvt4uzG1pBz7cTPWTnF1ly5uJTok3H KgoGcLIYlmprQdtPy3fWYplo/zdLw6DCNzMchb91EPT4eieDF3zdFPSqLHGgMh0Jy9gtMgvi2Pm 7T97f82k9ltLbtbaFyZV5dMfNKhypYOHGZPs4GTKb5QsNtMZv0jCPDFnYcHI2SzE8eBD9E2YxpW 9c9+U9SdqKZi38tDDKWC0qUpCFoep/MGqbnCFniGT5ZBVjl39xxqxBthYGCdv6hBvLZrrD9jla4 iTzNmNrIJAeynw2/k6/D+aIyXB9cJSzHBYDITeNcjwPPbwW5hht/YgLtVJN3y1d7mtzt39sg4eM rdjluoC3Cf6peF5hEobI7P/30NnR45Y1OpVDZfXMvzkjO9IkKuravOob4W9Zf1Kg0tzWF91Vvt3 JdxP6TS0RQi8Md2BpYXtzfaaGUcpNbPQ7hwU1mI4tgNMHXQ/4tzlSOmzy1jcl7aNDVwcnW89lA1 OAu9UQsgNLdlbqM4P5oVflIac51Oukbkj35EdmgMThkCimRiCG3fy4N5RxcjoZKiYhUrln0sHsr YfV3d5IlP7mbfwA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert AF_NETLINK's getsockopt implementation to use the new getsockopt_iter callback with sockopt_t. Key changes: - Replace (char __user *optval, int __user *optlen) with sockopt_t *opt - Use opt->optlen for buffer length (input) and returned size (output) - Use copy_to_iter() instead of put_user()/copy_to_user() - For NETLINK_LIST_MEMBERSHIPS: walk the groups bitmap and emit each u32 sequentially via copy_to_iter(), then set opt->optlen to the total size required (ALIGN(BITS_TO_BYTES(ngroups), sizeof(u32))). The wrapper writes opt->optlen back to userspace even on partial failure, preserving the existing API that lets userspace discover the needed allocation size. Signed-off-by: Breno Leitao Acked-by: Stanislav Fomichev --- net/netlink/af_netlink.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2aeb0680807d6..db3be485b4804 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -1716,18 +1717,18 @@ static int netlink_setsockopt(struct socket *sock, = int level, int optname, } =20 static int netlink_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct sock *sk =3D sock->sk; struct netlink_sock *nlk =3D nlk_sk(sk); unsigned int flag; int len, val; + u32 group; =20 if (level !=3D SOL_NETLINK) return -ENOPROTOOPT; =20 - if (get_user(len, optlen)) - return -EFAULT; + len =3D opt->optlen; if (len < 0) return -EINVAL; =20 @@ -1751,14 +1752,14 @@ static int netlink_getsockopt(struct socket *sock, = int level, int optname, =20 idx =3D pos / sizeof(unsigned long); shift =3D (pos % sizeof(unsigned long)) * 8; - if (put_user((u32)(nlk->groups[idx] >> shift), - (u32 __user *)(optval + pos))) { + group =3D (u32)(nlk->groups[idx] >> shift); + if (copy_to_iter(&group, sizeof(u32), + &opt->iter_out) !=3D sizeof(u32)) { err =3D -EFAULT; break; } } - if (put_user(ALIGN(BITS_TO_BYTES(nlk->ngroups), sizeof(u32)), optlen)) - err =3D -EFAULT; + opt->optlen =3D ALIGN(BITS_TO_BYTES(nlk->ngroups), sizeof(u32)); netlink_unlock_table(); return err; } @@ -1784,8 +1785,8 @@ static int netlink_getsockopt(struct socket *sock, in= t level, int optname, len =3D sizeof(int); val =3D test_bit(flag, &nlk->flags); =20 - if (put_user(len, optlen) || - copy_to_user(optval, &val, len)) + opt->optlen =3D len; + if (copy_to_iter(&val, len, &opt->iter_out) !=3D len) return -EFAULT; =20 return 0; @@ -2813,7 +2814,7 @@ static const struct proto_ops netlink_ops =3D { .listen =3D sock_no_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D netlink_setsockopt, - .getsockopt =3D netlink_getsockopt, + .getsockopt_iter =3D netlink_getsockopt, .sendmsg =3D netlink_sendmsg, .recvmsg =3D netlink_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sun Jun 14 07:36:20 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 142E63D3329; Fri, 1 May 2026 15:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777650800; cv=none; b=bBZ/49HvAtKAdJhA/thsUl0dn35JvbzxuSsa67uruvrorQeOc+QdCgHQEFTxVdgL34xVDnomhayPCE4vGTo6Wa3ZND2CxgOUSKteY7p8g0uZKYXeQSsX+9rBnoLhFuyksCi39ebqSnE8HV6CT2dKazF9k396rHd8EwA5LD3Tyz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777650800; c=relaxed/simple; bh=nKqsENwt7zl8D64Zk3SgAIA9zAPWDo4dhBidlktOtXI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r6EEjvcakMQOEK1ASWgk2mWug29iv8ar3Vaer8s/JT41TcTWzZdzWCDZjlt9ZSpNebx6xXeXqa0NIGefSR3EsqyFS8P0kQvGNPuoaARe9cfx7wT3mgt0gsfR8B65bHSp62SSGrvqRmvxImUtmo4mHna/1Mo/2fUmgzzAvjT7uUM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=YrsSLkVt; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="YrsSLkVt" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=qcrw3v+wIZaPGl3hCbJKV0pWXoH63HuPgzadTbwie7w=; b=YrsSLkVtG1xSAfIy/1Xw71I40E HbHDMURh41pZdvCpuARnaSo7rxGtlgeYV0uwAt4ODI7L7p+/APOaDx9KnTgZ0X4C3AyoJ5Jr9Iwlf AIRH8rM1VsT0RfgzPsu0qRbhjqnNTgGEggJE3bIrajWdkdKdGh9eryO4yX4CIrU5kTgwEdIi4pPxD qwkodR0xVcp/EUyL0aLVKejo8+bqeMVK/FamEEm9/LuvZ6XPvwb/JN9l9NFJHztZgltMoAbLRFTPA EHMSo7e2nK5+usEptjkOuP1P7nKUc2IOBcvU6oTfVj3l3/2tfOgeUWLzgpBcCp2WgEFSooQhGW0Ou QAjrQK5w==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) (envelope-from ) id 1wIqB2-008gXs-2j; Fri, 01 May 2026 15:53:17 +0000 From: Breno Leitao Date: Fri, 01 May 2026 08:52:52 -0700 Subject: [PATCH net-next 2/3] vsock: convert to getsockopt_iter Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260501-getsock_one-v1-2-810ce23ea70e@debian.org> References: <20260501-getsock_one-v1-0-810ce23ea70e@debian.org> In-Reply-To: <20260501-getsock_one-v1-0-810ce23ea70e@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefano Garzarella , Shuah Khan , sdf.kernel@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-453a6 X-Developer-Signature: v=1; a=openpgp-sha256; l=2745; i=leitao@debian.org; h=from:subject:message-id; bh=nKqsENwt7zl8D64Zk3SgAIA9zAPWDo4dhBidlktOtXI=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp9MxeICUvzlYmvxzVQM9PPYGIrdo2NwL0xtO6W H0xx4Sa8HmJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafTMXgAKCRA1o5Of/Hh3 bV+MD/sGxW0tC4svuAbveKyUQ+ATkRZuctf8c6iTSjPdhol0xh277kVmoZ7jE90rwn3sCTe5gB4 dqOpmblR7UNS1DqY+oS2HlFBHU+EoCsVeQvagO9qas+K1f45bq+dycoC3weAS0wXFPqB/q1WmkC 2RdHJJKmhOoOBDmxix6lfR1PwXoR50JLeuBrnlwkDNen3jsBAq4gkjptnAfQPrxprs4X+xX4Ck2 rGQd6r8w2pyLDbzEmFzRa07x4mogS2l2KScF//7QvNZDwEUMPpJm0uvZZBTyLV1BLpHVyMV2I23 SlCeywDb0QIwllaMjzGOMYZ9UUdImOzzBaK/gLuIxdoqE7bseYH70lGRgWjCK1Pn8ZKUYOQQND5 8IdWdTo9zkf4nMAjzjTl1XonodbwsHXbRNRhE+/Sf1VXwAlcsdgby/y+RpQ+KmtVJqh6hyM/g1J pgzBA7LZMPCJhYdrU+ia27leB9w8uaRfOdED+lBEQU/+OUoeaE0I/fIQNTRIIuhv/9Xl2/uWZkk wH5/SCJa5KXLuLkD9k1kQdVnqdWmoZGkRAeE6/TrJzbr5bWbrOX6iEe/buGdFw8Um8+JAkrBMHQ buZROQM3gCTxgWnSgxCMyrG4G9OueJuyI+Dd9M+5/hFY81CcWlpq44Jggd2UGc9pS85BDHXV9y0 sSbSBumXZFLJB/Q== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert AF_VSOCK's getsockopt implementation to use the new getsockopt_iter callback with sockopt_t. The single vsock_connectible_getsockopt() callback is shared by both vsock_stream_ops and vsock_seqpacket_ops, so both proto_ops are updated to use .getsockopt_iter. Key changes: - Replace (char __user *optval, int __user *optlen) with sockopt_t *opt - Use opt->optlen for buffer length (input) and returned size (output) - Use copy_to_iter() instead of put_user()/copy_to_user() Signed-off-by: Breno Leitao Acked-by: Stanislav Fomichev Reviewed-by: Bobby Eshleman --- net/vmw_vsock/af_vsock.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 44037b066a5ff..d4a97eeb596e6 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -155,6 +155,7 @@ #include #include #include +#include #include #include #include @@ -2091,8 +2092,7 @@ static int vsock_connectible_setsockopt(struct socket= *sock, =20 static int vsock_connectible_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, - int __user *optlen) + sockopt_t *opt) { struct sock *sk =3D sock->sk; struct vsock_sock *vsk =3D vsock_sk(sk); @@ -2110,8 +2110,7 @@ static int vsock_connectible_getsockopt(struct socket= *sock, if (level !=3D AF_VSOCK) return -ENOPROTOOPT; =20 - if (get_user(len, optlen)) - return -EFAULT; + len =3D opt->optlen; =20 memset(&v, 0, sizeof(v)); =20 @@ -2142,11 +2141,10 @@ static int vsock_connectible_getsockopt(struct sock= et *sock, return -EINVAL; if (len > lv) len =3D lv; - if (copy_to_user(optval, &v, len)) + if (copy_to_iter(&v, len, &opt->iter_out) !=3D len) return -EFAULT; =20 - if (put_user(len, optlen)) - return -EFAULT; + opt->optlen =3D len; =20 return 0; } @@ -2631,7 +2629,7 @@ static const struct proto_ops vsock_stream_ops =3D { .listen =3D vsock_listen, .shutdown =3D vsock_shutdown, .setsockopt =3D vsock_connectible_setsockopt, - .getsockopt =3D vsock_connectible_getsockopt, + .getsockopt_iter =3D vsock_connectible_getsockopt, .sendmsg =3D vsock_connectible_sendmsg, .recvmsg =3D vsock_connectible_recvmsg, .mmap =3D sock_no_mmap, @@ -2653,7 +2651,7 @@ static const struct proto_ops vsock_seqpacket_ops =3D= { .listen =3D vsock_listen, .shutdown =3D vsock_shutdown, .setsockopt =3D vsock_connectible_setsockopt, - .getsockopt =3D vsock_connectible_getsockopt, + .getsockopt_iter =3D vsock_connectible_getsockopt, .sendmsg =3D vsock_connectible_sendmsg, .recvmsg =3D vsock_connectible_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sun Jun 14 07:36:20 2026 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A76443D171E; Fri, 1 May 2026 15:53:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777650805; cv=none; b=MsfhqGJeEWRVmWavwjvCV+QlVf0ulWZQNGVivQtCYeIDfKG84vD4qFW1z9iEpPUYbPX4SQrEWieXnCwf3ayiwwHnrl/o35kYT9yTG5H+2an7E+oL5AA4eiL6YAh0A89g0Eo7XNUcDE7CHcBC1XrlE1+y7Pe8D0LCWRnV4Xe2QFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777650805; c=relaxed/simple; bh=FNs5J5Ppb9l1ztLphXVsPoaZSfqh9Dqf/9mSZ8ms9Cw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MRlRBO4qbFDwxjUA9j8FZsMFAzoZpcAjvyrDV6vUV2Ry0JSAhjmZFq9o41WlR/LyCF+ZowIq32NCxJmQuTWF1pPRjJg+L3+ADiIfqci9vYn/z2P3nbXGiulNJvCx6kQVehyGFDYSO1E27wq/KshNjhJtFEDT4ime9dqJnR2GXqo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=fFCZZBaM; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="fFCZZBaM" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=+4lpJ9L4N91jikzY7fBps/QDWvLq2JJ9buQYKU46m78=; b=fFCZZBaM+1hmr4K4Gb5kLz0Lnt LA2RWmIuC7GVr229/QCKKXCCRTmZaWiRfEpI6UuIn5k7ZZdXh2rMW3+tmwlipnxtOCTecFAnxGUkw 5CoB9REOEMxXOzzvDtSFi/wmmIaV4zrUQub+BdvlUs3AhpOvLttOEfofcmD3LxMv9GgH99ZdTTlSe rYgtjZQfdPo11ZDoCNtHhtLsacPPnFDBFh4dmf9JC57XwGWAroDZifIfmQXwpGZ1ooKYZFPI/OyzY Hl2qFLDRKxzcam0PVl+XaUW2kHKgmXvudjnsSYi3RbcdjLstT0FQQWdYP6R6eCnc+ahv5sMdg3qGB vT9YMy/g==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) (envelope-from ) id 1wIqB7-008gYH-0i; Fri, 01 May 2026 15:53:21 +0000 From: Breno Leitao Date: Fri, 01 May 2026 08:52:53 -0700 Subject: [PATCH net-next 3/3] net: selftests: add getsockopt_iter regression tests Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260501-getsock_one-v1-3-810ce23ea70e@debian.org> References: <20260501-getsock_one-v1-0-810ce23ea70e@debian.org> In-Reply-To: <20260501-getsock_one-v1-0-810ce23ea70e@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefano Garzarella , Shuah Khan , sdf.kernel@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-453a6 X-Developer-Signature: v=1; a=openpgp-sha256; l=6606; i=leitao@debian.org; h=from:subject:message-id; bh=FNs5J5Ppb9l1ztLphXVsPoaZSfqh9Dqf/9mSZ8ms9Cw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp9MxewrftFm0LPPjxpzSxjMAg7cM99UVVX2RVP u1UFEqZZ1uJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafTMXgAKCRA1o5Of/Hh3 bejJD/9XqoP3ZXB/ndTEWq2fefaiWFjV05H4/wfeVb+oqfCIZ/JNGoAVZ4b5WbWekt09dB3Dvp3 SJeCOa2t36EEDxyiMyZcvYfJ/iVc6kKqKPO98RH+mQXqxxV+PHyDb5EeHiHZBHdxN0zSQpm32Xe 9v74nag1d94PzXeRRcv+ZoGnu19btB4N+ciNG3EmlcveZ9asTJAkPSAQfJa0X3gF09CIczNvNYR wRSg2l80UB9sqaxCYqqcx0sG+aq8izvVHBrGaFFWlPaIKwDKP+2Pkb++pL5L+5NzSnPkpGW1sqZ ByjuqwE4g43bBpXQorzyLxEb0P/wRiI/cb3kCb5heb6gv5nogr55qRpLsnzpD1WeTSYiP97o8ot kC2UEpxAe+yfrYyGNyPAHSvFqogI54fkQRXRazld6mwYtucA2onWT5X/pGxuB0A83ls4HCSVjXv VxY51VGMOaEGg0ES0qsxAeCHA2ajcB1syA9QXlkHYnqea53PPsqcc/rMd4uWB/moNEixDt4FXXw DgM8uLX+PhjBr/nwzHm4jrKmOawt68MyF2OIOpy+/xjNcivbS+bx4djlsY2muoS7CmnT2h656nF 21Ji4pSTDmmK5A7glsUlCVYoRtPY2mFeWqndulCI5+ymAhyiB10kARen1LoOt64WEkFX6zDuKFK pzdKEUYnnR4iRwQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Add a single kselftest covering the proto_ops getsockopt_iter conversions for AF_NETLINK and AF_VSOCK, using one fixture per protocol: netlink: NETLINK_PKTINFO covers the flag-style int path (exact size, oversize clamp, undersize -EINVAL); NETLINK_LIST_MEMBERSHIPS covers the size-discovery path that always reports the required buffer length back via optlen, even when the user buffer is too small to receive any group bits. vsock: SO_VM_SOCKETS_BUFFER_SIZE covers the u64 path (exact size, oversize clamp, undersize -EINVAL). Each fixture also exercises an unknown optname and a bogus level so the returned-length / errno semantics preserved by the sockopt_t conversion are pinned down. Signed-off-by: Breno Leitao Acked-by: Stanislav Fomichev Reviewed-by: Bobby Eshleman --- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/getsockopt_iter.c | 213 ++++++++++++++++++++++= ++++ 2 files changed, 214 insertions(+) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests= /net/Makefile index a275ed5840265..baa30287cf222 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -176,6 +176,7 @@ TEST_GEN_PROGS :=3D \ bind_timewait \ bind_wildcard \ epoll_busy_poll \ + getsockopt_iter \ icmp_rfc4884 \ ipv6_fragmentation \ proc_net_pktgen \ diff --git a/tools/testing/selftests/net/getsockopt_iter.c b/tools/testing/= selftests/net/getsockopt_iter.c new file mode 100644 index 0000000000000..179f9e84926fd --- /dev/null +++ b/tools/testing/selftests/net/getsockopt_iter.c @@ -0,0 +1,213 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Quick test for getsockopt{_iter} tests. + * + * Each fixture targets one converted protocol and pins down the + * returned-length / errno semantics across buffer-size variations, + * an unknown optname and a bogus level. + * + * - netlink: NETLINK_PKTINFO covers the flag-style int path; the + * NETLINK_LIST_MEMBERSHIPS cases cover the size-discovery path + * that always reports the required buffer length back via optlen, + * even when the user buffer is too small to receive any group bits. + * - vsock: SO_VM_SOCKETS_BUFFER_SIZE covers the u64 path. + * + * Author: Breno Leitao + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "kselftest_harness.h" + +#ifndef AF_VSOCK +#define AF_VSOCK 40 +#endif + +/* ---------- netlink ---------- */ + +FIXTURE(netlink) +{ + int fd; +}; + +FIXTURE_SETUP(netlink) +{ + int group =3D RTNLGRP_LINK; + + self->fd =3D socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); + if (self->fd < 0) + SKIP(return, "AF_NETLINK socket: %s", strerror(errno)); + + /* Joining a multicast group grows nlk->ngroups so the + * NETLINK_LIST_MEMBERSHIPS path has a non-zero size to report. + */ + if (setsockopt(self->fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, + &group, sizeof(group)) < 0) + SKIP(return, "NETLINK_ADD_MEMBERSHIP: %s", strerror(errno)); +} + +FIXTURE_TEARDOWN(netlink) +{ + if (self->fd >=3D 0) + close(self->fd); +} + +TEST_F(netlink, pktinfo_exact) +{ + int val =3D -1; + socklen_t optlen =3D sizeof(val); + + ASSERT_EQ(0, getsockopt(self->fd, SOL_NETLINK, NETLINK_PKTINFO, + &val, &optlen)); + ASSERT_EQ(sizeof(int), optlen); + ASSERT_TRUE(val =3D=3D 0 || val =3D=3D 1); +} + +TEST_F(netlink, pktinfo_oversize_clamped) +{ + char buf[16] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(0, getsockopt(self->fd, SOL_NETLINK, NETLINK_PKTINFO, + buf, &optlen)); + ASSERT_EQ(sizeof(int), optlen); +} + +TEST_F(netlink, pktinfo_undersize) +{ + char buf[2] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_NETLINK, NETLINK_PKTINFO, + buf, &optlen)); + ASSERT_EQ(EINVAL, errno); +} + +TEST_F(netlink, list_memberships_size_discovery) +{ + socklen_t optlen =3D 0; + char dummy; + + ASSERT_EQ(0, getsockopt(self->fd, SOL_NETLINK, + NETLINK_LIST_MEMBERSHIPS, + &dummy, &optlen)); + ASSERT_GT(optlen, 0); + ASSERT_EQ(0, optlen % sizeof(__u32)); +} + +TEST_F(netlink, list_memberships_full_read) +{ + __u32 buf[64] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(0, getsockopt(self->fd, SOL_NETLINK, + NETLINK_LIST_MEMBERSHIPS, + buf, &optlen)); + ASSERT_GT(optlen, 0); + ASSERT_LE(optlen, sizeof(buf)); + ASSERT_EQ(0, optlen % sizeof(__u32)); +} + +TEST_F(netlink, bad_level) +{ + int val; + socklen_t optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_SOCKET + 1, NETLINK_PKTINFO, + &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); +} + +TEST_F(netlink, bad_optname) +{ + int val; + socklen_t optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_NETLINK, 0x7fff, + &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); +} + +/* ---------- vsock ---------- */ + +FIXTURE(vsock) +{ + int fd; +}; + +FIXTURE_SETUP(vsock) +{ + self->fd =3D socket(AF_VSOCK, SOCK_STREAM, 0); + if (self->fd < 0) + SKIP(return, "AF_VSOCK socket: %s", strerror(errno)); +} + +FIXTURE_TEARDOWN(vsock) +{ + if (self->fd >=3D 0) + close(self->fd); +} + +TEST_F(vsock, buffer_size_exact) +{ + uint64_t val =3D 0; + socklen_t optlen =3D sizeof(val); + + ASSERT_EQ(0, getsockopt(self->fd, AF_VSOCK, + SO_VM_SOCKETS_BUFFER_SIZE, + &val, &optlen)); + ASSERT_EQ(sizeof(uint64_t), optlen); + ASSERT_GT(val, 0); +} + +TEST_F(vsock, buffer_size_oversize_clamped) +{ + char buf[16] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(0, getsockopt(self->fd, AF_VSOCK, + SO_VM_SOCKETS_BUFFER_SIZE, + buf, &optlen)); + ASSERT_EQ(sizeof(uint64_t), optlen); +} + +TEST_F(vsock, buffer_size_undersize) +{ + char buf[4] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(-1, getsockopt(self->fd, AF_VSOCK, + SO_VM_SOCKETS_BUFFER_SIZE, + buf, &optlen)); + ASSERT_EQ(EINVAL, errno); +} + +TEST_F(vsock, bad_level) +{ + uint64_t val; + socklen_t optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_SOCKET + 1, + SO_VM_SOCKETS_BUFFER_SIZE, + &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); +} + +TEST_F(vsock, bad_optname) +{ + uint64_t val; + socklen_t optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, AF_VSOCK, 0x7fff, + &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); +} + +TEST_HARNESS_MAIN --=20 2.52.0