From nobody Sat Jun 13 13:34:07 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 049493EF0A0; Thu, 7 May 2026 10:58:07 +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=1778151503; cv=none; b=g2z7bLtG/IoM8CiIAFOvJ50uqvblRouE1M2NqFUDHMakiaQclbMwTE+4DhW5H0BO6gVNYjob17wO4xRz6hzdRSm6rUIDUWXX11mLPp1t+XMYaUxoSRU+PyN+r7jdgtA8c7w8GW1eDWUp9Fy2QRnaG6MGJuFV5MNvOsEJdl+LEug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778151503; c=relaxed/simple; bh=PEiFTTvD5HbPowkM40xyoZftErVoXe3+8eFL12D9lSk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s4k2G7hJZjIZeXAVVpN2RIh/VXMxSP5xqA8ZYFPHMgM7KTbobUSxkUY/EQVNHAvYH/5hURgd9XZXl+gwijs9lzWVHCiv6Gug+BH6IzomINOQr49G4RRmCzkQc9ULluzLXcSiEsP6VQOPi7e7tLUCMD4AhUQeKYsUeqp52tHFLFQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=VSm+c0cD; 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=pass 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="VSm+c0cD" 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=B/UCBY8qkZL6VTVSrvN0oMYXSzmxSRwhsEudHIJA8lQ=; b=VSm+c0cDsI+S1uMQLQ8Ba2QizP 3xs7BI7OS34jI6kf1f9SWoPevJI7/Wg2l3oonyn7Rz9HOgXGTaFfSWOggN3/ynDQRTo567ksPW8Ad BtJkvquBfrFIudF4nPfPpCJi1+b/pSp7gafLjh7CU+FAo4SJV+8avUVJ7i/asdZ2HS5FZ4TyLdgs1 NDjTiR9pES+L3o8CoDD7TggUiqYiRR3fphlE6lzVukKev1OBCQosc2Jy1DdVYgA04MxKNotRfz8ib 2CTxn3B8/q4D4ClkfXOMj2xKnn3Tml5yYlYJ9ruHEiomCNpCDmn3qrEOv1vOHDQIu6mkjfMcAA6II YJhphKPw==; 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 1wKwQd-004Jnh-0m; Thu, 07 May 2026 10:58:03 +0000 From: Breno Leitao Date: Thu, 07 May 2026 03:57:50 -0700 Subject: [PATCH net-next v2 1/5] mctp: 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: <20260507-getsock_two-v2-1-5873111d9c12@debian.org> References: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> In-Reply-To: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> To: Jeremy Kerr , Matt Johnston , Martin Schiller , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-x25@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, 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=1952; i=leitao@debian.org; h=from:subject:message-id; bh=PEiFTTvD5HbPowkM40xyoZftErVoXe3+8eFL12D9lSk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp/HAw+PqiYlIqu2g+vQIJ4sGKhymICGJH8A5aJ LRNKp5QTrGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafxwMAAKCRA1o5Of/Hh3 bTGZEACddDVc2ljz8il0FwNf0KPysb2S8zdIcMsQ9TuC+lMyGSoofGhrVy29iY5RnpeVrz3UYCP UoO6mFfc12nUH3L2+N2I/IaEgnTKRNT5nLTwwl8qPwi/BGVkK3rl2RGdF78eebhOVxVHJBb2+ps u+wxDia38a1dPmnguJRdkEpu42tyErDYCUl7E8Xp24UGHJqEQ+mdsN+61N/NiXmV1fWQQkqeQbZ dG9VObmJ5dwAYhy0G7vg8N+aqrrb8m5HL+LN7ooZUmj7frFZbDkLNrcwyt60pZH52BxktiU3ABR n963pAmpUOxbGGDi6k/cBBFEeciPAJV/vx30CRjSbbdIYJ+KtiOBPzvhBgrAN0MpA0I73NBPKR2 K80wt6F6ayb/GyYSfClMQZHOUi0oRXFVNSKfl3dJs+ut7Ve+XJnGQQuJojdZQRqs+ZqBc6a5VOe UtK25qzivSsAEdRg3EsqvCw4vqY5annkKGhlh1YtPBBpsUIDMNwN9eighmriyovBAuVD6Swdi0L opc9zrgfBOG3zG18/DVLgctvdJZg5rtZDg9QbpJMXzdz1ShRAbU13Srl04sKmh5wtufbwvkE69b n5oPE77aSTSmXU4wQvp1yEcsC7gCgLFTVcnFtP2eDcTxuRLO4dtjR5r82wq9OPkMZ6n5+zhdTJN VI3iOeCOmvP46yQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert MCTP socket'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) - Use copy_to_iter() instead of copy_to_user() - Add linux/uio.h for copy_to_iter() Signed-off-by: Breno Leitao --- net/mctp/af_mctp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c index 209a963112e3a..8af5e2b3c8d12 100644 --- a/net/mctp/af_mctp.c +++ b/net/mctp/af_mctp.c @@ -12,6 +12,7 @@ #include #include #include +#include =20 #include #include @@ -405,7 +406,7 @@ static int mctp_setsockopt(struct socket *sock, int lev= el, int optname, } =20 static int mctp_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct mctp_sock *msk =3D container_of(sock->sk, struct mctp_sock, sk); int len, val; @@ -413,14 +414,13 @@ static int mctp_getsockopt(struct socket *sock, int l= evel, int optname, if (level !=3D SOL_MCTP) return -EINVAL; =20 - if (get_user(len, optlen)) - return -EFAULT; + len =3D opt->optlen; =20 if (optname =3D=3D MCTP_OPT_ADDR_EXT) { if (len !=3D sizeof(int)) return -EINVAL; val =3D !!msk->addr_ext; - if (copy_to_user(optval, &val, len)) + if (copy_to_iter(&val, len, &opt->iter_out) !=3D len) return -EFAULT; return 0; } @@ -639,7 +639,7 @@ static const struct proto_ops mctp_dgram_ops =3D { .listen =3D sock_no_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D mctp_setsockopt, - .getsockopt =3D mctp_getsockopt, + .getsockopt_iter =3D mctp_getsockopt, .sendmsg =3D mctp_sendmsg, .recvmsg =3D mctp_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sat Jun 13 13:34:07 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 45D483EE1C7; Thu, 7 May 2026 10:58:14 +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=1778151507; cv=none; b=nSs0kCIgzKGOP4Q7TEasQOVtue9BYY9ZaLE/a2XKtzazs6APEeIMVnFG1Xs0hnDSQDwDuF9SzVYuWkyzwCnyRHRz5ONnKKoVY68mN35p7G2EpjldiufqzdmTCL+3HULarDfOAk9+Of1ivftL//Jm5jcUMN2uVDjA1ljVbm51pTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778151507; c=relaxed/simple; bh=RJx8yhwyyKw2tKxOBBz3jJnsb9wrnWIwoTtaruw98bM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AXsMdzGwOeTic/5JK18+pTXSfBG39go2v0MENxSpt2SZj1Qoe1u7/iepC+TNk0LiDL63Il/vMENuxKwA3FA+AiYqeeOIu2gEYwhKK5Vgoavihtuln8lAgEoTlUiYyCJtis4geglMnhkWPPWz4NT7ADMv9okJ2bpNmNONI4MOs4M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=dCmv25SK; 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=pass 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="dCmv25SK" 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=y/EA2/PCsQAddgwb1sb6mzsTdkaIHJzx7OFo9Hnm4N0=; b=dCmv25SKnKO3b69v5xL80cPTw5 d1AyYymWz93zxgGzv6i468rczlcVbf6dtsTTVhHYR5H1w9Wqk+S0I9lZRdcQXxkhLkWYFYVhZAm70 WV9Yu/+sxyIdK10+wvv9plcAZJaZafjmoAhpzhrwh+19N0IxEEVLOvpEXRH979KtziH2a9n43gn++ 5Laq845onavaUUoKYp97oFg08p4Qv8lYRO8kirxg1C13UBe91pJSHx+eakmXWsUxxfPQDodKenJUz B4hV4XWktPTEBhvdyem/+ZXpKl2zfVpFeyXKUJVFzX+JKApv6uYiA9kT1McEuhTJ4ANNPHNIsMMkU GPVi5+Gg==; 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 1wKwQh-004Jnn-2b; Thu, 07 May 2026 10:58:08 +0000 From: Breno Leitao Date: Thu, 07 May 2026 03:57:51 -0700 Subject: [PATCH net-next v2 2/5] llc: 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: <20260507-getsock_two-v2-2-5873111d9c12@debian.org> References: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> In-Reply-To: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> To: Jeremy Kerr , Matt Johnston , Martin Schiller , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-x25@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, 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=2496; i=leitao@debian.org; h=from:subject:message-id; bh=RJx8yhwyyKw2tKxOBBz3jJnsb9wrnWIwoTtaruw98bM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp/HAwfqfpks/pRKw84mfvYsa5iaWR7Jp9SrCwQ KBSCkkS326JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafxwMAAKCRA1o5Of/Hh3 bcubD/4rmF3eEtMrOEkNLZoWz6ZDk67BgnrhZrl94boopDn/TdwZQol/wOp0KCsgsEwroL7hRZl hS4va9u0zyobqWRZHl9d37zFo+H66kSxjDcWr31jhozGyGs2RaS4UkF1Iti3I3wCaklhs3OQBFH gDaKtUnlTb2o4+L42xoyguWBukuIU6gJ6CpJQIEf+lWxNaJx/l8y2xrgcrTbqqcF2GrWsIJNLii eqSBzQuGSiql2jfjjR+arJviTQQoyFzAWND9CZgWqz3ZU+VI32vrwyucfMUEPQxNzPAcOmou/dS TlgmxFErTBPW+Op0SiddQ6AnyBL61Xv4fqUPaE2M5URwl/hDI52FropY1xGcYRTnIBLQ5p523VN wYrOI3UN2yM82hOrmKngQWIHAAkZ8B9RGhlRUSopE/IyEPfxplv1RM3Y81/ZXhLWeq8ONljKVfP eGiVjNzrokvDRG3gSt/CP36oQ0MJCkAqbTFh0tX5pUe0odh5PuHzZa6mdJ2FMdnO9VKTXNxoh+C ARwhhamwRigRF7Oxmaj5c5bvIehtptKzVLhX6Plbpejjrzg9VOP3KmwjRiafZn5OUlCFDdvOv3q dvvDEQe24+w/7QD/E1mUbsIaRA4gehGeyuFCBVcEdh6dZYy3DOUeQ1sKxYuOfa80oL0PFtSLn+D LBfytmXJ44G8kzw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert LLC socket'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() - Add linux/uio.h for copy_to_iter() Signed-off-by: Breno Leitao --- net/llc/af_llc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 1b210db3119e8..35278c519a305 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -27,6 +27,7 @@ #include #include #include +#include =20 #include #include @@ -1166,25 +1167,21 @@ static int llc_ui_setsockopt(struct socket *sock, i= nt level, int optname, * @sock: Socket to get information from. * @level: Socket level user is requesting operations on. * @optname: Operation name. - * @optval: Variable to return operation data in. - * @optlen: Length of optval. + * @opt: sockopt context with iterator and length for returning data. * * Get connection specific socket information. */ static int llc_ui_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct sock *sk =3D sock->sk; struct llc_sock *llc =3D llc_sk(sk); - int val =3D 0, len =3D 0, rc =3D -EINVAL; + int val =3D 0, len, rc =3D -EINVAL; =20 lock_sock(sk); if (unlikely(level !=3D SOL_LLC)) goto out; - rc =3D get_user(len, optlen); - if (rc) - goto out; - rc =3D -EINVAL; + len =3D opt->optlen; if (len !=3D sizeof(int)) goto out; switch (optname) { @@ -1212,7 +1209,8 @@ static int llc_ui_getsockopt(struct socket *sock, int= level, int optname, goto out; } rc =3D 0; - 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) rc =3D -EFAULT; out: release_sock(sk); @@ -1239,7 +1237,7 @@ static const struct proto_ops llc_ui_ops =3D { .listen =3D llc_ui_listen, .shutdown =3D llc_ui_shutdown, .setsockopt =3D llc_ui_setsockopt, - .getsockopt =3D llc_ui_getsockopt, + .getsockopt_iter =3D llc_ui_getsockopt, .sendmsg =3D llc_ui_sendmsg, .recvmsg =3D llc_ui_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sat Jun 13 13:34:07 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 F38783EF0C4; Thu, 7 May 2026 10:58:16 +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=1778151516; cv=none; b=HwIOQImeJ+B/YxQyiRCxYyEvZkPbeTNAsvV0TLVn0uG6LDuXrSd2VU4/6OrL+ApH9A4jJZIdgj5ieiCqe+egRVqnFoEmRferXikJC/DtzVP9BUXI7u906LKFWAkm9GCqPLSx8dMaIxyVvexam3Mxw34Q5Gn6+PneaGDcHq9CrAA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778151516; c=relaxed/simple; bh=4lTzgyDQklQCacFgdaLB2vq4HJBX9MTWUlTxqnOaSwg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S4fO6O5o5sDfMtkotXa6sXKu+itJdoLcMKIDvTc96nLkSO/KS6adfvsHeE9lm9MrLXi7+LbbdCfIxW3QrHrEZJ5XUxdMYEkj92HU4OWDgJvFi1dFoGe3Axv+QvJ4IcCmUTXz1Cs6IXY5mtCubSoA4VynhFgaCPyJSn1CPUBLWtw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=QhNPzIsK; 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=pass 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="QhNPzIsK" 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=j20jcOAexDrO00aqKPg7FRsy8ym9GIdX6jyLAXGErlo=; b=QhNPzIsKeWhPs0rwyo0shY3Cu4 TYWnCJ3irAKXoTv3RGmzpmw9/89S/bj5LZNbodrMytweLU+ReutweryybY8s4JM44chahAlg3c7JE cxbMGGZZ5jGemKPFlWnwsxHDP9M8R1xIWlSt4lhTjIYb6suiS7ww/iKkZM9fTNFgtJbxu1ojEah52 o7DzBTBqCwexs/iUpzz+RstF/VzIeju7ELkPgjuEfxuMsSH+GgxFZe7mfvsELq5zq4CQ4TX981uAU EdZaneOMyACoqA7g5r/ivRYlgxn5j+fQTM7BWn15A39Bpm5bu+KFQVaCykW6EzXluEn/Yh1LNOU3Z Ep716X/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 1wKwQm-004Jnz-0a; Thu, 07 May 2026 10:58:12 +0000 From: Breno Leitao Date: Thu, 07 May 2026 03:57:52 -0700 Subject: [PATCH net-next v2 3/5] x25: 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: <20260507-getsock_two-v2-3-5873111d9c12@debian.org> References: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> In-Reply-To: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> To: Jeremy Kerr , Matt Johnston , Martin Schiller , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-x25@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, 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=2115; i=leitao@debian.org; h=from:subject:message-id; bh=4lTzgyDQklQCacFgdaLB2vq4HJBX9MTWUlTxqnOaSwg=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp/HAwmLgwf7Kben+MgWxW4FeTeaTJZ8T1nW71h x66WN5/omiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafxwMAAKCRA1o5Of/Hh3 bfE8D/9ln2RF2jgXwQmyofT5OQJQz3WLHW4suC/Vm6ifqs+elQq9dYCkWgWfxEHg0hYaJb3gXiG I+OvbOmRvhgdl9aHo5rhElscs/NLIV4oL1ul80nam+GE5S2ruEnMWJ3Pv7y/pX9dWR6npei822S HQv1wJyumNv01PoPX7Xpu1/lVFkFtgmtlUmSLI3l3aH3DjdrW8/pM0W2ty3Z8aTO7Wq+NVed0u/ PJasaXujbbz33Xg0WM2A3gsbu+R8sNPlbHAApskaExF0Q5hXq/M65mwtaH5KDu1XFh5i9JOVW03 iudPl99cYe7N0CUejnZXcF94TRTKQJ0vGgFPEiR43cBNfVnjUpDZ+Hd/IurtKur4wuajleuktpR MjqeIqzZvev1lpi8Y3vI3GQZYz5KlXdWBrwpv5cBWJy/81R1xcqCXcavkplMBSanphLLCZiG647 TqKTYx8kHqs9z85bp/caiUlLCUYlGaiHosoyybQssYlACyQ0NE0eYVGd44m9TDP4WMRanfKR7qt o7ibrY3jI0Me0h81NeLsQMymZ4trTmoLNxGySmTARHnQr+c1g8QAHH/7MzCN8tiV6AzWY5z0vBH 3oO1aVRVGsLa37MHN/Fkv/HspTuFGNPdE1YZxWrhXZI+icPqtzm+5GTR2J1cFzGuBItWZ6tsE3d HdicnwRI/A72ZJw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert X.25 socket'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() - Add linux/uio.h for copy_to_iter() Signed-off-by: Breno Leitao --- net/x25/af_x25.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index af8762b24039d..c31d2af5dd223 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -53,6 +53,7 @@ #include #include #include +#include =20 #include #include @@ -448,7 +449,7 @@ static int x25_setsockopt(struct socket *sock, int leve= l, int optname, } =20 static int x25_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct sock *sk =3D sock->sk; int val, len, rc =3D -ENOPROTOOPT; @@ -456,22 +457,17 @@ static int x25_getsockopt(struct socket *sock, int le= vel, int optname, if (level !=3D SOL_X25 || optname !=3D X25_QBITINCL) goto out; =20 - rc =3D -EFAULT; - if (get_user(len, optlen)) - goto out; + len =3D opt->optlen; =20 rc =3D -EINVAL; if (len < 0) goto out; =20 len =3D min_t(unsigned int, len, sizeof(int)); - - rc =3D -EFAULT; - if (put_user(len, optlen)) - goto out; + opt->optlen =3D len; =20 val =3D test_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags); - rc =3D copy_to_user(optval, &val, len) ? -EFAULT : 0; + rc =3D copy_to_iter(&val, len, &opt->iter_out) !=3D len ? -EFAULT : 0; out: return rc; } @@ -1753,7 +1749,7 @@ static const struct proto_ops x25_proto_ops =3D { .listen =3D x25_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D x25_setsockopt, - .getsockopt =3D x25_getsockopt, + .getsockopt_iter =3D x25_getsockopt, .sendmsg =3D x25_sendmsg, .recvmsg =3D x25_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sat Jun 13 13:34:07 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 D118B3EDAA0; Thu, 7 May 2026 10:58:24 +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=1778151516; cv=none; b=Zg0KkZoXJadG6zruFQuCxJfBkoLWMcT1zmslj/68GhxJ78p3/c1q/eS1v0ekRPdzNTyF4ow2ZGZE8Th0hLaHuT9AzJznuulMJa8pA8hoZS4+IKFypMzQYw0IqXGXeqvim5HI31g08BujyOr+7c1qxqUFFo+JZdqEmgXczHjXRBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778151516; c=relaxed/simple; bh=zG28dLa82KI1lzShfY3rVVpEFZ+TVN568W1asXUfa1w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SzMwpyQFcFyFpWKrGdCkF5CxrAol8Mv1LTxhrYFQr9itO587iuv8MN8/rLIfy2ZcgWA/4g0FuVyhQ6SGIBSfuO0tP/GVi6Kl4+9exN89DdCso7eF6tnD8pKTjUCM4zSJWgenXm7BskEzKAOUEZrCn6cNf+0WS3zssTkVHfSyeJg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=s+771muP; 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=pass 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="s+771muP" 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=NP5/GPNNYVvl09+fUCecdYA0YTlPK9rRi3V66nkG7X8=; b=s+771muPDjepXw2HDGXQ98pBO3 uUssHv+YMmJ1B9zrwGwP9cbbj6My2vAeNkd7mW3GVBKn8KCKO3BSPsRgSh5B/VigSQ1mSDBEyAJYs OjRlKgN8WoeAlFWTzeaxjTOilPOgiWMOcwFUvjSQYvb9klRBXUvHVJIyEYgcSM2Y5lciN+TtnwHW1 pJNMKHH1Lotc5I0g8LVoCtHuwQokA1Xu5eXwwd0kY/kF48SpBH6r+pAJzOgYrR3xnkCauB/HZVt1G H6FEm75uUqMbU8Uncj3gA5U6WSrpPC7LROuSWc1Mse1tXYNEqbyjw2DnFWpw6AMkU7+lP4Vsl4hky y9fgsXSg==; 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 1wKwQq-004JoM-1s; Thu, 07 May 2026 10:58:16 +0000 From: Breno Leitao Date: Thu, 07 May 2026 03:57:53 -0700 Subject: [PATCH net-next v2 4/5] kcm: 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: <20260507-getsock_two-v2-4-5873111d9c12@debian.org> References: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> In-Reply-To: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> To: Jeremy Kerr , Matt Johnston , Martin Schiller , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-x25@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, 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=2411; i=leitao@debian.org; h=from:subject:message-id; bh=zG28dLa82KI1lzShfY3rVVpEFZ+TVN568W1asXUfa1w=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp/HAwBG2tg3sd9zjraiLLiWFTcPIVts8RqyB2/ z+E47876NaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafxwMAAKCRA1o5Of/Hh3 bWR4EACSUmUdPtpoyifbDZWdmxNPFCwIQ1elMni0s09qUoufVqEzyBMoBSPt/B0D8HW/khz7Ljr tZVHqCiTnq+dP9RA9NwKbmfMPQFsSFZ5L+azGNj5AAvjfaw6q27HM/lzoR87uwOk58W6pFVu5Yh vuthEbsr4ID4NuTIBZHWJoxT14txI5lIS/u6Rllwh88aC8x78UUpUjMaBANVoEuBLL0gW8s5AOC CQtZwNMfZ9X66wo7l7kaWxWLbf7uSbJeqM1DvCkVjEaPNzaDUlydp/+oIqv8CmvYHhEzd+xgXP4 jw4qLm+Nrv14XrG6CkeQEzCrXzP863VSifRVjHTgJlpK6NDpoaKiQCH62TDArna4K0n30KtNo/K KEhQBfa9f0+2tQSGyqAjREryUswKE0gajF3vJnK8tRiKzkOqDDTPzYtkUrTieuKaf217SbFUhuh jRjPIQILPnC9/6VbPb7ovGKbCH43ZSEz7lrJ3KLtOUiA7LINljxg+mZk5bor8KX7wcjLBAMBs+f kVFYLR8bQqmZGMf4f5/ysKt3ag+eCsmjioBfpC8oqpHexN3C6oW+R7BbXRpLKc7VaFwIDjFwJ/7 PM1uMz5eLBgyavmwjp/WND18BtqqYEH0B2EhTg2v8ljvJdeKuML6tmx5MSnYDRKo+1WKsaIXJY1 jbLG3o4b7mSVOTw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert KCM socket'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() - Add linux/uio.h for copy_to_iter() Signed-off-by: Breno Leitao --- net/kcm/kcmsock.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 3912e75079f5e..b273213cc68d1 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -24,6 +24,7 @@ #include #include #include +#include =20 #include #include @@ -1167,7 +1168,7 @@ static int kcm_setsockopt(struct socket *sock, int le= vel, int optname, } =20 static int kcm_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct kcm_sock *kcm =3D kcm_sk(sock->sk); int val, len; @@ -1175,9 +1176,7 @@ static int kcm_getsockopt(struct socket *sock, int le= vel, int optname, if (level !=3D SOL_KCM) return -ENOPROTOOPT; =20 - if (get_user(len, optlen)) - return -EFAULT; - + len =3D opt->optlen; if (len < 0) return -EINVAL; =20 @@ -1191,9 +1190,8 @@ static int kcm_getsockopt(struct socket *sock, int le= vel, int optname, return -ENOPROTOOPT; } =20 - if (put_user(len, optlen)) - return -EFAULT; - if (copy_to_user(optval, &val, len)) + opt->optlen =3D len; + if (copy_to_iter(&val, len, &opt->iter_out) !=3D len) return -EFAULT; return 0; } @@ -1755,7 +1753,7 @@ static const struct proto_ops kcm_dgram_ops =3D { .listen =3D sock_no_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D kcm_setsockopt, - .getsockopt =3D kcm_getsockopt, + .getsockopt_iter =3D kcm_getsockopt, .sendmsg =3D kcm_sendmsg, .recvmsg =3D kcm_recvmsg, .mmap =3D sock_no_mmap, @@ -1776,7 +1774,7 @@ static const struct proto_ops kcm_seqpacket_ops =3D { .listen =3D sock_no_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D kcm_setsockopt, - .getsockopt =3D kcm_getsockopt, + .getsockopt_iter =3D kcm_getsockopt, .sendmsg =3D kcm_sendmsg, .recvmsg =3D kcm_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sat Jun 13 13:34:07 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 3DE3B3E92BF; Thu, 7 May 2026 10:58:24 +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=1778151524; cv=none; b=ZiBbs/c0j2zxTwKHu8+FUKMGTZhp+zjo5KfHcAQF53Ykm/9TfL/4GQFxLmFfmeq3n1v2X+cmk4Al9N2KbEdSdtrSGuI2sVaWepoW3NxlrzfRHce3MgQtWFsf5D+uHaGUKhvAgBTGaSvGy0DMLyLUALLIhH9ZwzZqk4ztFfpfC58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778151524; c=relaxed/simple; bh=l18IGkzGKUG05f5QZQid8OMan7Jey+HSy4shswzlQO4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=vFBwIeT5t9yfHhh7HFGvLj/AOX2kee+IhVeqf1WeKepgu32tRdA/EYKRswUB7IyJf/iQInjHGzbmvkG7VcNMj2h7sDzOaFU7J/ZajfFkwxuoxybHkmM4wmrgzPDDU+QGEGJ7sjX61NBmuLffFVfRCLWtoAHQZW84dlMS3jAxwkc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=dA4RCFVK; 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=pass 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="dA4RCFVK" 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=8MF4f0bUeK5/+4FQOcifNfCRHuJo7/exyM7nIjJOTI0=; b=dA4RCFVK8vwrGxosswytdt8yVx tGtYiShl/FoauJR31PE+rDndukvsLbsSwrRUkm1WIiGW/5ujRI+3t93YAyqNkJCI7/dOkjPx1YkcU FA71jewEA6hIAqIjWUFbxKtFC62bd72Sz4m8bsUgrOOMWdFwaV+cV0F0szhKiQIRUUIBqcd4Ee4s6 aMFImpO9fF+KHM7y03vjOJCRdxYn0ghgvn3lWVpz9ATO6oSSqH3cV1L0+K5lx5k9IyMzOTZ8eAegp Pw4gUBJQHPblQXcdxznUt2jjU+kRLZiTwksyx3nEAY0ghmBYX7/k0N0qBbFDiLYTbxxhk/HAQE/zZ 7CiwJSAg==; 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 1wKwQv-004Job-0l; Thu, 07 May 2026 10:58:21 +0000 From: Breno Leitao Date: Thu, 07 May 2026 03:57:54 -0700 Subject: [PATCH net-next v2 5/5] selftests: net: getsockopt_iter: cleanup 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: <20260507-getsock_two-v2-5-5873111d9c12@debian.org> References: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> In-Reply-To: <20260507-getsock_two-v2-0-5873111d9c12@debian.org> To: Jeremy Kerr , Matt Johnston , Martin Schiller , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-x25@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com, Stanislav Fomichev , Bobby Eshleman X-Mailer: b4 0.16-dev-453a6 X-Developer-Signature: v=1; a=openpgp-sha256; l=7235; i=leitao@debian.org; h=from:subject:message-id; bh=l18IGkzGKUG05f5QZQid8OMan7Jey+HSy4shswzlQO4=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp/HAwhrfvgmmY2faAwRXUM+RTtqagW8egcMBoM bSNwPd0S5uJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafxwMAAKCRA1o5Of/Hh3 bbmsD/4rl/NIg1L4BK66/k1oS5ZySRtEAE1DxNa5dsRE7xC7fxNyG6BVbCo1koI344Df6qe4Fr6 GaXIWi4QouQgj09hglpTi2e0Gtr+XM4UDu4acZ5lkC05m7CBcO+VC2R9ADovQpc7j27edI02IQ+ /hKyyVCYblOweqC5bHPr+qIbQ69EjSPWpz+ampRkUUJLTJqkwEInlaUZuXeYBkfZVSfM6t4J1a3 HO/6Fvs2DPRWZpOJlm5qgzTmuXEp5etebT9CpcY+Pe2mDlVXolpbF+X1OqycimtaoJhLzSHdEbl NNNuVGvuSLMcBHVu0Y8CpbDiw4kJ3nKCXJ82uYgO571RsWNcfC1IRlax1FOpK000f8neKiDyXYS eRurPtIofxkbgshhchTDoeDGjFpn9X9tboHMPX12iW6kX4aZZtewifd0vsV/lvAaNT17fk/m/Pa 3mLgtQE0SZ94E6vzFa9p7nalCYvGXw1daaPWQ5MqoT15Kjt/pFXgCZbvHjqq8wHL5vj4g6lr0W6 dL5cPJFdo1I43Uhs67rPiCBUbbSmCL4PS5x1cDhOeP9UM+Mte3rTT/s/dEomOmo2ft/ZBqcc5EP RKTL7xEBnalP1ejf2F3f/fKV6fBLOoWDZTW0GMbRYXUSi56fTuLJPemx9OdDdQIGYMIt7i6GQa1 D4kMxg6ADXWliBA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Apply two cleanups suggested by Stanislav and bobby on the original selftest series: - Reorder local variable declarations into reverse christmas-tree order (longest line first). Because that ordering puts socklen_t optlen before the variable whose size it stores, the "optlen =3D sizeof(...)" initializer is moved out of the declaration to a plain assignment in the test body, as Stanislav suggested. - Add ASSERT_EQ(optlen, ...) on every error path so the value the kernel writes back to the userspace optlen is pinned down even when the syscall returns -1. With do_sock_getsockopt() now writing opt->optlen back to userspace unconditionally, asserting that the netlink/vsock error paths leave the original input length untouched guards against future regressions. Bobby Eshleman pointed out that SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW/OLD return a sock_timeval-shaped payload (16 bytes on 64-bit), which is wider than the u64 case already covered. Add four tests that exercise this path: - connect_timeout_new_exact exact-size buffer - connect_timeout_new_oversize_clamped oversize buffer, clamped - connect_timeout_new_undersize undersize -> -EINVAL, optlen untouched - connect_timeout_old_exact exact-size buffer for OLD optname Suggested-by: Stanislav Fomichev Suggested-by: Bobby Eshleman Signed-off-by: Breno Leitao --- tools/testing/selftests/net/getsockopt_iter.c | 109 ++++++++++++++++++++++= +--- 1 file changed, 98 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/getsockopt_iter.c b/tools/testing/= selftests/net/getsockopt_iter.c index 179f9e84926fd..209569354d0e3 100644 --- a/tools/testing/selftests/net/getsockopt_iter.c +++ b/tools/testing/selftests/net/getsockopt_iter.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "kselftest_harness.h" @@ -61,8 +62,10 @@ FIXTURE_TEARDOWN(netlink) =20 TEST_F(netlink, pktinfo_exact) { + socklen_t optlen; int val =3D -1; - socklen_t optlen =3D sizeof(val); + + optlen =3D sizeof(val); =20 ASSERT_EQ(0, getsockopt(self->fd, SOL_NETLINK, NETLINK_PKTINFO, &val, &optlen)); @@ -73,7 +76,9 @@ TEST_F(netlink, pktinfo_exact) TEST_F(netlink, pktinfo_oversize_clamped) { char buf[16] =3D {}; - socklen_t optlen =3D sizeof(buf); + socklen_t optlen; + + optlen =3D sizeof(buf); =20 ASSERT_EQ(0, getsockopt(self->fd, SOL_NETLINK, NETLINK_PKTINFO, buf, &optlen)); @@ -83,11 +88,14 @@ TEST_F(netlink, pktinfo_oversize_clamped) TEST_F(netlink, pktinfo_undersize) { char buf[2] =3D {}; - socklen_t optlen =3D sizeof(buf); + socklen_t optlen; + + optlen =3D sizeof(buf); =20 ASSERT_EQ(-1, getsockopt(self->fd, SOL_NETLINK, NETLINK_PKTINFO, buf, &optlen)); ASSERT_EQ(EINVAL, errno); + ASSERT_EQ(sizeof(buf), optlen); } =20 TEST_F(netlink, list_memberships_size_discovery) @@ -105,7 +113,9 @@ TEST_F(netlink, list_memberships_size_discovery) TEST_F(netlink, list_memberships_full_read) { __u32 buf[64] =3D {}; - socklen_t optlen =3D sizeof(buf); + socklen_t optlen; + + optlen =3D sizeof(buf); =20 ASSERT_EQ(0, getsockopt(self->fd, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, @@ -117,22 +127,28 @@ TEST_F(netlink, list_memberships_full_read) =20 TEST_F(netlink, bad_level) { + socklen_t optlen; int val; - socklen_t optlen =3D sizeof(val); + + optlen =3D sizeof(val); =20 ASSERT_EQ(-1, getsockopt(self->fd, SOL_SOCKET + 1, NETLINK_PKTINFO, &val, &optlen)); ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); } =20 TEST_F(netlink, bad_optname) { + socklen_t optlen; int val; - socklen_t optlen =3D sizeof(val); + + optlen =3D sizeof(val); =20 ASSERT_EQ(-1, getsockopt(self->fd, SOL_NETLINK, 0x7fff, &val, &optlen)); ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); } =20 /* ---------- vsock ---------- */ @@ -157,8 +173,10 @@ FIXTURE_TEARDOWN(vsock) =20 TEST_F(vsock, buffer_size_exact) { + socklen_t optlen; uint64_t val =3D 0; - socklen_t optlen =3D sizeof(val); + + optlen =3D sizeof(val); =20 ASSERT_EQ(0, getsockopt(self->fd, AF_VSOCK, SO_VM_SOCKETS_BUFFER_SIZE, @@ -170,7 +188,9 @@ TEST_F(vsock, buffer_size_exact) TEST_F(vsock, buffer_size_oversize_clamped) { char buf[16] =3D {}; - socklen_t optlen =3D sizeof(buf); + socklen_t optlen; + + optlen =3D sizeof(buf); =20 ASSERT_EQ(0, getsockopt(self->fd, AF_VSOCK, SO_VM_SOCKETS_BUFFER_SIZE, @@ -181,33 +201,100 @@ TEST_F(vsock, buffer_size_oversize_clamped) TEST_F(vsock, buffer_size_undersize) { char buf[4] =3D {}; - socklen_t optlen =3D sizeof(buf); + socklen_t optlen; + + optlen =3D sizeof(buf); =20 ASSERT_EQ(-1, getsockopt(self->fd, AF_VSOCK, SO_VM_SOCKETS_BUFFER_SIZE, buf, &optlen)); ASSERT_EQ(EINVAL, errno); + ASSERT_EQ(sizeof(buf), optlen); } =20 TEST_F(vsock, bad_level) { + socklen_t optlen; uint64_t val; - socklen_t optlen =3D sizeof(val); + + optlen =3D sizeof(val); =20 ASSERT_EQ(-1, getsockopt(self->fd, SOL_SOCKET + 1, SO_VM_SOCKETS_BUFFER_SIZE, &val, &optlen)); ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); } =20 TEST_F(vsock, bad_optname) { + socklen_t optlen; uint64_t val; - socklen_t optlen =3D sizeof(val); + + optlen =3D sizeof(val); =20 ASSERT_EQ(-1, getsockopt(self->fd, AF_VSOCK, 0x7fff, &val, &optlen)); ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); +} + +/* SO_VM_SOCKETS_CONNECT_TIMEOUT_{NEW,OLD} return a sock_timeval-shaped + * payload, which is wider than u64 on 64-bit. They exercise the path + * where the protocol's reported lv (16 bytes) is larger than the + * common 8-byte u64 case covered above. + */ +TEST_F(vsock, connect_timeout_new_exact) +{ + struct __kernel_sock_timeval tv =3D {}; + socklen_t optlen; + + optlen =3D sizeof(tv); + + ASSERT_EQ(0, getsockopt(self->fd, AF_VSOCK, + SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW, + &tv, &optlen)); + ASSERT_EQ(sizeof(tv), optlen); +} + +TEST_F(vsock, connect_timeout_new_oversize_clamped) +{ + char buf[sizeof(struct __kernel_sock_timeval) * 2] =3D {}; + socklen_t optlen; + + optlen =3D sizeof(buf); + + ASSERT_EQ(0, getsockopt(self->fd, AF_VSOCK, + SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW, + buf, &optlen)); + ASSERT_EQ(sizeof(struct __kernel_sock_timeval), optlen); +} + +TEST_F(vsock, connect_timeout_new_undersize) +{ + socklen_t optlen; + uint64_t val; + + optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, AF_VSOCK, + SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW, + &val, &optlen)); + ASSERT_EQ(EINVAL, errno); + ASSERT_EQ(sizeof(val), optlen); +} + +TEST_F(vsock, connect_timeout_old_exact) +{ + struct __kernel_old_timeval tv =3D {}; + socklen_t optlen; + + optlen =3D sizeof(tv); + + ASSERT_EQ(0, getsockopt(self->fd, AF_VSOCK, + SO_VM_SOCKETS_CONNECT_TIMEOUT_OLD, + &tv, &optlen)); + ASSERT_EQ(sizeof(tv), optlen); } =20 TEST_HARNESS_MAIN --=20 2.52.0