github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ipv6: raw: convert do_rawv6_getsockopt to sockopt_t

Browse Source 
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.

Reviewed-by: Joe Damato <joe@dama.to>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20260729-getsockopt_phase4-v4-2-c44576757c17@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Breno Leitao 2026-07-29 02:29:45 -07:00 committed by Jakub Kicinski
parent aee44196d2
commit 8472b68c24
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/ipv6/raw.c
View File

@ -1051,14 +1051,12 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
}
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 *opt)
{
struct raw6_sock *rp = raw6_sk(sk);
int val, len;
if (get_user(len, optlen))
return -EFAULT;
len = opt->optlen;
switch (optname) {
case IPV6_HDRINCL:
@ -1080,11 +1078,10 @@ static int do_rawv6_getsockopt(struct sock *sk, int optname,
return -ENOPROTOOPT;
}
len = min_t(unsigned int, sizeof(int), len);
len = umin(sizeof(int), len);
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &val, len))
opt->optlen = len;
if (copy_to_iter(&val, len, &opt->iter_out) != len)
return -EFAULT;
return 0;
}
@ -1092,6 +1089,9 @@ static int do_rawv6_getsockopt(struct sock *sk, int optname,
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 level, int optname,
return ipv6_getsockopt(sk, level, optname, optval, optlen);
}
return do_rawv6_getsockopt(sk, optname, optval, optlen);
err = sockopt_init_user(&opt, optval, optlen);
if (err)
return err;
err = do_rawv6_getsockopt(sk, optname, &opt);
if (err)
return err;
if (put_user(opt.optlen, optlen))
return -EFAULT;
return 0;
}
static int rawv6_ioctl(struct sock *sk, int cmd, int *karg)