From nobody Sun Feb 8 00:03:27 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 DC7263859ED; Fri, 30 Jan 2026 18:47:05 +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=1769798827; cv=none; b=Rvs+1C2RkpT/K7kcY3C6vOTPTfXjlOm+UkoKDTaQgdn91btnDkXUAXjes7JItchdZ1q8ITrLVkt2zgbl03UqS6091wjb+1ZI6rqlqxGu+zcXlsZF2lCw0SSfuOq9aL20bOcSRq2SGW37XRHFjX9c5yPaj+H+UKSPh2uWTOekohs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769798827; c=relaxed/simple; bh=4FX0o94g4/j+gck6q6lurkfmlT/H4llIwQqP7XZyYbY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nBLOAQA+6hSovvP7k1ripxv6LTu4mrpQF5wCcIN++OqPmCgBio1jqMfqS2eYrFmaAqmEvZ+fyPeRHa1J6xUpS/EXZ9udj3/XRVUDvZjAHOHE+7TYQEn2COcwOcT1JRXd/DgqPDVE/LgxAxT2q+5DcNZaol7bmaRPJVIKSVpKn24= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=kEm0xwxI; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none 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="kEm0xwxI" 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=PV5ptLugLWLHVi99ajukEoln9y5Onr2WkbErb2nElJc=; b=kEm0xwxI6ESGiriN/ZWMtK7pyz XH9vvPMZbwHzBqq/vT1jDPyuT//B2PTroKptDCRQKMZ8dITwx7vJE/oJa/7W5/J4BK//mC2f9Y8QQ fgAfmVf1DhuupdZ9KqIBNM+7dtddqssSyzRdsqkCPBCKnJoxElyTwCTbZRz+oH/HUulNxkN4aqY05 XtxIWY23ZaZNiPIwLB4esqcX/3YvmOIfqJkdWi3NuxM+fqN7cHOvTI8RSYCHP4NuX7zuNNROzg5P9 AGWn/cGlbFVYVUFUOeMbCSdZ+zz8LQFgEIbr85Hq3LnwpmHXftasZji7RVyolkKqoyI1d2U56kJfc 9GASVIPA==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vltWA-001urW-Lx; Fri, 30 Jan 2026 18:46:54 +0000 From: Breno Leitao Date: Fri, 30 Jan 2026 10:46:17 -0800 Subject: [PATCH net-next RFC 1/3] net: add getsockopt_iter callback to proto_ops 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: <20260130-getsockopt-v1-1-9154fcff6f95@debian.org> References: <20260130-getsockopt-v1-0-9154fcff6f95@debian.org> In-Reply-To: <20260130-getsockopt-v1-0-9154fcff6f95@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , metze@samba.org, axboe@kernel.dk, Stanislav Fomichev Cc: io-uring@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, Linus Torvalds , linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-f4305 X-Developer-Signature: v=1; a=openpgp-sha256; l=2223; i=leitao@debian.org; h=from:subject:message-id; bh=4FX0o94g4/j+gck6q6lurkfmlT/H4llIwQqP7XZyYbY=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpfPyUdv4Vgd18b7l3fTf3+8F7Fa1Cdsv9kzuQf tRnWpMZHR2JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXz8lAAKCRA1o5Of/Hh3 bUFUD/48ErHKQ8V/LgZA0hHtFI7domjnT54z9cWlkZNQBQlByPzh07GgmQ5ZY10s/bMXbNsrjZX OEu/xUjYW/haJN9NTPM8VHmasKoFQv2siHK5RDkULhohsU2+FusrfCig1V2RIcyn4tlgTK4selw FQQVPGNxE6djZtATw3TToDQDGSYsRBrjEDPto78tLy2vlj3v6U8yszHQwmFmjxHIbme7QOJObOd MF5Pv0aHbp+NdYWNKfngl3mAskCgrNtRSSt/M+rOA9J14B+yZd+DXrR0rY0GkJ1CYDZLaLmQMc1 Dp7HBWeYgwd0kwtW2I9HZcU00xstEJRwg5HKPsrXW40ZOu1QBO7g1uGyUZwpHUcp3h97u2keCTk D5W1YE4BhEBUPAvBnLS4+eKLqMuNH00N6pD77r214GBjEbgGPgjS7MPlhPvObLEgORQJIc0P0BS pgU08CQ07E1KsNVB5Zp69ZeZNO376Oed9bnsU/J0++L2OgyLLjCbclvnKROdvsXQ0cdBK6LJNfV U0Cko0hn6a5Y2FBwsIQGBr2fQlOEXkMYZMaE+C70gTktaD9OGAIR1SE1P7V/y2t44NpOjvx8uNh +BC7vcGXqBnFcALhzMGBZ/BOcvrxB/+MyWcLqgb1U8KS0v3hIp712eccioh4hYy20uBT0jXWt8x UtVWquNDFcFBVHw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Add a new getsockopt_iter callback to struct proto_ops that uses sockopt_t, a type-safe wrapper around iov_iter. This provides a clean interface for socket option operations that works with both user and kernel buffers. The sockopt_t type encapsulates an iov_iter and an optlen field. The optlen field, although not suggested by Linus, serves as both input (buffer size) and output (returned data size), allowing callbacks to return a random values independent of the bytes written via copy_to_iter(), so, keep it separated from iov_iter.count. This is preparatory work for removing the SOL_SOCKET level restriction from io_uring getsockopt operations. Suggested-by: Linus Torvalds Signed-off-by: Breno Leitao --- include/linux/net.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/linux/net.h b/include/linux/net.h index f58b38ab37f8a..94f6c86769afc 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -23,9 +23,26 @@ #include #include #include +#include =20 #include =20 +/** + * struct sockopt - socket option value container + * @iter: iov_iter for reading/writing option data + * @optlen: set by callback to indicate returned data size + * + * Type-safe wrapper for socket option data that works with both + * user and kernel buffers. + * + * The optlen field allows callbacks to return a specific length value + * independent of the bytes written via copy_to_iter(). + */ +typedef struct sockopt { + struct iov_iter iter; + int optlen; +} sockopt_t; + struct poll_table_struct; struct pipe_inode_info; struct inode; @@ -192,6 +209,8 @@ struct proto_ops { unsigned int optlen); int (*getsockopt)(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen); + int (*getsockopt_iter)(struct socket *sock, int level, + int optname, sockopt_t *opt); void (*show_fdinfo)(struct seq_file *m, struct socket *sock); int (*sendmsg) (struct socket *sock, struct msghdr *m, size_t total_len); --=20 2.47.3 From nobody Sun Feb 8 00:03:27 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 621B4387580; Fri, 30 Jan 2026 18:47: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=1769798830; cv=none; b=E7oAFPqMyEoougY1QgveAnh5H7V+FNkH+USjgYr5+3gg41PYKy8LAzE024WMmUfVAsE+BjNR99bUyLLij5TuqCVYKxWyadQs2+KmWcajc4jnMXPg2OzuBeiaE/8kLOChTlUpWwk2RK5qqAVVlqsenxS16AKy8HjXDEa0z/okIp0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769798830; c=relaxed/simple; bh=VoX4apeR1/fBQJ1bijPUH/ri8Yl1RQPOugsV/RS525k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aKsF5bB5CNA7S6UhurpYgl5TzPQc1bmnAmN63hmYZN1T/PJlMOdk2jbzXijb7bUMwxwFr3BPvtZ3qdEC4Nr8U+1vKKnzlN2msrNRUZpUlIbecq2rwVF7/MVymLEEZk02+VMwHqqYm6hAGr/h+CcMMBxBaYS6f+BterZWbMSgtCU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=dFgkOSl4; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none 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="dFgkOSl4" 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=usq+Fh3qedDoR7rCGaWM06IbYW1Zl0rkP+xHJTmMv28=; b=dFgkOSl4Qbfsl2E9XM2D1lnR63 kxyMynPGNO05wAVCfygTskPk8fJ6FpUmWasx86xOsfsBddCOVScweeuwQIJpTwYiNv4A93msblr73 UN0jCC9eno5x0M5sgiairOipvwHSUVw//SV8sQ3xBMSAb1K9P+0EmHJ/m+oJfGXatutGiY/3DllIR 1OwCegUB5yULdeMME3V/HiXpFN/30i6b5FDLMnT0jP+n+aUFcUkTS8MCHmB4tA3RyUPVjf818ddEU M1G4f/wHdMppGeyLXD/qCFsTQfOGsdhekqTw8mIZKmQP5liGtE2UU0o2k2qJP5bXTEiXmy9sK3INy ZwH+WjCw==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vltWF-001urd-Ct; Fri, 30 Jan 2026 18:46:59 +0000 From: Breno Leitao Date: Fri, 30 Jan 2026 10:46:18 -0800 Subject: [PATCH net-next RFC 2/3] net: prefer getsockopt_iter in do_sock_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: <20260130-getsockopt-v1-2-9154fcff6f95@debian.org> References: <20260130-getsockopt-v1-0-9154fcff6f95@debian.org> In-Reply-To: <20260130-getsockopt-v1-0-9154fcff6f95@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , metze@samba.org, axboe@kernel.dk, Stanislav Fomichev Cc: io-uring@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, Linus Torvalds , linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-f4305 X-Developer-Signature: v=1; a=openpgp-sha256; l=2836; i=leitao@debian.org; h=from:subject:message-id; bh=VoX4apeR1/fBQJ1bijPUH/ri8Yl1RQPOugsV/RS525k=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpfPyUWb2C31GfLNnJFiMkIKi+ss+7naggtKlpw 937uzCL7wyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXz8lAAKCRA1o5Of/Hh3 bfK/D/9nRWHA4mKgr+GxKyziMLTfw1bkKVxBk8n58v9M4DS9704rAebJJHOetoYEpxhVYuxijj3 f/2yOSk3xNSP/707kGrhNQfK8vxXIIgTXPA3Sh8WlBiUtC9xrqN0MxnLCxxEXgRUAJ/B+IIgaNk WPd+qoiYW9cdz2GJMOW5icyQwiLwgCjNEhZKr1I0yprdQmnX635doU51jmh0Yv1A6tDlrZWX74A D4WstkhTqPRjSptr+TGQCI5HsjKgXwAz+MfNOttb1lsliUhykTodRTXWfvm+IOQIhwwOd2nwUPr zIltosNZ2CCE+gjqZ9KJngBdF1N2chVCwPo5qYfq09HH0frfqHd/iPFUw48w7DnXqXsnVrDEpvn Iy4pTk9vc2+QcYIgje4Adpg0D1uZX70HgnQruCVQDjFxdKzhmuPdANmZNT/QNp8T6Uu7NFlgL03 R0WFmz6IqgAh0v8crUyLvx+EMf+pQob/jJ6WUrjSPJDPqgYIUv5qoEU61F2/axkRG2hUmP8LWHM Hp6iNFgIysXNPbaS9lue25L/XqhYCL86zBKJhnIkApBHWFeRG4BszTG35gha7u5R0+6J6pMlVx3 2sJZH4pGR94Kixy5g+Ndu/3juVFbKUCbG/JX4XFofYe1Fp7Amikj7N/Gr3QT24O3hTRxMlf1mUZ XCnMI9jZTyAaLeQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Update do_sock_getsockopt() to use the new getsockopt_iter callback when available. Add do_sock_getsockopt_iter() helper that: 1. Reads optlen from user/kernel space 2. Initializes a sockopt_t with the appropriate iov_iter (kvec for kernel, ubuf for user buffers) and sets opt.optlen 3. Calls the protocol's getsockopt_iter callback 4. Writes opt.optlen back to user/kernel space The callback is responsible for setting opt.optlen to indicate the returned data size. Signed-off-by: Breno Leitao --- net/socket.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/net/socket.c b/net/socket.c index 136b98c54fb37..2d830262b1be5 100644 --- a/net/socket.c +++ b/net/socket.c @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -2356,6 +2357,38 @@ SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int= , optname, INDIRECT_CALLABLE_DECLARE(bool tcp_bpf_bypass_getsockopt(int level, int optname)); =20 +static int do_sock_getsockopt_iter(struct socket *sock, + const struct proto_ops *ops, int level, + int optname, sockptr_t optval, + sockptr_t optlen) +{ + struct kvec kvec; + sockopt_t opt; + int koptlen; + int err; + + if (copy_from_sockptr(&koptlen, optlen, sizeof(int))) + return -EFAULT; + + if (optval.is_kernel) { + kvec.iov_base =3D optval.kernel; + kvec.iov_len =3D koptlen; + iov_iter_kvec(&opt.iter, ITER_DEST, &kvec, 1, koptlen); + } else { + iov_iter_ubuf(&opt.iter, ITER_DEST, optval.user, koptlen); + } + opt.optlen =3D koptlen; + + err =3D ops->getsockopt_iter(sock, level, optname, &opt); + if (err) + return err; + + if (copy_to_sockptr(optlen, &opt.optlen, sizeof(int))) + return -EFAULT; + + return 0; +} + int do_sock_getsockopt(struct socket *sock, bool compat, int level, int optname, sockptr_t optval, sockptr_t optlen) { @@ -2373,15 +2406,18 @@ int do_sock_getsockopt(struct socket *sock, bool co= mpat, int level, ops =3D READ_ONCE(sock->ops); if (level =3D=3D SOL_SOCKET) { err =3D sk_getsockopt(sock->sk, level, optname, optval, optlen); - } else if (unlikely(!ops->getsockopt)) { - err =3D -EOPNOTSUPP; - } else { + } else if (ops->getsockopt_iter) { + err =3D do_sock_getsockopt_iter(sock, ops, level, optname, + optval, optlen); + } else if (ops->getsockopt) { if (WARN_ONCE(optval.is_kernel || optlen.is_kernel, "Invalid argument type")) return -EOPNOTSUPP; =20 err =3D ops->getsockopt(sock, level, optname, optval.user, optlen.user); + } else { + err =3D -EOPNOTSUPP; } =20 if (!compat) --=20 2.47.3 From nobody Sun Feb 8 00:03:27 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 C4CCB387378; Fri, 30 Jan 2026 18:47:08 +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=1769798830; cv=none; b=FQliOOZo1GmR5g0zPYCpgLGl7G5GYOVf+snCCiVPPtmQB8NOTq8QVCwsJSuP1B+Lvja6tyrL8f5hD056Xuv/n4Y6xLnErlG372fucQobpOQkv6naNoCpSvwOLct1dXwZNX3379xZ/VNgWzEaE3ZzBGzgxmIJrq32AsSLVZpPAcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769798830; c=relaxed/simple; bh=IVnLhnrcy/3xPEQctLWhlsnsImXX6rsH2GP1mnkmDNQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ninl4gqEi+mhuXkI2SVPYjQm8YdlvBaPxO6fTdO2uCl59RQcc5oI8X0S6jLwwtFuYeJNSPC0lPtPsag3YeAH9MudQZQrZuwZH4LkKvlNQR8oqeOoNqkkCdL19pbQxiEmIhH566jsoUh8ktkqtv5yKb8zW7Zb4XrHcWfgb0owjUY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=aRHmPsMW; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none 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="aRHmPsMW" 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=gW70Iuxcr93CtMyUc93o0K6n2EmDcL/0tFhB6bt/uXk=; b=aRHmPsMWedGIXc2X0YSNAMvFAT gpBxbCe23doJ2GkVOjXk5qAtYdxfG7QHsv/GZFeGglF5MVb8oi8ie8ecBvqK6OwwGvp3Mrufj4R9f gwTIgyr9An7iroBpuFdP4pCvSv54rbsHMadaNcOX2Oks/h19TTOICxX6Iv3LinlyE9QvOv+tbGx/L wTcT5umDxfJ4bBZWN9TxcctGh0UQpm3mRZ4XmF3h5po3lGR7yRCUFQw2uBAZRzDswWic5we1XzcwF /SAvFr1DLgt6bXlrFp4P21KqJpRkog5J4b+9kw2+DpFOJNuHjlhk466pmK9RtnC8VpIwnGyBr2P/L ry9AY69w==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1vltWK-001urn-5X; Fri, 30 Jan 2026 18:47:04 +0000 From: Breno Leitao Date: Fri, 30 Jan 2026 10:46:19 -0800 Subject: [PATCH net-next RFC 3/3] netlink: 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: <20260130-getsockopt-v1-3-9154fcff6f95@debian.org> References: <20260130-getsockopt-v1-0-9154fcff6f95@debian.org> In-Reply-To: <20260130-getsockopt-v1-0-9154fcff6f95@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , metze@samba.org, axboe@kernel.dk, Stanislav Fomichev Cc: io-uring@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, Linus Torvalds , linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-f4305 X-Developer-Signature: v=1; a=openpgp-sha256; l=3397; i=leitao@debian.org; h=from:subject:message-id; bh=IVnLhnrcy/3xPEQctLWhlsnsImXX6rsH2GP1mnkmDNQ=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpfPyU2OZHI4M0lCr3semqght57TV1hos0Fo3WE c1nHQfKtcOJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXz8lAAKCRA1o5Of/Hh3 bQ4lEACRll/JUEMJtdVPtrX+RF5bS7TQWHv7YtDd+8lAJdwtts5jliTofGG4ukbpoQbE4pRKcmL N/9T9SNairfNx6pRssn8tdoyNfc2TICWLatqB057ecdFQqlbWWefHLy4Jycya/yZUIQap+S3roY vR0L2UggKugpnVKUZ9+dAA4uYhYkCfVlS/SY4VU4Bk2NHNDCJvllMiGXsi71Bv2Pq7MirYfw/uv xiblpCNa5UEKDsIbIKV/sobPtejFcU50xdAtoxDBv2shqH6xsO0i3NxzhNBDxuJ6+ufHizF0M1Q zrbl+57gijjx5LAREzuKi2WQAPF7uDsNb2Tvsalu+PAD8JRZ7YznHF1L1PzPbqnoWs3OPIcjGt+ xNcJyKiVgsbt5Pv6S1jqDc6xAL5LWxhgAhzAvPTX/SELvDNREw+K+cpSI+z9fSWKPCXonVFoFTJ jGCQ6XOInJel7qW1TpyKx5prRb9mVwyWxC/RV4pjjA2qR4jWSGQ8BdRysIMGBBc1ag7w0abTwFD K7scjnQ7i3JMdCkzk4VNJROLa+khmlxqU6rF+iJEVB+Qe7gGJWU52UiApPVoc9+pHLnOLR/ZPYF Tpx8H3BUSXqEYGONXfRZKraJkRpzAK9GIMCiXVrgUzXLcH4KihTVihsECbhYcLvmEH0sGkpQknh pios0YQFtQXxG+Q== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Convert netlink'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() The optlen field allows callbacks to return a specific length value independent of the bytes written via copy_to_iter(). This enables io_uring to call netlink's getsockopt with kernel buffers. Signed-off-by: Breno Leitao --- net/netlink/af_netlink.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 8e5151f0c6e46..8a195eb1ef761 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -1716,7 +1717,7 @@ static int netlink_setsockopt(struct socket *sock, in= t level, int optname, } =20 static int netlink_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) + sockopt_t *opt) { struct sock *sk =3D sock->sk; struct netlink_sock *nlk =3D nlk_sk(sk); @@ -1726,8 +1727,7 @@ static int netlink_getsockopt(struct socket *sock, in= t level, int optname, if (level !=3D SOL_NETLINK) return -ENOPROTOOPT; =20 - if (get_user(len, optlen)) - return -EFAULT; + len =3D opt->optlen; if (len < 0) return -EINVAL; =20 @@ -1743,6 +1743,8 @@ static int netlink_getsockopt(struct socket *sock, in= t level, int optname, break; case NETLINK_LIST_MEMBERSHIPS: { int pos, idx, shift, err =3D 0; + u32 group_val; + size_t size; =20 netlink_lock_table(); for (pos =3D 0; pos * 8 < nlk->ngroups; pos +=3D sizeof(u32)) { @@ -1751,14 +1753,14 @@ static int netlink_getsockopt(struct socket *sock, = int level, int optname, =20 idx =3D pos / sizeof(unsigned long); shift =3D (pos % sizeof(unsigned long)) * 8; - if (put_user((u32)(nlk->groups[idx] >> shift), - (u32 __user *)(optval + pos))) { + group_val =3D (u32)(nlk->groups[idx] >> shift); + size =3D copy_to_iter(&group_val, sizeof(group_val), &opt->iter); + if (size !=3D sizeof(group_val)) { err =3D -EFAULT; break; } } - if (put_user(ALIGN(BITS_TO_BYTES(nlk->ngroups), sizeof(u32)), optlen)) - err =3D -EFAULT; + opt->optlen =3D ALIGN(BITS_TO_BYTES(nlk->ngroups), sizeof(u32)); netlink_unlock_table(); return err; } @@ -1784,10 +1786,10 @@ static int netlink_getsockopt(struct socket *sock, = int level, int optname, len =3D sizeof(int); val =3D test_bit(flag, &nlk->flags); =20 - if (put_user(len, optlen) || - copy_to_user(optval, &val, len)) + if (copy_to_iter(&val, len, &opt->iter) !=3D len) return -EFAULT; =20 + opt->optlen =3D sizeof(int); return 0; } =20 @@ -2813,7 +2815,7 @@ static const struct proto_ops netlink_ops =3D { .listen =3D sock_no_listen, .shutdown =3D sock_no_shutdown, .setsockopt =3D netlink_setsockopt, - .getsockopt =3D netlink_getsockopt, + .getsockopt_iter =3D netlink_getsockopt, .sendmsg =3D netlink_sendmsg, .recvmsg =3D netlink_recvmsg, .mmap =3D sock_no_mmap, --=20 2.47.3