From mboxrd@z Thu Jan 1 00:00:00 1970 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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 = 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 #include "j1939-priv.h" @@ -767,7 +768,7 @@ static int j1939_sk_setsockopt(struct socket *sock, int level, int optname, } static int j1939_sk_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct sock *sk = sock->sk; struct j1939_sock *jsk = j1939_sk(sk); @@ -779,8 +780,7 @@ static int j1939_sk_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_CAN_J1939) return -EINVAL; - if (get_user(ulen, optlen)) - return -EFAULT; + ulen = opt->optlen; if (ulen < 0) return -EINVAL; @@ -804,11 +804,16 @@ static int j1939_sk_getsockopt(struct socket *sock, int level, int optname, * but most sockopt's are 'int' properties, and have 'len' & 'val' * left unchanged, but instead modified 'tmp' */ - if (len > ulen) - ret = -EFAULT; - else if (put_user(len, optlen)) + if (len > ulen) { ret = -EFAULT; - else if (copy_to_user(optval, val, len)) + goto no_copy; + } + + opt->optlen = 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) != len) ret = -EFAULT; else ret = 0; @@ -1385,7 +1390,7 @@ static const struct proto_ops j1939_ops = { .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = j1939_sk_setsockopt, - .getsockopt = j1939_sk_getsockopt, + .getsockopt_iter = j1939_sk_getsockopt, .sendmsg = j1939_sk_sendmsg, .recvmsg = j1939_sk_recvmsg, .mmap = sock_no_mmap, -- 2.52.0