From nobody Sat Jul 25 02:11:16 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 CA0E043CEF5; Mon, 20 Jul 2026 16:23:27 +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=1784564611; cv=none; b=kiJJRrPEU2AQpJ6LfR0bdTpqaj791JX1dPgOgcyAlaYV6OmI+NGJlQeZYof5QlVesPMXstj1LLgKKHQmj8ya9DmPI7U71D5cRp/PM+m5oEJoYdm1kX7v2j8SSDhc4isNMs9KHvUGntSBVhRFL1NRc24BcQA9FsNYHrZN8W/ZCgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784564611; c=relaxed/simple; bh=c5PglPwUQC5mxsBdp2RPxVvoUHdq1cPtE8naNu9cnIA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QQWFUTlCm62fRc5ObrwxkD3EJGfi0MzOH86XqmcRcJW9Xc1m/mO+rXTbebddKnjnHgbOZf1StxIzrcwp0UYglkbt7wKDqnV+/KZisnRRA1UXCcG3LRZkueGmHyWH0wj7SbHUnAlv0mnlmunfBfozTnPYRydxH5JOoQ85/W+gsYE= 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=D1IZ61kp; 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="D1IZ61kp" 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=XC51hEuGBD77AWqPRk8uGjYTB9yK3f3l1kdf5Rac8+0=; b=D1IZ61kpYVggCfa9oeH2cEpUVm 8s+JryBkmlj1FZZLVJ40VQAX+xHFDiwVw1CNJihyJqeKRv47ox/PAVtcVNJ2gre0bPq9ehV24hJXG FZ3124Su49Yj2QQs6FmlCoytb5BHWJBDOSHBd+ZwXMssE/kJyr1RsI62cxnxzEjojhhnhDy0JnGWj liHHEX9TGo4eEx5OManUnJZParjdIDfJpHZWmk1Gjx2zpBGQSxSCP/MQ7vLnBLuXrGaNe0017WuFl b3OW4m0hcK8tGkHv0VRzcwOPtMo6yvCvvU+thVVM6gAJiuKklU4XRCXQRL3dezEvC8jbER7PShNnf cX4Dc1jg==; 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 1wlqm5-001YwC-0C; Mon, 20 Jul 2026 16:23:25 +0000 From: Breno Leitao Date: Mon, 20 Jul 2026 09:17:42 -0700 Subject: [PATCH net-next v2 1/7] ipv6: raw: drop unused level argument from do_rawv6_getsockopt 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: <20260720-getsockopt_phase4-v2-1-8a08fcfa0d72@debian.org> References: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> In-Reply-To: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> To: sdf@fomichev.me, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Remi Denis-Courmont , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , John Fastabend , Sabrina Dubroca , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=1318; i=leitao@debian.org; h=from:subject:message-id; bh=c5PglPwUQC5mxsBdp2RPxVvoUHdq1cPtE8naNu9cnIA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqXktx5EqWpml6AIsP2IxWtrO17EGeUi8TRC0wS ekTiUtnh5SJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCal5LcQAKCRA1o5Of/Hh3 bbdUD/96o9fCnaJd5Xu3TR/ViCiXKEQHCL7lEj9f0Y7t7/veawT01/H9wT3Lg6wJmFjxB3hUUYD Ea2rdioZ3+XCrmPoblzPNj4x8hhZjuAQew9qaR8HSYmFLva438mavwPELJfB1p48hGqOZseE/7n fPymhtFfw/+58OfzzJT8o2pbru5Q6OYdn5el1V1a+vaVZ+vCj1c9F27aEuHmwZ61WlDsYrW7r+J a0wkCU92bBDRwfJY3gRWtbRxTsWrg/oQ1TDTD9+/f/QVEnc2NCvNsIOM930DMIsON7zhFkhlD8F EZ2rUZnm1AkcaL8zfuuLi91K5DZCNdYgjrCK59QveiiHcCiVu9iutzH3Ze/FoYOUqO95JUJRNFy 5/+hU7AzrNNXqpADm/b4j4GpvMlfJGV0nc/lEaTpCMrvBIvUjC2OQN+Jlou40XiuKOoLeV3Ssf6 xBlQw7a8jbmS40UyBOhZsnDxjbhhFRrY666z9uRyDk4kVowUxyoyNeSOHGYAF0Iy7h6WIA6VM1x yfZaJqxVcSO5xsOvZZIW+19Lbsi4xr1AyFt0Pdq5VKT+GIpg1LdmeiM1Tp7ZA8V4FxE7eLBgAX+ vCoievxojRGu9o8Ujm/IxkoNj5HfKT/Znk/bkmDGtsvJE/qYnk/b1pWiemrOjl3wC9nLo56DzaR /uBWb7gXDES29YQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao do_rawv6_getsockopt() takes a level argument but never uses it; the level dispatch is handled by the caller, rawv6_getsockopt(). Drop it, matching ipv4's do_raw_getsockopt(). No functional change. Signed-off-by: Breno Leitao Reviewed-by: Joe Damato --- net/ipv6/raw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 3cc58698cbbd3..99eec36796fb9 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -1051,8 +1051,8 @@ static int rawv6_setsockopt(struct sock *sk, int leve= l, int optname, return do_rawv6_setsockopt(sk, level, optname, optval, optlen); } =20 -static int do_rawv6_getsockopt(struct sock *sk, int level, int optname, - char __user *optval, int __user *optlen) +static int do_rawv6_getsockopt(struct sock *sk, int optname, + char __user *optval, int __user *optlen) { struct raw6_sock *rp =3D raw6_sk(sk); int val, len; @@ -1109,7 +1109,7 @@ static int rawv6_getsockopt(struct sock *sk, int leve= l, int optname, return ipv6_getsockopt(sk, level, optname, optval, optlen); } =20 - return do_rawv6_getsockopt(sk, level, optname, optval, optlen); + return do_rawv6_getsockopt(sk, optname, optval, optlen); } =20 static int rawv6_ioctl(struct sock *sk, int cmd, int *karg) --=20 2.53.0-Meta From nobody Sat Jul 25 02:11:16 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 D9F2243E49B; Mon, 20 Jul 2026 16:23:34 +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=1784564618; cv=none; b=K+n06dUgjxtLHTjr24+ggWEq45IlQDAq9oK4Smu518h3dT06UY/EnlLgafKOkUZjpsYp56Vw2/gq5FNJngZXt5wBXjYtAFftbpm4SOt32iJo+04LyE25gTJuCspvcBkPU8IEf9GFlswnb8aNLdknZ+hHxYQv5QMGSPKC+A0GuEM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784564618; c=relaxed/simple; bh=uQw9+P8SQcNospiW32OdIyj9mAmuKVQRv/ZlolZJPjE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WbisSMLolhQ0Y4WMf4z/zbGZ2hD6ZzHZeMvawalJpfbBLNQ0N5FVG8Ga6/EuSgAc/Azs+vYizKyxLvhyOPdSneyexRTN9jd+8PMWXf214PBg4Ge3cM890aHZoFCWtKMbzmQ9zsB1EP5OEsU9re8MPvTbuRonQgKVZ9NZyymyvNQ= 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=X23DataA; 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="X23DataA" 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=p3olImzVCvMhNN+6I0jr7pI95BV7NvZBpFe/CbmtjVI=; b=X23DataArkdaCScBP8MsOfbhu6 UoTf5fygffZu6VJBcznAr8n+376qgd2aNUZXlLeYxGdv3aCi4jVMjyrkt/WFobPBVoCwFruBzF9Cf CBTsd97vDaxauF4Y3xXwastnpChId/vzI6D7KEVT68amZIDLFkutcVBu/a654NXfq6j7vqL8zgrUR GMM2YdtwaEd5uTMU2Mm5KkeSCo5jzr1Pgyvkl1PDtLLXj3rle8IAvJvPq1q3BFCn7XEdjdW3tF5mx 5l9BhABKj90C97YIEGuB5SNZEHL7h8BEt9vBx50r/2/rOpu0droBivRcyO5Sf18+Z0N4aDrqNzCZ1 sec5uUrw==; 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 1wlqmA-001YwP-0C; Mon, 20 Jul 2026 16:23:30 +0000 From: Breno Leitao Date: Mon, 20 Jul 2026 09:17:43 -0700 Subject: [PATCH net-next v2 2/7] ipv6: raw: convert do_rawv6_getsockopt to sockopt_t 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: <20260720-getsockopt_phase4-v2-2-8a08fcfa0d72@debian.org> References: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> In-Reply-To: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> To: sdf@fomichev.me, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Remi Denis-Courmont , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , John Fastabend , Sabrina Dubroca , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=2266; i=leitao@debian.org; h=from:subject:message-id; bh=uQw9+P8SQcNospiW32OdIyj9mAmuKVQRv/ZlolZJPjE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqXktyVkgCHoe3Jp8tvjpO+VR+nnGW0y8NsvM+o hJOknf9IoWJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCal5LcgAKCRA1o5Of/Hh3 bRlbD/9D1L1z4/Gfu4iqPI3HEHIkDL/vt3qB2YC+++5vlXkiXAG7ywpy/C0oJ2Ud35q3S82EKq6 BxSby7VfFiG1KGmkdKFpaCVfrj1+AoHCyBU/5t+AeC8pC1JtEOCMG60OfaOi9RSrhebBDoBTd34 Qg3IXLEhS58q+F9Q5hO+E1TfTjkBsz3/E+ve3oNHgVlikcPm2utbLNXq110i5QfIw50W8Fe7HC4 it2mp59wI4mI+rQ1bfr4iFbQYZ4NTZiARKogQEcV/3vDq2xRlmP/WHwDF58/3vdSLCGLB/8Pa8T 47iggpN50angGzbBCMb/MxA046DjoWqoi+w4z2u9BTTBT8ttSKWG4gzuUVMPw5gFzKJc6+gUQ6D 4jpnYKKksl7Mds3hzOnN/6WFsfpk2vWz6xIFYi5AaCXzpatHvxT7XzdppMvgCVx9GOKQlMWJtZ0 M2jpLXNIu9Vx6xaSt6e0KK9mNU0uWDBNXpbbn6oG2AruS/1JX8pkUpcH00JERvou+DkfoFi9++C ZD6WjcSRKHhvGGqekWd2BTc16JP5xpgcxG5zcKtyzrPsjw8xCXXm8abYADg4kdHfn7e6I8w3vks tCJFFpuQBeBhJtkzokX4t8i1Q9IrcMTU+td8p3Z+BOJZTrtSRfCLXtNGgfet4e5mHoEPMJNWrhP NyD9/odYpbCrrGA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert do_rawv6_getsockopt to the new sockopt_t model, mirroring what we have in ipv4. The overall goal is to move these callbacks gradually from __user points to use sockopt_t, and this part touches do_rawv6_getsockopt. No functional change. Signed-off-by: Breno Leitao Reviewed-by: Joe Damato --- net/ipv6/raw.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 99eec36796fb9..1f15942d14163 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -1051,14 +1051,12 @@ static int rawv6_setsockopt(struct sock *sk, int le= vel, int optname, return do_rawv6_setsockopt(sk, level, optname, optval, optlen); } =20 -static int do_rawv6_getsockopt(struct sock *sk, int optname, - char __user *optval, int __user *optlen) +static int do_rawv6_getsockopt(struct sock *sk, int optname, sockopt_t *op= t) { struct raw6_sock *rp =3D raw6_sk(sk); int val, len; =20 - if (get_user(len, optlen)) - return -EFAULT; + len =3D opt->optlen; =20 switch (optname) { case IPV6_HDRINCL: @@ -1082,9 +1080,8 @@ static int do_rawv6_getsockopt(struct sock *sk, int o= ptname, =20 len =3D min_t(unsigned int, sizeof(int), len); =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; } @@ -1092,6 +1089,9 @@ static int do_rawv6_getsockopt(struct sock *sk, int o= ptname, static int rawv6_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen) { + sockopt_t opt; + int err; + switch (level) { case SOL_RAW: break; @@ -1109,7 +1109,18 @@ static int rawv6_getsockopt(struct sock *sk, int lev= el, int optname, return ipv6_getsockopt(sk, level, optname, optval, optlen); } =20 - return do_rawv6_getsockopt(sk, optname, optval, optlen); + err =3D sockopt_init_user(&opt, optval, optlen); + if (err) + return err; + + err =3D do_rawv6_getsockopt(sk, optname, &opt); + if (err) + return err; + + if (put_user(opt.optlen, optlen)) + return -EFAULT; + + return 0; } =20 static int rawv6_ioctl(struct sock *sk, int cmd, int *karg) --=20 2.53.0-Meta From nobody Sat Jul 25 02:11:16 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 EC6A843C7BD; Mon, 20 Jul 2026 16:23:38 +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=1784564621; cv=none; b=qLfLXkZBl6Ms51IFOwo2eXQ5V0y+uUBP/OxDEsvSuitFNNDaeeRpCGHib7ZifBHz+clwMeMXlnMBH1l6tXPT7Kaym95ucSqZ8U5L7acJ1rLxW6ELjugsXoSyLy7+dEGpUHQQ2xsZUWOA179U9aL6zWQfcJZRAhB3AVOTn0IiTBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784564621; c=relaxed/simple; bh=cAMTjzFtWpssYhGMnYLYloL7+e38m8IMj+86usmagk8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OShIDNynhmlWiK0VlZCdTteckdqzBMfmuIdF/6/onh8iRyQ74ApLa8jx5ZUSqwNHvBlnLLvMkkY202G01YUuQPcOfKD7voI1liIPiN11Ccpa6n1i1DuZ7gjywXROsLhzy/m3yoESS2vNz5Wl7XjX364hxctaZRm0WStzWJ5ucQE= 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=EWiXlSdi; 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="EWiXlSdi" 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=/ULuSXe8cMJt1jfaDloF8ljpZjBOJlHguRmjs+r/CiQ=; b=EWiXlSdiYZCDDPDrX7Fs60nTOs ZzxzABpta/4PaJFgZw4G89NyU1bbXa8hDqAOeUxTaDDVP17rnfSOrFdxa64VBpUvifh5h8BAWobf/ MzXAiCljuRJqpjbrAKPOtNj4SKWoMtD9T8V0S7sM13QvK8f7HjhdMMLqW7fpXtu/lYUkj8BcA4oUC 9Y7sp2NUkrEL7JSlletTnPkxXYGnd8Dh72a4Escx3VgA5Mv0j+UNhlviPAV23HfpzoVFDhAnThh+X bCbikyENmIOgTPsG4OSqloRyQJpBeqa08S5LhKLzC4eEQ9xKnaAAbMLw1kOr4IN/RejJMA69glSTG x1924FtQ==; 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 1wlqmE-001Ywi-2W; Mon, 20 Jul 2026 16:23:35 +0000 From: Breno Leitao Date: Mon, 20 Jul 2026 09:17:44 -0700 Subject: [PATCH net-next v2 3/7] ieee802154: convert dgram getsockopt to sockopt_t 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: <20260720-getsockopt_phase4-v2-3-8a08fcfa0d72@debian.org> References: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> In-Reply-To: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> To: sdf@fomichev.me, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Remi Denis-Courmont , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , John Fastabend , Sabrina Dubroca , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=1998; i=leitao@debian.org; h=from:subject:message-id; bh=cAMTjzFtWpssYhGMnYLYloL7+e38m8IMj+86usmagk8=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqXktyBvZQT7BsDUarMHnq491QUdug9sIneZqMG WdIsRuwnneJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCal5LcgAKCRA1o5Of/Hh3 bSX0D/44YpJEX/t4E7Xk23fZpN/2mD0iChvD3yBRWqpy850iJDbd7OGtPPOVB/nBpujwM9B29a5 AsmSg4ud0OY/xuwBo6EG0KAltxGiBhMHbyKsON0ofJNF/UiFqnztRZPK2OrV0vOX2hs71hLgvXS 9DFzlhr4B+eDxSfl0S8TtBCej9XV7uPMcx1q1ZAKSPkmxU1CM5gHhT8ZV5b+eunDRYaNi9nuDMZ lXc4SbEc+ogjwKLRw6KP5UtxizonTlnV8JIERVkGO3PlA/T1VhVjyiQiuYBwWJyA9a68Hwdav/m oCsJFtJv594KAn//LlAPUPcrNLczfGV1NjZzToQSIVlMqu4XokGFrYG7tperpLtlVMeiP0SMcXY foPTyIkjy/aV68GULFB8VG1E4l5KIUa1xYDfClQ+6vA4k3ytBnNziuWN9WMzkgtDQPH7fHQw3pe l0KAGo6mNW3S6ApGX22xscVVU+/iE0J1CGTBNGHiaLEoffcdF0heUx1uTJgZjfSkYQF0wMn3/BI YBxApJ3aCOegNfVazMkTuRqVux+pUcmu3cJgqLIBi7CdPB7nkP8Ufvs4ug0gfKvzz/u0MI7/iio zvk8/xvpBUFaRZGI2nSyxsTrPk7hOeScskPgO/F3phI+iSAhBmSCWbxWNXCzJst83EnbXV/PFU6 u3c8XboQm+fMEQQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Continue converting the proto-layer getsockopt callbacks to the sockopt_t interface, splitting dgram_getsockopt() into a do_dgram_getsockopt() helper that takes a sockopt_t. No functional change. Signed-off-by: Breno Leitao Reviewed-by: Joe Damato --- net/ieee802154/socket.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c index 85dce296d7513..763f63e48afe4 100644 --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c @@ -831,20 +831,12 @@ static int ieee802154_dgram_deliver(struct net_device= *dev, struct sk_buff *skb) return ret; } =20 -static int dgram_getsockopt(struct sock *sk, int level, int optname, - char __user *optval, int __user *optlen) +static int do_dgram_getsockopt(struct sock *sk, int optname, sockopt_t *op= t) { struct dgram_sock *ro =3D dgram_sk(sk); - int val, len; =20 - if (level !=3D SOL_IEEE802154) - return -EOPNOTSUPP; - - if (get_user(len, optlen)) - return -EFAULT; - - len =3D min_t(unsigned int, len, sizeof(int)); + len =3D min_t(unsigned int, opt->optlen, sizeof(int)); =20 switch (optname) { case WPAN_WANTACK: @@ -871,10 +863,32 @@ static int dgram_getsockopt(struct sock *sk, int leve= l, int optname, return -ENOPROTOOPT; } =20 - if (put_user(len, optlen)) + opt->optlen =3D len; + if (copy_to_iter(&val, len, &opt->iter_out) !=3D len) return -EFAULT; - if (copy_to_user(optval, &val, len)) + return 0; +} + +static int dgram_getsockopt(struct sock *sk, int level, int optname, + char __user *optval, int __user *optlen) +{ + sockopt_t opt; + int err; + + if (level !=3D SOL_IEEE802154) + return -EOPNOTSUPP; + + err =3D sockopt_init_user(&opt, optval, optlen); + if (err) + return err; + + err =3D do_dgram_getsockopt(sk, optname, &opt); + if (err) + return err; + + if (put_user(opt.optlen, optlen)) return -EFAULT; + return 0; } =20 --=20 2.53.0-Meta From nobody Sat Jul 25 02:11:16 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 C9116442FBF; Mon, 20 Jul 2026 16:23:42 +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=1784564625; cv=none; b=WOnKjPrJed1W8orGw4d1uh4ojfwm2eDyhzjYeGgUMPOQ8YNMZBCjLKRI7VVnhb9M871PWY0hjHCpJFrGh3fQkBGmyTt/cLeMb0AGVLaEAWGNv7PTmh8wl6v2Jy9zKs128qyKukyBgp2vazWaSkDRdxS/DjPKVLNoiGZN1Q94tKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784564625; c=relaxed/simple; bh=6dTiZSpGCbqFCq3KjHoAffMf/x4ridmrJaJCEm/zBcw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aMCWwa8XKUC0naKrvdGnpKh55GGtTGHbSqpr3mRY2f0zFYG37YX/vo6rN5Mz9CALrUSHsb/UqeEQ45fdHQ29tDy/hZDVrMzWEacA+LGn/TAGq2f8rimtX4JRFxyRXe00sCqjbiIR7b0CSItsP3ATneVf7C96rqQcy8uqX5Bdcbo= 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=Wb1nDJe5; 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="Wb1nDJe5" 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=abIVjDnFy7gZAhxkN2TMc+r7TSyQ51iHfODbPI/91jQ=; b=Wb1nDJe5opwAQnPqw+8awCXRWt DIjdV/yEZsMeYiUb5MZ6hfPhWMD/noIDC+Mv7XbpwHvBtk73jXaSw5GaBM2svaPYfJqQCT0L0ct9N YmDLC/jizWqUsNq4QbGL5fQo+J1tbvvNDbMd5GgVBJyfiIW9n6vjfxfys9wsYM+F/Vuky3eh/bwFf im6oRWTsRS11QGmX0ce1+x0IBQg3s9UkLYEpSY2jF97jnlOW+qg/IDg0H0TI0Yst/X43hydyLu61D IsZ/p5U1A4q1st+wpPEKN4VlZrwiigfgQUDuo0zZ3ou8ihZnzlB46JCy0h9K4EneRLYWEgZifm76y WK9dBrdg==; 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 1wlqmJ-001YxA-2j; Mon, 20 Jul 2026 16:23:40 +0000 From: Breno Leitao Date: Mon, 20 Jul 2026 09:17:45 -0700 Subject: [PATCH net-next v2 4/7] phonet: pep: do not write beyond optlen in getsockopt 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: <20260720-getsockopt_phase4-v2-4-8a08fcfa0d72@debian.org> References: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> In-Reply-To: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> To: sdf@fomichev.me, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Remi Denis-Courmont , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , John Fastabend , Sabrina Dubroca , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com, =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=1225; i=leitao@debian.org; h=from:subject:message-id; bh=6dTiZSpGCbqFCq3KjHoAffMf/x4ridmrJaJCEm/zBcw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqXktyZrYEEQw71oYvCUsG+oUT5fFjVI5iUocKh eJ1gsKrqOOJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCal5LcgAKCRA1o5Of/Hh3 bTy1D/0TWHJI4tM/v4J26nJUrsABKnDIQkqHc1g9NwRzly03k+Z1PLI4a2RegwTct9FiGn3GItQ DEzCphca/+bKtSDN/84afQN3tsafQw8v4kqeDGwK2zmENS+0bass5euiSclzwMFKX7kaP3E/tPp zSd+KzfPfjB2kGH6FLcrIXZuYr3H5mae4S5HsEILHSFbY/lTMT26jm5FjIo3+5hHvhZUQjIlh7k UJT1VqkHJvvyiBcrL3qUCj35yxVvqkQBKLyu6l4b3MZvl6LMBhm444z5ArvtWURc9/wzSnX4m2G 2mrkT3MTUkfdqXqmiW2uYETvJ3Xfx+ldpTWGslnE5KS/SnZdIdBRxaPmgtOJcFn/oH4hjR1OWo4 V691OOYxjX66eJh8Ymvn3eIeoCdGmU4yTxENxqk0qqIluZKdd0icfmHougvz3N8F1Y1+wINufsF Z4SCAk8lz5Duzq+RqffMAi7Bd0PNPPZHl9NOATn8AxaeRNA5f6Ha66n4p3EhjEzW5/K4UGt0Pv8 wE5GDv0cFP0gKAXbT1ACSwLCzv/eN7iDuJk9hrwf/jCNMMzV1ubh7lL0vxpO2ptcqkWA7MPfuc3 lxurmwzVStDobOJNIZqucLkT+YZdxjqgq/UUH27Q+bY9iGNgWPRVVSWkG45VkAqgnT9MrN9X//9 xyelBSYMQAz+EzQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao pep_getsockopt() clamps the reported length to the caller's buffer with min_t(), but then stores the value with put_user(val, (int __user *) optval), which always writes sizeof(int) bytes. A getsockopt() call with an optlen smaller than sizeof(int) thus reports the clamped length yet writes a full int, one to three bytes past the user buffer. Write the value with copy_to_user() bounded by len, so at most optlen bytes are copied, matching the length reported back to userspace. Fixes: 02a47617cdce ("Phonet: implement GPRS virtual interface over PEP soc= ket") Signed-off-by: Breno Leitao Acked-by: R=C3=A9mi Denis-Courmont Reviewed-by: Joe Damato --- net/phonet/pep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 7069271393933..60d1a5375725b 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -1115,7 +1115,7 @@ static int pep_getsockopt(struct sock *sk, int level,= int optname, len =3D min_t(unsigned int, sizeof(int), len); if (put_user(len, optlen)) return -EFAULT; - if (put_user(val, (int __user *) optval)) + if (copy_to_user(optval, &val, len)) return -EFAULT; return 0; } --=20 2.53.0-Meta From nobody Sat Jul 25 02:11:16 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 6B578442FCF; Mon, 20 Jul 2026 16:23:47 +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=1784564631; cv=none; b=NszmivX2vi9vQCVbxqmrnxYzGW0QExn9RF10rz4fmJ79lPrnwp/mhsxd7Qppfl25qOPeSxz7NCSWGl7R3z4pzU+yMyZ6BmCwgaKFkd+RDM6W1PgBUPhO2t0aps9q63wkzQbd+63AFh169mn3/Ku4MysQ6b7tU1wwfJtfodOnV04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784564631; c=relaxed/simple; bh=NcuZltcOYUOEoxM7AkpOgNmQt761dSxlEbopnNwn8k0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lpGUC3R83FjaaqNNvCvXHy5ScoZcfqTROcr7e9cKlanfCxpHPwMXfvC4EpsqA7vZk9A9KVBH29JeiCWf7XG1GeSj6LBvXdmz/B1oiruGBC3bpEIP2vldl898rlcayd+oA/O8o7jK4cACsXbLhRnfoAVfLVyMFgmEhG76+tngszA= 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=MvQNQ1rs; 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="MvQNQ1rs" 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=W/z3gIgAJ7klpH5Iao6y/vj1/0Pubri+AyfX+X+HL8I=; b=MvQNQ1rshH8YsWbX+t8DuykI7o FeejTnJymISlMVdhDkE2JgTaSCVMFDvpDcBD0+xShgdt2VH2baQRCiqZGNiNyqhOnIz215ae2CBDj 17z3QCNovzf8kshHB45h/u+9M4VfT80uarkp7V2tzrI9mllm5wkrnxt7omeUPp+Kh6HL5jJs0qKKn L8g1BuHD2Mgft2NJCRkMlmnbc56/xcEBZqjS3go8TRUohMFfZovhMXDwFotAkrwJrbQ+GO2gDIp4R uZ2mu8ndBNW3r9+qAJUm1JCkS1X4CDH9Yqn6Hp5pVgf+epshUFnbkBPx/WvWYGcpBq5ITC9KCEbOX ifYj19nQ==; 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 1wlqmO-001Yxa-2r; Mon, 20 Jul 2026 16:23:45 +0000 From: Breno Leitao Date: Mon, 20 Jul 2026 09:17:46 -0700 Subject: [PATCH net-next v2 5/7] phonet: pep: convert getsockopt to sockopt_t 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: <20260720-getsockopt_phase4-v2-5-8a08fcfa0d72@debian.org> References: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> In-Reply-To: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> To: sdf@fomichev.me, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Remi Denis-Courmont , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , John Fastabend , Sabrina Dubroca , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com, =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=2265; i=leitao@debian.org; h=from:subject:message-id; bh=NcuZltcOYUOEoxM7AkpOgNmQt761dSxlEbopnNwn8k0=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqXktyxW3PxpQpc+nvJTcPrtha9hhp7bFAQkdc9 +Ikq3HQftCJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCal5LcgAKCRA1o5Of/Hh3 bT8rD/93f9hGTA8mfwtmkeCQKeMykceXZY7l9hi+yZKJrSU/F9tDt46Dy0vWHPm2OPwS3i/O2te 6pozMX3P9xT1iT0kg+X1z0IrsaNcBIMotBGgrOnHsus/7iLUIb288NJq5HoQdjgSBCwIeIoZzxC exXcKmfA16ME58apnx6oybO2/C3u4HKpgor6b+4Ae+sXlyE9KRbwFmAM3y24p/DNoyOFyMAZN2f 0YTW57AU63DQzroGLYdM/sH/jln1yu/TSOp90EJ4rnjPRF5HoORf31Y7UsVlMWpcYbzrfHDBfkw p2CgpwjWlHHjP4LLBzjI7semp1fOrlqzcNwxN6qxmCvac/AKjVQzrdT0AraMx1jxRYrorhdRx7q PaxuFea7oRByqz9nEPw4ouLcb32MHdek8RuKltQKbe0B6Ou/pBH3Zu+53UsJ94Pgn4I6HT4Do96 k/vJpQvX6zEiTGvmDRv8J+8fbHb80N1oHT1/83Ot10AgWdK4QYfyud/lATWmMiIansYPl6JDKfq XZdDEvtKjT3BBlVZXpNGWfovdsLdH6B8B1XS9vy4qCqRHTPdUXFuW+caULYedj5KkDSkwA+oPr4 1tv0xHjQr34+e2RhADPFcKd7UakFw38xYaMPyC6IN0uSZ1bmZPpdfoCBbFIotT1YznknLwlodWE Te1GFZt2x9wYjzA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Continue converting the proto-layer getsockopt callbacks to the sockopt_t interface, splitting pep_getsockopt() into a do_pep_getsockopt() helper that takes a sockopt_t. The thin pep_getsockopt() wrapper keeps its __user signature for now: it builds a user-backed sockopt_t with sockopt_init_user(), calls the helper, and writes the returned length back to optlen. The helper uses copy_to_iter() instead of copy_to_user(). No functional change. Signed-off-by: Breno Leitao Acked-by: R=C3=A9mi Denis-Courmont Reviewed-by: Joe Damato --- net/phonet/pep.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 60d1a5375725b..7ef4a9a240ef8 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -1078,17 +1078,11 @@ static int pep_setsockopt(struct sock *sk, int leve= l, int optname, return err; } =20 -static int pep_getsockopt(struct sock *sk, int level, int optname, - char __user *optval, int __user *optlen) +static int do_pep_getsockopt(struct sock *sk, int optname, sockopt_t *opt) { struct pep_sock *pn =3D pep_sk(sk); int len, val; =20 - if (level !=3D SOL_PNPIPE) - return -ENOPROTOOPT; - if (get_user(len, optlen)) - return -EFAULT; - switch (optname) { case PNPIPE_ENCAP: val =3D pn->ifindex ? PNPIPE_ENCAP_IP : PNPIPE_ENCAP_NONE; @@ -1112,11 +1106,33 @@ static int pep_getsockopt(struct sock *sk, int leve= l, int optname, return -ENOPROTOOPT; } =20 - len =3D min_t(unsigned int, sizeof(int), len); - if (put_user(len, optlen)) + len =3D umin(sizeof(int), opt->optlen); + opt->optlen =3D len; + if (copy_to_iter(&val, len, &opt->iter_out) !=3D len) return -EFAULT; - if (copy_to_user(optval, &val, len)) + return 0; +} + +static int pep_getsockopt(struct sock *sk, int level, int optname, + char __user *optval, int __user *optlen) +{ + sockopt_t opt; + int err; + + if (level !=3D SOL_PNPIPE) + return -ENOPROTOOPT; + + err =3D sockopt_init_user(&opt, optval, optlen); + if (err) + return err; + + err =3D do_pep_getsockopt(sk, optname, &opt); + if (err) + return err; + + if (put_user(opt.optlen, optlen)) return -EFAULT; + return 0; } =20 --=20 2.53.0-Meta From nobody Sat Jul 25 02:11:16 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 24660443ABC; Mon, 20 Jul 2026 16:23:52 +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=1784564636; cv=none; b=Nm90vEMr+oS435OkPYMnixool+8fRM+kpBwNEA6zBMxB0AIb867Oo8LbTiVlxlIEWWyvZY52DWhO1bt3jrDpGJ6qxq180pHnttssj9x2YxojwJP6kEVMAFpvVB2yqIno2+4vr/k/w6YN5ALRImWypxUrMNRfNBjI7QEWjPxsX3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784564636; c=relaxed/simple; bh=wWFaQ5ynwu1/IC8Glfj8Bzym8FfGbDbR0VDBbfDT7PA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uI/jbnb6yPF67VJfd4wQ9NPWI1b9GWGz3HO7UkAIvUAsHNQJo/Y+B+jzy48YuEmH//ODfRUCkJ/v4wndtMQ+MyGoLdkCW6VK0t9ndQa6O5IhGhFE+3fW835c6ApNJr07uRzbruOU4Ss54ZLq21sSOc5c/aRM/Q2K1MVUu9nXZEI= 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=Mdvxyc4s; 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="Mdvxyc4s" 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=H/2DZukIeT/kuRVW9vKE8nHigf4+6Pq0DhLaCLSGQWg=; b=Mdvxyc4s+KSW7B2cgVSArcvydu meJT5K7R7eUYo3g5PgGFmLiL4sl9bWLe/BljRa6T69VDTvGxKGg3d0ZD990UFp8tXCK01uaKvXl02 +LpHOKocOV4d46V3Na3ibOCQu1zc+NfMaL87IKYln1nkUWR7p7cmJl6cbILzXS3fAEmzrgu/O908u H3CylxEUJMa1P3686Wu6knc5rNkypFPQuJ5WNivp+g0hroI7/NqvajHNJMB/IFlpyNY15PwZQtyTu SzvvysCyKw/N9DOcG8gUPQB+JJFO9Akiw4J4NTxxP6h80Qlbhyzs2ORj8f9WqlJEjNU4YiXWQrKHI AxXcfqFA==; 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 1wlqmT-001YzX-27; Mon, 20 Jul 2026 16:23:50 +0000 From: Breno Leitao Date: Mon, 20 Jul 2026 09:17:47 -0700 Subject: [PATCH net-next v2 6/7] tls: convert getsockopt to sockopt_t 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: <20260720-getsockopt_phase4-v2-6-8a08fcfa0d72@debian.org> References: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> In-Reply-To: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> To: sdf@fomichev.me, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Remi Denis-Courmont , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , John Fastabend , Sabrina Dubroca , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=6300; i=leitao@debian.org; h=from:subject:message-id; bh=wWFaQ5ynwu1/IC8Glfj8Bzym8FfGbDbR0VDBbfDT7PA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqXktyWYttCgzgMWrt3KMdASejTcl/Vpa5/Ce7q nclpz8sejWJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCal5LcgAKCRA1o5Of/Hh3 bW01D/9G8tOQgSZdsTJjymcHuceYd2UxzuZoBpt65/1mpsU2Q15R0SVuwn/MyutQkXdkA0soxfX 3OpsuRh4bNjB0E3Y9BUiReSLZrgR7mMrOLcVC3eU+pPjxAJvBBprUYoHiQmbjvwh32JUdA/3Ru0 mk71VPmud76OWP9thbQdQEQ3U6tZ/Y37BpK3JeJuBNWEZOyJBSM8bSA05ooQqkrmoqnKygZBiV2 eEzCwOGqARiF+mXBKUfD8lxJdo3CP/FnI2C2dNRFRbsFVaCza46Dx305mqrCeT017e/RR/Q92o0 AZZ0Ktaj48xdnCfCLhKoyX0Rc1AGV/kxtP47iQHfJ4N/ppuAC2KDYcxI7teg1bgeQqR3vuFuV/m vVtWv0k1RSAFU2l/4IAtNSRFSERLjprbnnxBTp7iUkoMi5zD+gxMxUKIkimcgq4abuBSLZj9PAW NzO2jpz6ZX0CequX7gJ+Jmd1hQPdP+PlMHrG8Sf0og3vpAwzIUtzPWPeFV6Zd67btcls69i7cr+ 9Ub+Qgc8w+3KVMbP87LPf31e940ezqw/JC5D0n8G8vrinfL6Sz0cRXQAxms4tsJ2E3DmsAXMwVP Mn8AIpbdMU8pgoqjiM0mbfzQj5KZBXTg6r0BOTJ04SwBSU6gOcNvEaZcBO6D1/vDW+ZrWbV8Y/N BVzGJBsXLgylu5w== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Continue converting the proto-layer getsockopt callbacks to the sockopt_t interface, converting do_tls_getsockopt() and its per-option helpers to take a sockopt_t. The thin tls_getsockopt() wrapper keeps its __user signature for now: it builds a user-backed sockopt_t with sockopt_init_user(), calls the helper, and writes the returned length back to optlen. The helpers use copy_to_iter() instead of copy_to_user(); the NULL optval check in the TLS_TX/TLS_RX path is preserved by testing the iterator user buffer. No functional change. Signed-off-by: Breno Leitao Reviewed-by: Joe Damato Reviewed-by: Sabrina Dubroca --- net/tls/tls_main.c | 80 ++++++++++++++++++++++++++------------------------= ---- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 8c588cdab733d..fbb274287aa5f 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -424,20 +424,16 @@ static __poll_t tls_sk_poll(struct file *file, struct= socket *sock, return mask; } =20 -static int do_tls_getsockopt_conf(struct sock *sk, char __user *optval, - int __user *optlen, int tx) +static int do_tls_getsockopt_conf(struct sock *sk, sockopt_t *opt, int tx) { int rc =3D 0; const struct tls_cipher_desc *cipher_desc; struct tls_context *ctx =3D tls_get_ctx(sk); struct tls_crypto_info *crypto_info; struct cipher_context *cctx; - int len; + int len =3D opt->optlen; =20 - if (get_user(len, optlen)) - return -EFAULT; - - if (!optval || (len < sizeof(*crypto_info))) { + if (!opt->iter_out.ubuf || len < sizeof(*crypto_info)) { rc =3D -EINVAL; goto out; } @@ -462,7 +458,8 @@ static int do_tls_getsockopt_conf(struct sock *sk, char= __user *optval, } =20 if (len =3D=3D sizeof(*crypto_info)) { - if (copy_to_user(optval, crypto_info, sizeof(*crypto_info))) + if (copy_to_iter(crypto_info, sizeof(*crypto_info), + &opt->iter_out) !=3D sizeof(*crypto_info)) rc =3D -EFAULT; goto out; } @@ -478,44 +475,38 @@ static int do_tls_getsockopt_conf(struct sock *sk, ch= ar __user *optval, memcpy(crypto_info_rec_seq(crypto_info, cipher_desc), cctx->rec_seq, cipher_desc->rec_seq); =20 - if (copy_to_user(optval, crypto_info, cipher_desc->crypto_info)) + if (copy_to_iter(crypto_info, cipher_desc->crypto_info, + &opt->iter_out) !=3D cipher_desc->crypto_info) rc =3D -EFAULT; =20 out: return rc; } =20 -static int do_tls_getsockopt_tx_zc(struct sock *sk, char __user *optval, - int __user *optlen) +static int do_tls_getsockopt_tx_zc(struct sock *sk, sockopt_t *opt) { struct tls_context *ctx =3D tls_get_ctx(sk); unsigned int value; - int len; - - if (get_user(len, optlen)) - return -EFAULT; + int len =3D opt->optlen; =20 if (len !=3D sizeof(value)) return -EINVAL; =20 value =3D ctx->zerocopy_sendfile; - if (copy_to_user(optval, &value, sizeof(value))) + if (copy_to_iter(&value, sizeof(value), &opt->iter_out) !=3D sizeof(value= )) return -EFAULT; =20 return 0; } =20 -static int do_tls_getsockopt_no_pad(struct sock *sk, char __user *optval, - int __user *optlen) +static int do_tls_getsockopt_no_pad(struct sock *sk, sockopt_t *opt) { struct tls_context *ctx =3D tls_get_ctx(sk); - int value, len; + int value, len =3D opt->optlen; =20 if (ctx->prot_info.version !=3D TLS_1_3_VERSION) return -EINVAL; =20 - if (get_user(len, optlen)) - return -EFAULT; if (len < sizeof(value)) return -EINVAL; =20 @@ -525,38 +516,31 @@ static int do_tls_getsockopt_no_pad(struct sock *sk, = char __user *optval, if (value < 0) return value; =20 - if (put_user(sizeof(value), optlen)) - return -EFAULT; - if (copy_to_user(optval, &value, sizeof(value))) + opt->optlen =3D sizeof(value); + if (copy_to_iter(&value, sizeof(value), &opt->iter_out) !=3D sizeof(value= )) return -EFAULT; =20 return 0; } =20 -static int do_tls_getsockopt_tx_payload_len(struct sock *sk, char __user *= optval, - int __user *optlen) +static int do_tls_getsockopt_tx_payload_len(struct sock *sk, sockopt_t *op= t) { struct tls_context *ctx =3D tls_get_ctx(sk); u16 payload_len =3D ctx->tx_max_payload_len; - int len; - - if (get_user(len, optlen)) - return -EFAULT; + int len =3D opt->optlen; =20 if (len < sizeof(payload_len)) return -EINVAL; =20 - if (put_user(sizeof(payload_len), optlen)) - return -EFAULT; - - if (copy_to_user(optval, &payload_len, sizeof(payload_len))) + opt->optlen =3D sizeof(payload_len); + if (copy_to_iter(&payload_len, sizeof(payload_len), + &opt->iter_out) !=3D sizeof(payload_len)) return -EFAULT; =20 return 0; } =20 -static int do_tls_getsockopt(struct sock *sk, int optname, - char __user *optval, int __user *optlen) +static int do_tls_getsockopt(struct sock *sk, int optname, sockopt_t *opt) { int rc =3D 0; =20 @@ -565,17 +549,16 @@ static int do_tls_getsockopt(struct sock *sk, int opt= name, switch (optname) { case TLS_TX: case TLS_RX: - rc =3D do_tls_getsockopt_conf(sk, optval, optlen, - optname =3D=3D TLS_TX); + rc =3D do_tls_getsockopt_conf(sk, opt, optname =3D=3D TLS_TX); break; case TLS_TX_ZEROCOPY_RO: - rc =3D do_tls_getsockopt_tx_zc(sk, optval, optlen); + rc =3D do_tls_getsockopt_tx_zc(sk, opt); break; case TLS_RX_EXPECT_NO_PAD: - rc =3D do_tls_getsockopt_no_pad(sk, optval, optlen); + rc =3D do_tls_getsockopt_no_pad(sk, opt); break; case TLS_TX_MAX_PAYLOAD_LEN: - rc =3D do_tls_getsockopt_tx_payload_len(sk, optval, optlen); + rc =3D do_tls_getsockopt_tx_payload_len(sk, opt); break; default: rc =3D -ENOPROTOOPT; @@ -591,12 +574,25 @@ static int tls_getsockopt(struct sock *sk, int level,= int optname, char __user *optval, int __user *optlen) { struct tls_context *ctx =3D tls_get_ctx(sk); + sockopt_t opt; + int err; =20 if (level !=3D SOL_TLS) return ctx->sk_proto->getsockopt(sk, level, optname, optval, optlen); =20 - return do_tls_getsockopt(sk, optname, optval, optlen); + err =3D sockopt_init_user(&opt, optval, optlen); + if (err) + return err; + + err =3D do_tls_getsockopt(sk, optname, &opt); + if (err) + return err; + + if (put_user(opt.optlen, optlen)) + return -EFAULT; + + return 0; } =20 static int validate_crypto_info(const struct tls_crypto_info *crypto_info, --=20 2.53.0-Meta From nobody Sat Jul 25 02:11:16 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 055CA443E22; Mon, 20 Jul 2026 16:23:57 +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=1784564643; cv=none; b=j98l4vbggOq9qrmIQY4kZuotra70cRppWXxaKQ6AjTcSo08rU4nb/lVZsWfCbD73ATYR6kBIpo1HcdoKr822ZxD06OBmIjboZ7rl/5KfE2huC5oYTUbPmFE+xAo7TnTICW5RPFJbAtnmMjWKqbobYTvcq72nLURqYn7qaH3YYRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784564643; c=relaxed/simple; bh=PMCPXgFEYbTkP2heRPfRFC4zHv3iq/7aK0sPh/Eow5Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c7xJ8317ljYMxBRyF7ypWqpGKaakS1LqsAtfGMmf7fLk2imHhtxaCwfJcnioqk8TuDPhEy5KdxH8SfTXaoUGiXKvGwtc/P5HD8hP/qwxkyso6lTk13L7buFcCSSB8g+3FfLQslb+izHn0mCHs4K6XvwlMkHxU3B6c4bxAzhjNns= 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=f1fBvYmz; 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="f1fBvYmz" 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=aZT+CHPRv7AhWaUuscpXi1sFp2eHK3TTwaYhXoNLaig=; b=f1fBvYmzGLB/odcsIyRpXlxUZa ZEVLZ5K9H9aoZoCCuEhrKvXHpXPdQbdA/I053oofDXjGRnx1ao5wensGOfwIOsdP9+pYhONsvJZTO Ft84eenETa6UZpG9UTMOufcIu7OMWDghW5l9cMD4tZ3+QrF2JhXksfD8zEFKL5sWCNGJ09/V2oX0T 5AxdGOswzVjIOGnOrLhXsP1luPsU5yUm9UeyNULGZbYjGg8ppIorL5XSjIXDE2t3DX9R+0isIBaA7 /hLFvnW1sySCz9y/fzHpyfOZPeQp/jnPR87Z/jkWBxhaHAa69rMeR0ogy6u/2cIvKJjcsd2sqtiM7 rCDOcDfg==; 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 1wlqmY-001Z43-25; Mon, 20 Jul 2026 16:23:54 +0000 From: Breno Leitao Date: Mon, 20 Jul 2026 09:17:48 -0700 Subject: [PATCH net-next v2 7/7] selftests: net: getsockopt_iter: cover rawv6, ieee802154, phonet and tls 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: <20260720-getsockopt_phase4-v2-7-8a08fcfa0d72@debian.org> References: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> In-Reply-To: <20260720-getsockopt_phase4-v2-0-8a08fcfa0d72@debian.org> To: sdf@fomichev.me, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexander Aring , Stefan Schmidt , Miquel Raynal , Remi Denis-Courmont , =?utf-8?q?R=C3=A9mi_Denis-Courmont?= , John Fastabend , Sabrina Dubroca , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-kselftest@vger.kernel.org, Breno Leitao , kernel-team@meta.com, =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=11714; i=leitao@debian.org; h=from:subject:message-id; bh=PMCPXgFEYbTkP2heRPfRFC4zHv3iq/7aK0sPh/Eow5Q=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqXktyALetQ3n8SDUmQDQHD40on4f1SjR0kEfs5 7291nEoA26JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCal5LcgAKCRA1o5Of/Hh3 bSpGD/0UJL622KuWhIyVCfjm2nzKrOBJsyULnqa0cac6TYWDA9SQ8cpA+XAXAfAdi7y88dF8dF/ RKUjyNTa5q2MTR5voEHamqWMxacO0Y+QGp5YsKYXg56tzdlktkYrPdnM6sv8xG0dQG6bdtN67Gy fMpX7jn8fTvULbRw5B9tan7yRVzEsNUrl4rJXr7KNpBonfQjrhRY/Bvi5f4DXsxjnmwiKWLQl/B Gw6IgfZaUYX674ebiqJb7se+01tN40lsB+6J7zvL8TO5xHAloY8r7LWAiRUpQa/tTgDKUB4aV8M pl97nsXm98JA7KaAnkTTjMTulpsUfH8HA0ODnPFpPuNg6tyD3vad5PjyiYI4GqAVhOCYSEM2/mr o+1nlNNKcjEZhlyyQaztePuApqN24Dg8T/Vld6wPC9mnRhJwPZPlAZESYgCg/LSd50Vz+LhUYbf qRbXg1ra+N8PimVESKiQ7ZMTTcXDNeWTiLsoZA+C1PdE0Qz9U3t97etp0T8fxS1Cci5WASjiohW h8a+jEm2ttqSWd6Db/N7cU1Xhh39COmhq4upe+ynevDtyIBqyAMLGJUO04XGOJpwKXag/b0jq2N dcz4wSGgIH+u97ZvKSXmIoH394l5WvLjBmGOqKXdLAFyykjtOAkwWeO+UuctY48wvzEGeNAWecT PQz0XAcoARL6uvg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Add fixtures for the newly converted getsockopt leaves: - rawv6: IPV6_HDRINCL / IPV6_CHECKSUM int paths + a SOL_RAW unknown-optname case that reaches do_rawv6_getsockopt(). - ieee802154: WPAN_WANTACK dgram int path + non-SOL_IEEE802154 level rejection. - phonet: PNPIPE_ENCAP pep int path + non-SOL_PNPIPE level rejection. - tls: TLS_TX_ZEROCOPY_RO, the TLS_TX crypto_info round-trip at the base and full cipher sizes, the NULL-optval and short buffer EINVAL paths, and an unknown optname. It skips when the kernel lacks TLS or AES-GCM. Each fixture pins the returned-length / errno semantics across exact, oversized and short buffers, an unknown optname and a bogus level. The semantics are unchanged by the sockopt_t conversion, so the tests pass both before and after the leaf conversions. Signed-off-by: Breno Leitao Acked-by: R=C3=A9mi Denis-Courmont Reviewed-by: Joe Damato Reviewed-by: Sabrina Dubroca --- tools/testing/selftests/net/getsockopt_iter.c | 424 ++++++++++++++++++++++= ++++ 1 file changed, 424 insertions(+) diff --git a/tools/testing/selftests/net/getsockopt_iter.c b/tools/testing/= selftests/net/getsockopt_iter.c index fe5a5268bc34e..974065a23fa82 100644 --- a/tools/testing/selftests/net/getsockopt_iter.c +++ b/tools/testing/selftests/net/getsockopt_iter.c @@ -28,7 +28,10 @@ #include #include #include +#include +#include #include +#include #include "kselftest_harness.h" =20 #ifndef AF_VSOCK @@ -40,6 +43,45 @@ #ifndef ICMP_FILTER #define ICMP_FILTER 1 #endif +#ifndef IPV6_HDRINCL +#define IPV6_HDRINCL 36 +#endif +#ifndef IPV6_CHECKSUM +#define IPV6_CHECKSUM 7 +#endif +#ifndef AF_IEEE802154 +#define AF_IEEE802154 36 +#endif +#ifndef SOL_IEEE802154 +#define SOL_IEEE802154 0 +#endif +#ifndef WPAN_WANTACK +#define WPAN_WANTACK 0 +#endif +#ifndef AF_PHONET +#define AF_PHONET 35 +#endif +#ifndef SOL_PNPIPE +#define SOL_PNPIPE 275 +#endif +#ifndef PN_PROTO_PIPE +#define PN_PROTO_PIPE 2 +#endif +#ifndef PNPIPE_ENCAP +#define PNPIPE_ENCAP 1 +#endif +#ifndef PNPIPE_ENCAP_NONE +#define PNPIPE_ENCAP_NONE 0 +#endif +#ifndef PNPIPE_ENCAP_IP +#define PNPIPE_ENCAP_IP 1 +#endif +#ifndef SOL_TLS +#define SOL_TLS 282 +#endif +#ifndef TCP_ULP +#define TCP_ULP 31 +#endif =20 /* ---------- netlink ---------- */ =20 @@ -394,4 +436,386 @@ TEST_F(raw, bad_optname) ASSERT_EQ(sizeof(val), optlen); } =20 +/* ---------- raw (ipv6) ---------- */ + +FIXTURE(rawv6) +{ + int fd; +}; + +FIXTURE_SETUP(rawv6) +{ + self->fd =3D socket(AF_INET6, SOCK_RAW, IPPROTO_UDP); + if (self->fd < 0) + SKIP(return, "SOCK_RAW/IPv6 socket: %s", strerror(errno)); +} + +FIXTURE_TEARDOWN(rawv6) +{ + if (self->fd >=3D 0) + close(self->fd); +} + +TEST_F(rawv6, hdrincl_exact) +{ + socklen_t optlen; + int val =3D -1; + + optlen =3D sizeof(val); + + ASSERT_EQ(0, getsockopt(self->fd, IPPROTO_IPV6, IPV6_HDRINCL, + &val, &optlen)); + ASSERT_EQ(sizeof(int), optlen); + ASSERT_TRUE(val =3D=3D 0 || val =3D=3D 1); +} + +TEST_F(rawv6, hdrincl_oversize_clamped) +{ + char buf[16] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(0, getsockopt(self->fd, IPPROTO_IPV6, IPV6_HDRINCL, + buf, &optlen)); + ASSERT_EQ(sizeof(int), optlen); +} + +/* Raw int options clamp the reported length down to the user buffer + * instead of returning EINVAL on a short buffer. + */ +TEST_F(rawv6, hdrincl_undersize_clamped) +{ + socklen_t optlen =3D 2; + int val =3D 0; + + ASSERT_EQ(0, getsockopt(self->fd, IPPROTO_IPV6, IPV6_HDRINCL, + &val, &optlen)); + ASSERT_EQ(2, optlen); +} + +TEST_F(rawv6, checksum_default) +{ + socklen_t optlen; + int val =3D 0; + + optlen =3D sizeof(val); + + /* A non-ICMPv6 raw socket has the checksum disabled, reported as -1. */ + ASSERT_EQ(0, getsockopt(self->fd, IPPROTO_IPV6, IPV6_CHECKSUM, + &val, &optlen)); + ASSERT_EQ(sizeof(int), optlen); + ASSERT_EQ(-1, val); +} + +TEST_F(rawv6, bad_optname) +{ + socklen_t optlen; + int val; + + optlen =3D sizeof(val); + + /* SOL_RAW reaches do_rawv6_getsockopt() directly. */ + ASSERT_EQ(-1, getsockopt(self->fd, SOL_RAW, 0x7fff, &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); +} + +/* ---------- ieee802154 (dgram) ---------- */ + +FIXTURE(ieee802154) +{ + int fd; +}; + +FIXTURE_SETUP(ieee802154) +{ + self->fd =3D socket(AF_IEEE802154, SOCK_DGRAM, 0); + if (self->fd < 0) + SKIP(return, "AF_IEEE802154 dgram socket: %s", strerror(errno)); +} + +FIXTURE_TEARDOWN(ieee802154) +{ + if (self->fd >=3D 0) + close(self->fd); +} + +TEST_F(ieee802154, wantack_exact) +{ + socklen_t optlen; + int val =3D -1; + + optlen =3D sizeof(val); + + ASSERT_EQ(0, getsockopt(self->fd, SOL_IEEE802154, WPAN_WANTACK, + &val, &optlen)); + ASSERT_EQ(sizeof(int), optlen); + ASSERT_TRUE(val =3D=3D 0 || val =3D=3D 1); +} + +TEST_F(ieee802154, wantack_oversize_clamped) +{ + char buf[16] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(0, getsockopt(self->fd, SOL_IEEE802154, WPAN_WANTACK, + buf, &optlen)); + ASSERT_EQ(sizeof(int), optlen); +} + +TEST_F(ieee802154, wantack_undersize_clamped) +{ + socklen_t optlen =3D 2; + int val =3D 0; + + ASSERT_EQ(0, getsockopt(self->fd, SOL_IEEE802154, WPAN_WANTACK, + &val, &optlen)); + ASSERT_EQ(2, optlen); +} + +TEST_F(ieee802154, bad_optname) +{ + socklen_t optlen; + int val; + + optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_IEEE802154, 0x7fff, + &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); +} + +/* dgram_getsockopt() rejects any level other than SOL_IEEE802154. */ +TEST_F(ieee802154, bad_level) +{ + socklen_t optlen; + int val; + + optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_RAW, WPAN_WANTACK, + &val, &optlen)); + ASSERT_EQ(EOPNOTSUPP, errno); + ASSERT_EQ(sizeof(val), optlen); +} + +/* ---------- phonet (pep) ---------- */ + +FIXTURE(phonet) +{ + int fd; +}; + +FIXTURE_SETUP(phonet) +{ + self->fd =3D socket(AF_PHONET, SOCK_SEQPACKET, PN_PROTO_PIPE); + if (self->fd < 0) + SKIP(return, "AF_PHONET pipe socket: %s", strerror(errno)); +} + +FIXTURE_TEARDOWN(phonet) +{ + if (self->fd >=3D 0) + close(self->fd); +} + +TEST_F(phonet, encap_exact) +{ + socklen_t optlen; + int val =3D -1; + + optlen =3D sizeof(val); + + ASSERT_EQ(0, getsockopt(self->fd, SOL_PNPIPE, PNPIPE_ENCAP, + &val, &optlen)); + ASSERT_EQ(sizeof(int), optlen); + ASSERT_TRUE(val =3D=3D PNPIPE_ENCAP_NONE || val =3D=3D PNPIPE_ENCAP_IP); +} + +TEST_F(phonet, encap_oversize_clamped) +{ + char buf[16] =3D {}; + socklen_t optlen =3D sizeof(buf); + + ASSERT_EQ(0, getsockopt(self->fd, SOL_PNPIPE, PNPIPE_ENCAP, + buf, &optlen)); + ASSERT_EQ(sizeof(int), optlen); +} + +/* pep clamps the reported length down to the user buffer. Use an + * int-sized backing buffer with a short optlen so the baseline kernel, + * which writes a full int via put_user(), does not scribble past it. + */ +TEST_F(phonet, encap_undersize_clamped) +{ + socklen_t optlen =3D 2; + int val =3D 0; + + ASSERT_EQ(0, getsockopt(self->fd, SOL_PNPIPE, PNPIPE_ENCAP, + &val, &optlen)); + ASSERT_EQ(2, optlen); +} + +TEST_F(phonet, bad_optname) +{ + socklen_t optlen; + int val; + + optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_PNPIPE, 0x7fff, &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); +} + +/* pep_getsockopt() rejects any level other than SOL_PNPIPE. */ +TEST_F(phonet, bad_level) +{ + socklen_t optlen; + int val; + + optlen =3D sizeof(val); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_RAW, PNPIPE_ENCAP, &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); + ASSERT_EQ(sizeof(val), optlen); +} + +/* ---------- tls ---------- */ + +FIXTURE(tls) +{ + int fd; + int sfd; +}; + +FIXTURE_SETUP(tls) +{ + struct sockaddr_in a =3D { + .sin_family =3D AF_INET, + .sin_addr.s_addr =3D htonl(INADDR_LOOPBACK), + }; + socklen_t alen =3D sizeof(a); + int lfd; + + self->fd =3D -1; + self->sfd =3D -1; + + lfd =3D socket(AF_INET, SOCK_STREAM, 0); + if (lfd < 0) + SKIP(return, "TCP socket: %s", strerror(errno)); + if (bind(lfd, (struct sockaddr *)&a, sizeof(a)) || listen(lfd, 1) || + getsockname(lfd, (struct sockaddr *)&a, &alen)) { + close(lfd); + SKIP(return, "listener setup: %s", strerror(errno)); + } + self->fd =3D socket(AF_INET, SOCK_STREAM, 0); + if (connect(self->fd, (struct sockaddr *)&a, sizeof(a))) { + close(lfd); + SKIP(return, "connect: %s", strerror(errno)); + } + self->sfd =3D accept(lfd, NULL, NULL); + close(lfd); + if (setsockopt(self->fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"))) + SKIP(return, "TCP_ULP=3Dtls: %s (built without TLS?)", + strerror(errno)); +} + +FIXTURE_TEARDOWN(tls) +{ + if (self->fd >=3D 0) + close(self->fd); + if (self->sfd >=3D 0) + close(self->sfd); +} + +/* do_tls_getsockopt_tx_zc(): fixed-size int, exact length required. */ +TEST_F(tls, tx_zerocopy_exact) +{ + socklen_t optlen =3D sizeof(int); + int val =3D -1; + + ASSERT_EQ(0, getsockopt(self->fd, SOL_TLS, TLS_TX_ZEROCOPY_RO, + &val, &optlen)); + ASSERT_EQ(sizeof(int), optlen); + ASSERT_TRUE(val =3D=3D 0 || val =3D=3D 1); +} + +TEST_F(tls, tx_zerocopy_wrong_len) +{ + socklen_t optlen =3D 2; + int val; + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_TLS, TLS_TX_ZEROCOPY_RO, + &val, &optlen)); + ASSERT_EQ(EINVAL, errno); +} + +/* do_tls_getsockopt_conf(): NULL optval still yields EINVAL -- the + * converted code tests opt->iter_out.ubuf in place of optval. + */ +TEST_F(tls, conf_null_optval) +{ + socklen_t optlen =3D 64; + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_TLS, TLS_TX, NULL, &optlen)); + ASSERT_EQ(EINVAL, errno); +} + +TEST_F(tls, conf_short) +{ + socklen_t optlen =3D 2; + char buf[2]; + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_TLS, TLS_TX, buf, &optlen)); + ASSERT_EQ(EINVAL, errno); +} + +/* TLS_TX before crypto is set reports not-ready. */ +TEST_F(tls, conf_not_ready) +{ + struct tls_crypto_info info; + socklen_t optlen =3D sizeof(info); + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_TLS, TLS_TX, &info, &optlen)); + ASSERT_EQ(EBUSY, errno); +} + +/* Set TX crypto, then read it back at the base and full sizes, exercising + * both copy_to_iter() branches. SKIP if AES-GCM is unavailable. + */ +TEST_F(tls, conf_crypto_roundtrip) +{ + struct tls12_crypto_info_aes_gcm_128 tx =3D { + .info.version =3D TLS_1_2_VERSION, + .info.cipher_type =3D TLS_CIPHER_AES_GCM_128, + }; + struct tls12_crypto_info_aes_gcm_128 full; + struct tls_crypto_info base; + socklen_t optlen; + + if (setsockopt(self->fd, SOL_TLS, TLS_TX, &tx, sizeof(tx))) + SKIP(return, "set TLS_TX aes_gcm_128: %s", strerror(errno)); + + optlen =3D sizeof(base); + ASSERT_EQ(0, getsockopt(self->fd, SOL_TLS, TLS_TX, &base, &optlen)); + ASSERT_EQ(sizeof(base), optlen); + ASSERT_EQ(TLS_1_2_VERSION, base.version); + ASSERT_EQ(TLS_CIPHER_AES_GCM_128, base.cipher_type); + + optlen =3D sizeof(full); + ASSERT_EQ(0, getsockopt(self->fd, SOL_TLS, TLS_TX, &full, &optlen)); + ASSERT_EQ(sizeof(full), optlen); + ASSERT_EQ(TLS_CIPHER_AES_GCM_128, full.info.cipher_type); +} + +TEST_F(tls, bad_optname) +{ + socklen_t optlen =3D sizeof(int); + int val; + + ASSERT_EQ(-1, getsockopt(self->fd, SOL_TLS, 0x7fff, &val, &optlen)); + ASSERT_EQ(ENOPROTOOPT, errno); +} + TEST_HARNESS_MAIN --=20 2.53.0-Meta