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 43BBD4D98E9; Fri, 25 Sep 2026 15:56:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790351779; cv=none; b=U/jhjTzZrvIU2hOJEtZ5WSUbgThLQgcq7dFFx+i7cleINb4kiMWbbZmE6zhlDQmwqmkPdN2GdYWZhX6DQ/aLC7aCt/BaAl/iiNeGCPRBo2ZwLJHCSTZRgnhyKNNVclXNehMKaCxKWRCM3+JlqhPOaqfHOxO9XkU/nxHa+/tlQ04= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790351779; c=relaxed/simple; bh=rRkn9X8k7Gat4aI3iGkMiLlqCbibek7O3mNWwzNTrsA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Bygy3DwTu1cu0KQoS4RSmxFcxwP73MJdBkaPrb7GXURBhbXwsivLr3jvWD3PbUzzBqcmP3LzZJMqskNLKvogewY+FZ2rVDZOtd/S9U6Y1VWh4Y0LUT2vHyOstR6x95F7DGPr0KiQqFJIRc4KffFKC4ze+g0zN2mbOb/N9xkQci8= 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=DI5MBJwQ; 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="DI5MBJwQ" 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=dC9WQwKiLo5Qk66H5SkLxQWdAwibcvRfWkJi+Oz5jHA=; b=DI5MBJwQ4wH0IiW21TZQnWU1vO UtZtajv0ESyDri+qUDWvYsSGfZIx6cGGSfdXuUMSPMFlP6YPW7aAlo0a8y1JjNIDwK5dgsv4Ni75D hzWJqP4TYjhPexOoBk8RC+DddmSu2Ea9JEt0WqO1HV2dVcABWLJPjfnz4OvSU2gRfvxM/BRFNzsjZ eA+XQiM1krUq4YJFBjNjZj6CJ8YLX1sCG6FyOF1wyi3quQIGjywbKgoG/oSNX/oT43rQS2WBuaKuq 2m8YuWkWtYWKZZBhFGBvKZ/aEa6qCpVHfEUelsVVOVWJX8aJDH81uQ0TSRn3Tf7N8zhkzPLOHwKjc dPEhNKhQ==; 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 1xA8HT-005Pm0-0t; Fri, 25 Sep 2026 15:56:11 +0000 From: Breno Leitao Date: Fri, 25 Sep 2026 08:55:19 -0700 Subject: [PATCH net-next 4/6] ipv4: convert do_ip_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: 7bit Message-Id: <20260925-sockopt_expand_out_v2-v1-4-c3ef2e3bb5c0@debian.org> References: <20260925-sockopt_expand_out_v2-v1-0-c3ef2e3bb5c0@debian.org> In-Reply-To: <20260925-sockopt_expand_out_v2-v1-0-c3ef2e3bb5c0@debian.org> To: David Ahern , Ido Schimmel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , John Fastabend , Stanislav Fomichev , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, david.laight.linux@gmail.com, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-f8e9d X-Developer-Signature: v=1; a=openpgp-sha256; l=10966; i=leitao@debian.org; h=from:subject:message-id; bh=rRkn9X8k7Gat4aI3iGkMiLlqCbibek7O3mNWwzNTrsA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqtpl60/YbciZfm+tLGLz2yCeH1JGSuFq5Yy8gS zn0j55bEmGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaraZegAKCRA1o5Of/Hh3 bZdCD/4xIec1UnG8f2j3lEUvsYOU6oOGX55o5Kjq/Okq8RskSON38s396JapH5grAc7YFPKX7DZ i3Mv2zlctDY68V1dG285/KpJ4XvJCaFtWzvh+kQQsgkv+MuT5RhnRScKMVludzgDJyOQhDAmItM mI7EoDWccjy9D48X5GIvma+ZECTJbf3HAcLWMfjuV6P3A4eYIC5N/LqeUaieDS0NwEJugH7MtoA cR789/IwLqa4hlQT6/K9md/iTU3OGPrBoMNCFsS9RJPuGFmQG8xv5AIvmPPCQqKCduXfl1X7tZO Jz7LxwLe3CWOZ1iUeYC4mOgv7aHmvsD4mR8P4V05kDMtxRH+1UFwD7u8O2KtdZIm1ZC8U6WDSTq BVY+wbmXihJQ1kxR2zrO9WG9za1yl+61DZfE9rFo+tH+PDajr8uap943HEWDDUCSUYzHXOpfwWL ClzsqYy+xUdX5jtLMerHNQHruTDa4aW08LeGfEwdWQieFi17gruAhEVZ5tFHeSas6X04d4xMa+l 15rs8oUygqu1S0AKATgRDVQ+/OpyxsRTkvCnxDt2eOwfLLXBtqZkXJoxsUsLsw8Tl0bvAePWDC3 LLLVQ0/lKVImobCSg+mXeeOiPzrOGnh+aZC+8xm5Sg37PBEfTL710qworHnw3ion93xszsGhU94 DzpbJ03V+ZXxBPA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert the SOL_IP switch and ip_mroute_getsockopt(), its last leaf on a sockptr_t pair. The IP_MSFILTER and MCAST_MSFILTER bridges go away. ip_getsockopt() builds the sockopt_t with sockopt_init_user() and writes optlen back unconditionally, because IP_OPTIONS and others report a length then fail; ip_mc_msfget() therefore stores its length last. IP_PKTOPTIONS takes its buffer off iter_out. The argument is sopt, since IP_OPTIONS already has an ip_options local named opt. Validating optlen now precedes the level check and the MRT_* dispatch, so a negative optlen wins over -EOPNOTSUPP there. Signed-off-by: Breno Leitao --- include/linux/mroute.h | 4 +-- include/net/ip.h | 3 +- net/core/filter.c | 18 ++++++++--- net/ipv4/igmp.c | 3 +- net/ipv4/ip_sockglue.c | 87 +++++++++++++++++++------------------------------- net/ipv4/ipmr.c | 11 +++---- 6 files changed, 56 insertions(+), 70 deletions(-) diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 4c5003afee6c51..c1c21e61c81c37 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -17,7 +17,7 @@ static inline int ip_mroute_opt(int opt) } int ip_mroute_setsockopt(struct sock *, int, sockptr_t, unsigned int); -int ip_mroute_getsockopt(struct sock *, int, sockptr_t, sockptr_t); +int ip_mroute_getsockopt(struct sock *sk, int optname, sockopt_t *opt); int ipmr_ioctl(struct sock *sk, int cmd, void *arg); int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg); int ip_mr_init(void); @@ -31,7 +31,7 @@ static inline int ip_mroute_setsockopt(struct sock *sock, int optname, } static inline int ip_mroute_getsockopt(struct sock *sk, int optname, - sockptr_t optval, sockptr_t optlen) + sockopt_t *opt) { return -ENOPROTOOPT; } diff --git a/include/net/ip.h b/include/net/ip.h index 6f602df72ee621..81aef4b98430bf 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -823,8 +823,7 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval, unsigned int optlen); int ip_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval, unsigned int optlen); -int do_ip_getsockopt(struct sock *sk, int level, int optname, - sockptr_t optval, sockptr_t optlen); +int do_ip_getsockopt(struct sock *sk, int level, int optname, sockopt_t *sopt); int ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen); int ip_ra_control(struct sock *sk, unsigned char on, diff --git a/net/core/filter.c b/net/core/filter.c index 70dc621672f2e9..9a706ec1f7f122 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5737,10 +5737,20 @@ static int sol_ip_sockopt(struct sock *sk, int optname, return -EINVAL; } - if (getopt) - return do_ip_getsockopt(sk, SOL_IP, optname, - KERNEL_SOCKPTR(optval), - KERNEL_SOCKPTR(optlen)); + if (getopt) { + struct kvec kvec; + sockopt_t opt; + int err; + + err = sockptr_to_sockopt(&opt, KERNEL_SOCKPTR(optval), + KERNEL_SOCKPTR(optlen), &kvec); + if (err) + return err; + + err = do_ip_getsockopt(sk, SOL_IP, optname, &opt); + *optlen = opt.optlen; + return err; + } return do_ip_setsockopt(sk, SOL_IP, optname, KERNEL_SOCKPTR(optval), *optlen); diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index d573c5bf8f038b..bf00810cdd7a13 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2763,12 +2763,13 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, sockopt_t *opt) if (err) return err; - opt->optlen = msf_size; if (copy_to_iter(msf, IP_MSFILTER_SIZE(0), &opt->iter_out) != IP_MSFILTER_SIZE(0)) return -EFAULT; if (len && copy_to_iter(psl->sl_addr, len, &opt->iter_out) != len) return -EFAULT; + + opt->optlen = msf_size; return 0; done: return err; diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 1f452b6ea86e9d..2e78b11d294a9f 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1509,8 +1509,7 @@ static int compat_ip_get_mcast_msfilter(struct sock *sk, sockopt_t *opt) return 0; } -int do_ip_getsockopt(struct sock *sk, int level, int optname, - sockptr_t optval, sockptr_t optlen) +int do_ip_getsockopt(struct sock *sk, int level, int optname, sockopt_t *sopt) { struct inet_sock *inet = inet_sk(sk); bool needs_rtnl = getsockopt_needs_rtnl(optname); @@ -1521,10 +1520,9 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, return -EOPNOTSUPP; if (ip_mroute_opt(optname)) - return ip_mroute_getsockopt(sk, optname, optval, optlen); + return ip_mroute_getsockopt(sk, optname, sopt); - if (copy_from_sockptr(&len, optlen, sizeof(int))) - return -EFAULT; + len = sopt->optlen; if (len < 0) return -EINVAL; @@ -1620,16 +1618,15 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, rcu_read_unlock(); if (opt->optlen == 0) { - len = 0; - return copy_to_sockptr(optlen, &len, sizeof(int)); + sopt->optlen = 0; + return 0; } ip_options_undo(opt); len = min_t(unsigned int, len, opt->optlen); - if (copy_to_sockptr(optlen, &len, sizeof(int))) - return -EFAULT; - if (copy_to_sockptr(optval, opt->__data, len)) + sopt->optlen = len; + if (copy_to_iter(opt->__data, len, &sopt->iter_out) != len) return -EFAULT; return 0; } @@ -1653,12 +1650,12 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, if (sk->sk_type != SOCK_STREAM) return -ENOPROTOOPT; - if (optval.is_kernel) { + if (iov_iter_is_kvec(&sopt->iter_out)) { msg.msg_control_is_user = false; - msg.msg_control = optval.kernel; + msg.msg_control = sopt->iter_out.kvec->iov_base; } else { msg.msg_control_is_user = true; - msg.msg_control_user = optval.user; + msg.msg_control_user = sopt->iter_out.ubuf; } msg.msg_controllen = len; msg.msg_flags = in_compat_syscall() ? MSG_CMSG_COMPAT : 0; @@ -1680,8 +1677,8 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, int tos = READ_ONCE(inet->rcv_tos); put_cmsg(&msg, SOL_IP, IP_TOS, sizeof(tos), &tos); } - len -= msg.msg_controllen; - return copy_to_sockptr(optlen, &len, sizeof(int)); + sopt->optlen = len - msg.msg_controllen; + return 0; } case IP_UNICAST_IF: val = (__force int)htonl((__u32) READ_ONCE(inet->uc_index)); @@ -1692,9 +1689,8 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, len = min_t(unsigned int, len, sizeof(struct in_addr)); addr.s_addr = READ_ONCE(inet->mc_addr); - if (copy_to_sockptr(optlen, &len, sizeof(int))) - return -EFAULT; - if (copy_to_sockptr(optval, &addr, len)) + sopt->optlen = len; + if (copy_to_iter(&addr, len, &sopt->iter_out) != len) return -EFAULT; return 0; } @@ -1711,43 +1707,25 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, case IP_MSFILTER: { struct ip_msfilter msf; - struct kvec kvec; - sockopt_t opt; if (len < IP_MSFILTER_SIZE(0)) { err = -EINVAL; goto out; } - if (copy_from_sockptr(&msf, optval, IP_MSFILTER_SIZE(0))) { + if (copy_from_iter(&msf, IP_MSFILTER_SIZE(0), &sopt->iter_in) != + IP_MSFILTER_SIZE(0)) { err = -EFAULT; goto out; } - err = sockptr_to_sockopt(&opt, optval, optlen, &kvec); - if (err) - goto out; - - err = ip_mc_msfget(sk, &msf, &opt); - if (!err && copy_to_sockptr(optlen, &opt.optlen, sizeof(int))) - err = -EFAULT; + err = ip_mc_msfget(sk, &msf, sopt); goto out; } case MCAST_MSFILTER: - { - struct kvec kvec; - sockopt_t opt; - - err = sockptr_to_sockopt(&opt, optval, optlen, &kvec); - if (err) - goto out; - if (in_compat_syscall()) - err = compat_ip_get_mcast_msfilter(sk, &opt); + err = compat_ip_get_mcast_msfilter(sk, sopt); else - err = ip_get_mcast_msfilter(sk, &opt); - if (!err && copy_to_sockptr(optlen, &opt.optlen, sizeof(int))) - err = -EFAULT; + err = ip_get_mcast_msfilter(sk, sopt); goto out; - } case IP_PROTOCOL: val = inet_sk(sk)->inet_num; break; @@ -1759,16 +1737,14 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, copyval: if (len < sizeof(int) && len > 0 && val >= 0 && val <= 255) { unsigned char ucval = (unsigned char)val; - len = 1; - if (copy_to_sockptr(optlen, &len, sizeof(int))) - return -EFAULT; - if (copy_to_sockptr(optval, &ucval, 1)) + + sopt->optlen = 1; + if (copy_to_iter(&ucval, 1, &sopt->iter_out) != 1) return -EFAULT; } else { len = min_t(unsigned int, sizeof(int), len); - if (copy_to_sockptr(optlen, &len, sizeof(int))) - return -EFAULT; - if (copy_to_sockptr(optval, &val, len)) + sopt->optlen = len; + if (copy_to_iter(&val, len, &sopt->iter_out) != len) return -EFAULT; } return 0; @@ -1783,19 +1759,22 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, int ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen) { + sockopt_t opt; int err; - err = do_ip_getsockopt(sk, level, optname, - USER_SOCKPTR(optval), USER_SOCKPTR(optlen)); + err = sockopt_init_user(&opt, optval, optlen); + if (err) + return err; + + err = do_ip_getsockopt(sk, level, optname, &opt); + if (put_user(opt.optlen, optlen)) + return -EFAULT; #ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err == -ENOPROTOOPT && optname != IP_PKTOPTIONS && !ip_mroute_opt(optname)) { - int len; - - if (get_user(len, optlen)) - return -EFAULT; + int len = opt.optlen; err = nf_getsockopt(sk, PF_INET, optname, optval, &len); if (err >= 0) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index e4c51ca473019c..f249569b4bf8b9 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1638,8 +1638,7 @@ int ipmr_sk_ioctl(struct sock *sk, unsigned int cmd, void __user *arg) } /* Getsock opt support for the multicast routing system. */ -int ip_mroute_getsockopt(struct sock *sk, int optname, sockptr_t optval, - sockptr_t optlen) +int ip_mroute_getsockopt(struct sock *sk, int optname, sockopt_t *opt) { int olr; int val; @@ -1670,16 +1669,14 @@ int ip_mroute_getsockopt(struct sock *sk, int optname, sockptr_t optval, return -ENOPROTOOPT; } - if (copy_from_sockptr(&olr, optlen, sizeof(int))) - return -EFAULT; + olr = opt->optlen; if (olr < 0) return -EINVAL; olr = min_t(unsigned int, olr, sizeof(int)); - if (copy_to_sockptr(optlen, &olr, sizeof(int))) - return -EFAULT; - if (copy_to_sockptr(optval, &val, olr)) + opt->optlen = olr; + if (copy_to_iter(&val, olr, &opt->iter_out) != olr) return -EFAULT; return 0; } -- 2.53.0-Meta