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

bpf: Fix bpf_get/setsockopt to tos for ipv4-mapped ipv6 socket

Browse Source 
When TCP over IPv4 via INET6 API, bpf_get/setsockopt with ipv4 will
fail, because sk->sk_family is AF_INET6. With ipv6 will success, not
take effect, because inet_csk(sk)->icsk_af_ops is ipv6_mapped and
use ip_queue_xmit, inet_sk(sk)->tos.

To relax this restriction, allow getting/setting tos for those possible
ipv4-mapped ipv6 sockets.

Fixes: ee7f1e1302 ("bpf: Change bpf_setsockopt(SOL_IP) to reuse do_ip_setsockopt()")
Signed-off-by: Feng Zhou <zhoufeng.zf@bytedance.com>
Signed-off-by: Leon Hwang <leon.hwang@linux.dev>
Link: https://lore.kernel.org/r/20260613162443.60515-2-leon.hwang@linux.dev
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Leon Hwang 2026-06-14 00:24:42 +08:00 committed by Alexei Starovoitov
parent cf750df538
commit ca0f587c02
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/core/filter.c
View File

@ -5544,11 +5544,24 @@ static int sol_tcp_sockopt(struct sock *sk, int optname,
KERNEL_SOCKPTR(optval), *optlen);
}
static bool sk_allows_sol_ip_sockopt(struct sock *sk)
{
switch (sk->sk_family) {
case AF_INET:
return true;
case AF_INET6:
/* Allow getting/setting sockopt for possible ipv4-mapped ipv6 socket. */
return sk->sk_type != SOCK_RAW && !ipv6_only_sock(sk);
default:
return false;
}
}
static int sol_ip_sockopt(struct sock *sk, int optname,
char *optval, int *optlen,
bool getopt)
{
if (sk->sk_family != AF_INET)
if (!sk_allows_sol_ip_sockopt(sk))
return -EINVAL;
switch (optname) {