From nobody Sat Jun 13 20:59:56 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 0ACFF386C39; Tue, 5 May 2026 11:13:09 +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=1777979591; cv=none; b=P1bIpt81JZNSWNjjG5H5UehAbqeB6khl0+1noIeKVVsF47W41mBl5JusTmhJp+HNTUyBmZ0RQay1R2qM+62A3CE2ys6D02PbNivjEp8/6iyLJTAstUMNQJZx1kI/qBo/spRxyKMQ0FUAPY0tvh20nhZocDwhwMhjA7X8g86xS0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777979591; c=relaxed/simple; bh=s++S4+7+3HDsqdxQF43+fczAWP/Ac/3nkjQRsEGRF2I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZdxvpXVsR0J+KAxRCzbrNwR39bIgT/oqbuKxTpVXc7/pggyt/bEt5LnFZgYdup4nZy5YYf9GjG6oUKpnV8GWoA0sVT1y7sJean/COMOQ0pISyViZY3r04gVINxrCXntimOhYJ3DnAFDPNPuc9ULp6T2CkKqYMACy/90n0wijOhY= 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=qA3Je8S+; 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="qA3Je8S+" 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=UZYasKQBgQxckJ+f8RkoYHHLU5axa9MRxgocc2c4+a4=; b=qA3Je8S+OmnRSd5P+tZI7Jzs0B CkmAd+a2U6TmeAxtxlSLLHauA9lXqAfSKVo6sTo82APNBOPvPrvEbVilXWRkM+0BJtasMlhNHERkB i+4oS1kIeP9HOKzis0kqp1OYBBqtukwocfcbm+TPI9bKkxkUafZ+3sggYY/Zsl/La3nnOea55m/pP RFdhC7/Vu7q2JfhLlUGkzMB5YoiyszmNAzgGFW9adN+KawJP85JXZ3TXOSDc8asT2SkjdulwDEYgt WYst7pVgQz3l78KMkTi1joMs3F29UDL6ZBpXIXnX/Zufwu7q13Fm5UoxWsWVmXKPixziDZ0xP3bT8 3KTmNUfg==; 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 1wKDhy-002lXm-1C; Tue, 05 May 2026 11:12:58 +0000 From: Breno Leitao Date: Tue, 05 May 2026 04:12:38 -0700 Subject: [PATCH net-next 1/5] can: isotp: 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: <20260505-getsock_two-v1-1-4cb0738950e0@debian.org> References: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> In-Reply-To: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> To: Oliver Hartkopp , Marc Kleine-Budde , Robin van der Gracht , Oleksij Rempel , kernel@pengutronix.de, Jeremy Kerr , Matt Johnston , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-can@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=1871; i=leitao@debian.org; h=from:subject:message-id; bh=s++S4+7+3HDsqdxQF43+fczAWP/Ac/3nkjQRsEGRF2I=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp+dCv2wyta0b5OFUiB9vDXiL7bAV1Zj7AOMQz7 ewTW8T4XNqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafnQrwAKCRA1o5Of/Hh3 bar9D/wLUF0D35B57QMies44PNE4Xk8eH33xsifOY7gsP9cI8PakzUMgOkfuAh5yBmbeXiafYuK OT3BumeY6zXtmbzHVYquCCWQE6Olt8t+QtYoqL120Ux62pc28E9CaakhjROi3jGPQESgRTUe6kD 0loJnyI8yQQBLBbq0zT4d+yFJrPsnoBY1+HAOkh2F/itpCyBtxVnPdiy1+M0Wo1YvvZ1/1DcOvz LutaEYViqhF3GeryaC/Oj1tjvVsO1ykEPrFDck0PtovraD/fKh7MUpXlwN9MOu3NKXn52/gaoyo vWDKHjXnb4FVs3fHV3PjAzipqCU/3VKs4Tgyl3xzB+VSnX1X8lAwJJ73yjKaVczJaRnsUU1Uxwm V/9n7oQqSxpHq3pwQhfNvsx48o9E9Owan8Qp+ds7Y68wH1zAB+SSYe42tOkQcqTefVh1c0aM2ZG cpm2gxmu4ej9pAhvvEQyZei+bdt1St8Oi62Loo+fU5FiKiRNuthZB/vWKx/XVTNH3liSrMKu276 8RFyjB2KpR2EOFpGiW5TtLiXW7s2auNljsZoSbS4MF6DKeUzzBqZNS58IaB6Yf2kM1OZaQd78aZ csy9YlOsKmSJTdoFjkjkPim140mDcuGuNYR9H1WRhD1zHlq0HPxRVId6K35B8S2/iGzxU0+c+6q cKaA0M46S6iX7iA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert CAN ISO-TP 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() Signed-off-by: Breno Leitao --- net/can/isotp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/net/can/isotp.c b/net/can/isotp.c index c48b4a818297e..1c33f09fbd338 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1500,7 +1500,7 @@ static int isotp_setsockopt(struct socket *sock, int = level, int optname, } =20 static int isotp_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct sock *sk =3D sock->sk; struct isotp_sock *so =3D isotp_sk(sk); @@ -1509,8 +1509,7 @@ static int isotp_getsockopt(struct socket *sock, int = level, int optname, =20 if (level !=3D SOL_CAN_ISOTP) return -EINVAL; - if (get_user(len, optlen)) - return -EFAULT; + len =3D opt->optlen; if (len < 0) return -EINVAL; =20 @@ -1544,9 +1543,8 @@ static int isotp_getsockopt(struct socket *sock, int = level, 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; } @@ -1718,7 +1716,7 @@ static const struct proto_ops isotp_ops =3D { .listen =3D sock_no_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D isotp_setsockopt, - .getsockopt =3D isotp_getsockopt, + .getsockopt_iter =3D isotp_getsockopt, .sendmsg =3D isotp_sendmsg, .recvmsg =3D isotp_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sat Jun 13 20:59:56 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 B3C5E3603D1; Tue, 5 May 2026 11:13:10 +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=1777979592; cv=none; b=BIvtD8J05UYY1DXiALDd/xuUHoFv+IZBcGYrNVwk6juUbqNBVkjfoUrZAVg9tME/mbjejie+iTiCRT5UhgNpEcWRqGG+iKws4s/RSEw0kFjkc1yh3vJri5i6MJeHUByODL6oqxWksu2Bx7kXLWgEGbfo9fd17xhPDx+a92oSUi4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777979592; c=relaxed/simple; bh=Q4ba2KfkdI2NRlz65g0omXf9tdpZDQdN4/pOtUn4u1M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gZWVPZ/ZP09Q4VNgrRoIaURQ4Pd6oO1GfwWfVzK4SPbZiOJUekDN7cjDDJoUwgSC7Kzy8KnvlpImMl300yBqfNsqiBeVuEaUzkRMk0ZmJ9HmIYx0xcfWlRZkabHzmOCe4oWsnSmpkNSq5dYyvZNCCiyuLhx29QSX5nTNlM4YO8k= 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=jS/E9p3u; 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="jS/E9p3u" 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/qWYI4vjdK5EAO0/fYWz00DJA1aDMQsgecwuI16Hxg=; b=jS/E9p3usZoq8ci2SQ/7d2v7nA GKlXOFhLq+ZOgEAP1bzT32mdf+yI9XDMlsGNYeE+lbHy0diWCiwDG3kNKQ0XNq+Vuf5hm9ASa3AWO 5C+Tlk6fObVwqivnMob2bVFWhizDdFExLFU2IpubzEX+zKJXMZvLieAiJQHZKnSXHiMBhKo4JJbQe 6h+88Cpdvv+HrP3tFdyKD8GULQOPiTRO9e6hSuSuKI11f5GrifhyiNFn1LY2A7HJfGt5EkkAK73tA d2DD3xa9Rs2ciHxt3RemMl3PlXYE+I1OqdasuWYpMSI6E+3mV9ZeYL86kw3zQdMextn88G3xoHIPd 603Vqiew==; 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 1wKDi3-002lXo-1C; Tue, 05 May 2026 11:13:03 +0000 From: Breno Leitao Date: Tue, 05 May 2026 04:12:39 -0700 Subject: [PATCH net-next 2/5] can: j1939: 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: <20260505-getsock_two-v1-2-4cb0738950e0@debian.org> References: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> In-Reply-To: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> To: Oliver Hartkopp , Marc Kleine-Budde , Robin van der Gracht , Oleksij Rempel , kernel@pengutronix.de, Jeremy Kerr , Matt Johnston , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-can@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=2654; i=leitao@debian.org; h=from:subject:message-id; bh=Q4ba2KfkdI2NRlz65g0omXf9tdpZDQdN4/pOtUn4u1M=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp+dCv5MW9F91cjLsTu9OM5g3hpm0p0zWvIozGi 8EaUprvUDiJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafnQrwAKCRA1o5Of/Hh3 bXt1D/0eCdk7iz3fH21kEObVsK3qMbmJ8bdAuX7tHvC+NLaGgtzCCRja6kMgLLrI0x6uMXWMBjK +p2x39nR765wzLi6cYmJz3Oy3bN0LVOsjy3Ib5MhcSkvs35xcDvQnmQwED8RTKr5rqCfZwmtffj Tje7Od4lyFBoYQR8NBVsDZbB390gbsaVrk38D4VHBuXGB2UK8l7+GDbgB6BUFjwCoqMtOMy6/cW /DPtJV0qdOWizOzs6j3gZ6yS2Kcx73apqMW/HNY3d80NlJekHaSLAwcWNESEH3+jR56eZuJHbPx D7Gg9oPvCigkE6dMbtM5ECv4yk3wu67lMbDMBKM4RF9dMdSjvg2Xs2/bh8tsFxWP/cJ5bqlum65 TX3YzAxaJmwYWA078DcCieZl9l23yAYjcO4t4S1kowHkXrbTuaSYnE52qG8s36gMq3AcXQuXweC /xTJfPyZISmvb/Af8HWEifxV8Bj0mOcC+Ii1PDo/H51vB2dUAfaW8kvZdZRrt34rx6cEplejVy2 RQApt1EaZk6Q+cQbV/ZuLV8P8igWk7GJmOesYi+T5gEg+EOmxpNl4VwYd3beR6s90l1J+TeLhWS Gbe/Sg3wiNh0GtNuzrSVWb4eMQngwHj/Y/H47tVtrvb0uaz7ljGTII+HZT+RyFb/V0ULbzCCixB vIrqqi2pg985O9w== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert CAN J1939 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 copy_to_user() - Restructure the chained if/else if (which depended on put_user() being an expression) into a nested if/else block now that opt->optlen =3D len is a statement - Add linux/uio.h for copy_to_iter() Signed-off-by: Breno Leitao --- net/can/j1939/socket.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index 50a598ef5fd4a..d0c6ce607b0dc 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -17,6 +17,7 @@ #include #include #include +#include #include =20 #include "j1939-priv.h" @@ -767,7 +768,7 @@ static int j1939_sk_setsockopt(struct socket *sock, int= level, int optname, } =20 static int j1939_sk_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct sock *sk =3D sock->sk; struct j1939_sock *jsk =3D j1939_sk(sk); @@ -779,8 +780,7 @@ static int j1939_sk_getsockopt(struct socket *sock, int= level, int optname, =20 if (level !=3D SOL_CAN_J1939) return -EINVAL; - if (get_user(ulen, optlen)) - return -EFAULT; + ulen =3D opt->optlen; if (ulen < 0) return -EINVAL; =20 @@ -804,11 +804,16 @@ static int j1939_sk_getsockopt(struct socket *sock, i= nt level, int optname, * but most sockopt's are 'int' properties, and have 'len' & 'val' * left unchanged, but instead modified 'tmp' */ - if (len > ulen) - ret =3D -EFAULT; - else if (put_user(len, optlen)) + if (len > ulen) { ret =3D -EFAULT; - else if (copy_to_user(optval, val, len)) + goto no_copy; + } + + opt->optlen =3D len; + /* Even if the copy below fails, we want to update optlen. This is + * a bit confusing, but, it preserves the original behaviour + */ + if (copy_to_iter(val, len, &opt->iter_out) !=3D len) ret =3D -EFAULT; else ret =3D 0; @@ -1385,7 +1390,7 @@ static const struct proto_ops j1939_ops =3D { .listen =3D sock_no_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D j1939_sk_setsockopt, - .getsockopt =3D j1939_sk_getsockopt, + .getsockopt_iter =3D j1939_sk_getsockopt, .sendmsg =3D j1939_sk_sendmsg, .recvmsg =3D j1939_sk_recvmsg, .mmap =3D sock_no_mmap, --=20 2.52.0 From nobody Sat Jun 13 20:59:56 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 0008E368263; Tue, 5 May 2026 11:13:13 +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=1777979595; cv=none; b=jdXszszvHlNKbrdq2el0Nis5xSkOjWvIAbZ9U9cNtZ0TKeWeIdlWjY/Ux+X8WF3lxwXpx6VwzItwac3uWLnEnkiG4b8+xsZUdxUdZFoZqViAbfAny+mD9ZnrOZ6b6NowQd9upJmJvtSnkk9TFStzdGimnNHYTN7RcrB/WC0cPkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777979595; c=relaxed/simple; bh=PEiFTTvD5HbPowkM40xyoZftErVoXe3+8eFL12D9lSk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DK77TVS3ltTbAd+/vLIgEI094S+j6X6oHj2p6iIMgxzUp7yyXaJUL/ZwnKLBd6hWHFc8gY9AlXolqvd5XPzkjY6eTbImKRo4mcURuBAAMsYdugz13ny2XjxOuNmaJGsJ6TgQw5CZoVUaj3YHKBgDBl+dUwgXd5/6WxDw71xMbso= 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=HDmYpbHH; 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="HDmYpbHH" 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=HDmYpbHHuNnN0PGeIM6uQhnokd VpXKm5pTM4hEqfH0wHmZbJXLbLanFMf3nYS2kCOXMqvdUVV1UGu183eCBnBcilVrpdZEYjbi1R4AB HPE5E0YUUSpurtu9259j4NWmR9LOi8mPfxZeXShKcmlOtB4cxf3tNgeA3ajGWusXZQgKewUwcRmw9 09C+8C359LFj1D87EZC+qTqNmnXd4I374F3CwuHr2t5mdf9srtFDhA+h9nlJcioe2feIi3gLqHK82 XvdVTessBMoVX2RdC9JuY/sL7B2Y7zVJWQH6Jyml8C0B5+PgWj2u4BAD+Fc/DK6VmJ469oJYiw9hQ n3DtIGOg==; 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 1wKDi8-002lY9-1Z; Tue, 05 May 2026 11:13:08 +0000 From: Breno Leitao Date: Tue, 05 May 2026 04:12:40 -0700 Subject: [PATCH net-next 3/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: <20260505-getsock_two-v1-3-4cb0738950e0@debian.org> References: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> In-Reply-To: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> To: Oliver Hartkopp , Marc Kleine-Budde , Robin van der Gracht , Oleksij Rempel , kernel@pengutronix.de, Jeremy Kerr , Matt Johnston , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-can@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+dCvOPfHHkPxAYTcRmga6hVFebEKcNTgcvxi/ HOYbk376HaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafnQrwAKCRA1o5Of/Hh3 bUihEACXnXgx132vJUNGNBx4LmvIQ3OEVUM+k3OnHB1P/DQXLUKWRCkfNar230rwLLtKkX2yN2x IS3D+polACeJduzaAiHj7HjGk+Ppobp+qTtvBup7vowYdZyy4C5F3Zu57VHyW+gwi1FXcqIAWwE J3mKH5JKDMuOsdRcXX9yohpHpq4w4S68vxjh+jO1iO2URTlNcUwvB7CJyDHs+Sju0opatVHCgAB GCoaby2V2Ada1dcEkyjtbXoZ1C4QhOgwN1hpSnmlKLHzT3+ZNim18CMB1cf3dSGr2mTAXK8xaGt ZKrIdQh02mmjvC9wfC/lNrvIyowXBx1mi5875as7LgbJ4yrNQ3Uwd4dZakezsvErRHFmINAAcc3 kiIDRe/3tfgpe/AFvfavE7SPrevqqq8fdYokSwjt+da4khM/8hH5sJzWzBjXNjjaItk/lTzb+IA pbuzOTa8WUGfpM5I9OTYkcg51WG4j+zUj2QRVSYcwSGrimlP3AWDNxM5Xw/pauuZzJjcWtt1Pte LZDuk8b+A6P8IRxpPWDqswmNEp+mqnqKxQ5x0KcbDh+WuXp+suFjTChFhfGKwiOLQ3WvdyvY86E oUrlw7ybbYDxfzl/wQc6fuEqZbZxFQfWFw1rC+lOJBHNiAw8naJRRBYKJF+aZAAc7BAyf/tsony DwyEszHj8/kQh9A== 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 20:59:56 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 BABE6368263; Tue, 5 May 2026 11:13:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777979600; cv=none; b=uwGhAQNjaJCBBz4+lSEvVcHnYJiMQTUOw3Vq7x+mpRfAnNY6XtJwsHK8o/PXMGH3mkwafXEzxbAYvuOqR2b1Vlj+BImHp7DuKCvqmC9tBd+8NvfLtsjeJbUk/9B8HucwxHZ3g1PCVApSNyYXFVm8qsFdhX1hX3sH+ezXpaV6kKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777979600; c=relaxed/simple; bh=3+pJulYqhN2DJgwm3IrymKKX3D4D4QQcgmk9P4CoziE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FAG1jvO0oy+9NZtFGIQw43RNXOtuYVm/PfY7c4Fe+yP8zbfGL9uGb5AxAVizbRGjOQc5HjAiIcJP9sb7INI1fJMtjEeIrTbQwizX5v2DGTC6zjaP68cot4mQ/qCfflMP8ylyExhbycUpbdxlQrZ7TyupuTRdYc9j59WmR++Z0Yk= 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=SdXHghg2; 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="SdXHghg2" 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=Oe2XxtaXgdji06bRrru3Wcj9UWgeOvaXKbGVkMEV2Xw=; b=SdXHghg2FZC89rw4QX21JhKOfQ WwKFQ+gncU7MuYx9wcK2HSDwHtCwU9/JZUixa+kCCrfbAJHtlq8tJlnmmXA44sbXGCtkNxsmcdcOR taFGxKre4tzmoOCUGBtCIRRmCOt81aak4YTW4RwzzHI1h0C7DHtcGZwirxnpXhdOPPuUxuYRDuDFr 0hkenP4MgLRRE56+P3y6etpnt7T9zVoNjYTlmu3/EN1E/HZnpmlETfe/TFIJU6PAhJyhdGs1+jJL5 r9rVQb6fyHimevH9UCFN5QfUPRFkhY/QN7rqVCkYW7gRiORXYXUkfNd3KseaeODJnFhviCkgRv71J E4xjANXA==; 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 1wKDiD-002lYP-0v; Tue, 05 May 2026 11:13:13 +0000 From: Breno Leitao Date: Tue, 05 May 2026 04:12:41 -0700 Subject: [PATCH net-next 4/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: <20260505-getsock_two-v1-4-4cb0738950e0@debian.org> References: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> In-Reply-To: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> To: Oliver Hartkopp , Marc Kleine-Budde , Robin van der Gracht , Oleksij Rempel , kernel@pengutronix.de, Jeremy Kerr , Matt Johnston , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-can@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=2196; i=leitao@debian.org; h=from:subject:message-id; bh=3+pJulYqhN2DJgwm3IrymKKX3D4D4QQcgmk9P4CoziE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp+dCvnkV6Y3s7HW4XmN7eVreL7EpA2mSMpa/Lv 4Ss2YVXyASJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafnQrwAKCRA1o5Of/Hh3 bVh0EACC9fiE9ZPb1S+MUb/TP/yi94h2Mw18seyfomFJGygKhdBziRKyVQFrIgbw8uqKob3inPC bH2hSd1tKj2ijgGxAXiyo5tLn7E4UOT5F/1QWXmcC9QcAZd2KI20Tn7Xqutw551u72SFEadHMQj d03w7jGZuyK8gh1Rt7jxgfF6q1SEZbxV6BpK4rydW9UPVSkOUY4VOxAOR8lE6xXwKFIA2/wsiej 4L4a7OJJBlITFt4fEws91gUuiIMmubqYp+R+KxEVGCFw2J6iqe2Km7kODWAmoVw7kFqpN3ti9cd 5tNbZLkPGP8WeUhmxUbFbjgA9NESx5/YHT0Ru+k6OdmIc7uljtu2ZOka83m7+V0wYMr+CzYalmn +kcdIdRciO59RGwnHIMwvHI7sxzFeOv5JW3HsmXGKb93T1FPJHWDJT/d6oj7YIoV8ci+vz/Kb+q QmMW5/C0UWOlUYOM33C/LyS3b5f52ArXRanFpOLHLiyrL2nEbynUUcdN69s3O0B3H2kizT0HaT+ c+6ZRJ/5L58+l0fQCOHtwyfFhuKJv5tO/0TAP+XUg48YMgXegg03i0HINmbBy9yZYpH+MQ2vDFw fucrOMShhnB+QrN3sGZafBLQ1jlxQFfH5UzRTOyu+CH13F9AAU37aSssu3mpMmhcLGHa5umx374 v3LHCk440SbSFqA== 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 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 1b210db3119e8..7d723f0bd26c2 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -27,6 +27,7 @@ #include #include #include +#include =20 #include #include @@ -1172,19 +1173,16 @@ static int llc_ui_setsockopt(struct socket *sock, i= nt level, int optname, * 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 +1210,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 +1238,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 20:59:56 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 1E07D3845CB; Tue, 5 May 2026 11:13: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=1777979609; cv=none; b=CdVCJA8/cNVdDySnOGyRaVdBR3PXdyz7nbezzXDT8gqCmKQ48g1Jhnlvn1ElpBlqOCkpK1920COiXpkvSC8TUZC2OHT6/0KN4y/duPIRJk3AQy0AgQ97KL6zdCAzl5y9ckmPh4HlW/bjWRbBEEGabkmaF0uVy2Y4e62dsZ7B21c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777979609; c=relaxed/simple; bh=ZblwTyaegNe9+CouwbLgVpfsz7uOchguMNbgnleId9I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dKDsRZBLHUiGCVr8WAgE79JO+0qTjVDqlZ441ZWLEp+jqA0NEzvoNHcbrPSUKaKLagK1QX1aBxARA1R2KOWsNboelqOrg3tbTw0wt0AmA7LTZRgjM21VQucnklTntlukC9kWG1ehHgwseU7rszenCpTCcAudi5mXO8m8UaXayMA= 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=ENBkQrxD; 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="ENBkQrxD" 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=Bqe/zD7LskMy2G3eFF3zEJe6jOJIwijXS9A/g0YCPPE=; b=ENBkQrxDmJixq4mZe0ip0sELmv SDFmPrPrPNnJtHCPZwrj7bfEvk7H1R+62qziJdmsKK74AM74xV+l4SVJBLNmaRdX8gR5Yyazs/Lfk k+YrVq02UHeHrrsMz1C1n5ytYwGoOjQgBNXYO4fQnKjc2njsEE8dUeNtnr4q4I5OidMa3jlmmaTK4 LhAsaa7i1WKMuGS/rvSgb/3KSrUxbxc2sL/3mFLmm6EFa+C12OqOSE1VoMLU78JsGxQgHpVKl10Iz xK9trx0Wm6rZ2JD8BpVrUgyGq9rDnOgp0dDZ9yJR/j16CuIK9gY/hjP3gfloS1dVOh+2k3VH8ZQoE ZVHBcIfQ==; 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 1wKDiI-002lYr-1V; Tue, 05 May 2026 11:13:18 +0000 From: Breno Leitao Date: Tue, 05 May 2026 04:12:42 -0700 Subject: [PATCH net-next 5/5] selftests: net: getsockopt_iter: address review nits 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: <20260505-getsock_two-v1-5-4cb0738950e0@debian.org> References: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> In-Reply-To: <20260505-getsock_two-v1-0-4cb0738950e0@debian.org> To: Oliver Hartkopp , Marc Kleine-Budde , Robin van der Gracht , Oleksij Rempel , kernel@pengutronix.de, Jeremy Kerr , Matt Johnston , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan Cc: linux-can@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=7234; i=leitao@debian.org; h=from:subject:message-id; bh=ZblwTyaegNe9+CouwbLgVpfsz7uOchguMNbgnleId9I=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp+dCvklKzmA/XoAlwyLs6WEZJ0B3Dabm2YjToO 7vlOqNdz0+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCafnQrwAKCRA1o5Of/Hh3 bWCCD/9uesE3aSSTLMUl/SHCnrXCdgheJGARCGWP/i00L7JhSjC5AxwsitKqD+ltYMdcvSJqg39 bpvxsqSoOa6JARHeCeavPp8BC+1heI840qggS1BoLYamF+fwqPIqW00136nT0hcRqzQp518RboY +0Ev16BnSRLt8sykpfcy/3XDk/bXtY/S+fbHSkiOdTw5SdRnOjuM8yImxu8AAA5KmUM5Y+WlK6l ZpQh+cCoo+qz6Zo6+smdJHnyXACa4jmDBqHMG3aikDpXwpbtkaQTkTV+bxzqTIz1ZN1Ay7Ftd5F +/oGfrTWGN70/BFWmru+7r/2wXyM9+n5GJVg+pgdY3AMXwjTwG6uDWssfvpckJh+I/Cu/HXcQRp l4xE9ggMOFy72rA5G9FBETAFGbT7NdskbG4QVdvgdppQ5E3jrElgD3U15EJmY8gRw1Nu8cE8A8R du+4Arv6GtTv3SBaVBXOmCrGjmCzPZ7IGkncZCQz+CmfVn6o/oVr29DM8q87n3UA70zDIgsLsgO d+W8/jZ0t+YC4EjDRbBUaQRuaFaYFnWF/J6S68kp7IEuDnvJdf345Sj5jbtBGAFs4EDxK5mn+h8 3kCzcbfErmGnJr6x3pqBtLFWAlDI7HtPYCmpysAt5VZXLOcNlx7awjztVzC8v0LUhJzWuG4Z5O3 HPjUpWCusMgDo0A== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Apply two cleanups suggested by Stanislav Fomichev 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