2020-01-21 16:56:28 -08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
/* Multipath TCP
|
|
|
|
*
|
|
|
|
* Copyright (c) 2019, Tessares SA.
|
|
|
|
*/
|
|
|
|
|
2021-05-27 16:54:29 -07:00
|
|
|
#ifdef CONFIG_SYSCTL
|
2020-01-21 16:56:28 -08:00
|
|
|
#include <linux/sysctl.h>
|
2021-05-27 16:54:29 -07:00
|
|
|
#endif
|
2020-01-21 16:56:28 -08:00
|
|
|
|
|
|
|
#include <net/net_namespace.h>
|
|
|
|
#include <net/netns/generic.h>
|
|
|
|
|
|
|
|
#include "protocol.h"
|
2024-09-09 22:09:22 +02:00
|
|
|
#include "mib.h"
|
2020-01-21 16:56:28 -08:00
|
|
|
|
|
|
|
#define MPTCP_SYSCTL_PATH "net/mptcp"
|
|
|
|
|
|
|
|
static int mptcp_pernet_id;
|
2022-04-27 15:50:01 -07:00
|
|
|
|
|
|
|
#ifdef CONFIG_SYSCTL
|
|
|
|
static int mptcp_pm_type_max = __MPTCP_PM_TYPE_MAX;
|
|
|
|
#endif
|
|
|
|
|
2020-01-21 16:56:28 -08:00
|
|
|
struct mptcp_pernet {
|
2021-05-27 16:54:29 -07:00
|
|
|
#ifdef CONFIG_SYSCTL
|
2020-01-21 16:56:28 -08:00
|
|
|
struct ctl_table_header *ctl_table_hdr;
|
2021-05-27 16:54:29 -07:00
|
|
|
#endif
|
2020-01-21 16:56:28 -08:00
|
|
|
|
2020-11-03 11:05:07 -08:00
|
|
|
unsigned int add_addr_timeout;
|
2024-09-09 22:09:23 +02:00
|
|
|
unsigned int blackhole_timeout;
|
2023-10-23 13:44:34 -07:00
|
|
|
unsigned int close_timeout;
|
2021-08-13 15:15:45 -07:00
|
|
|
unsigned int stale_loss_cnt;
|
2024-09-09 22:09:23 +02:00
|
|
|
atomic_t active_disable_times;
|
2025-01-17 18:40:31 +01:00
|
|
|
u8 syn_retrans_before_tcp_fallback;
|
2024-09-09 22:09:23 +02:00
|
|
|
unsigned long active_disable_stamp;
|
2021-08-13 15:15:44 -07:00
|
|
|
u8 mptcp_enabled;
|
2021-06-17 16:46:19 -07:00
|
|
|
u8 checksum_enabled;
|
2021-06-22 12:25:18 -07:00
|
|
|
u8 allow_join_initial_addr_port;
|
2022-04-27 15:50:01 -07:00
|
|
|
u8 pm_type;
|
2023-08-21 15:25:15 -07:00
|
|
|
char scheduler[MPTCP_SCHED_NAME_MAX];
|
2025-03-13 11:20:57 +01:00
|
|
|
char path_manager[MPTCP_PM_NAME_MAX];
|
2020-01-21 16:56:28 -08:00
|
|
|
};
|
|
|
|
|
2021-08-13 15:15:44 -07:00
|
|
|
static struct mptcp_pernet *mptcp_get_pernet(const struct net *net)
|
2020-01-21 16:56:28 -08:00
|
|
|
{
|
|
|
|
return net_generic(net, mptcp_pernet_id);
|
|
|
|
}
|
|
|
|
|
2021-08-13 15:15:44 -07:00
|
|
|
int mptcp_is_enabled(const struct net *net)
|
2020-01-21 16:56:28 -08:00
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->mptcp_enabled;
|
|
|
|
}
|
|
|
|
|
2021-08-13 15:15:44 -07:00
|
|
|
unsigned int mptcp_get_add_addr_timeout(const struct net *net)
|
2020-11-03 11:05:07 -08:00
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->add_addr_timeout;
|
|
|
|
}
|
|
|
|
|
2021-08-13 15:15:44 -07:00
|
|
|
int mptcp_is_checksum_enabled(const struct net *net)
|
2021-06-17 16:46:19 -07:00
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->checksum_enabled;
|
|
|
|
}
|
|
|
|
|
2021-08-13 15:15:44 -07:00
|
|
|
int mptcp_allow_join_id0(const struct net *net)
|
2021-06-22 12:25:18 -07:00
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->allow_join_initial_addr_port;
|
|
|
|
}
|
|
|
|
|
2021-08-13 15:15:45 -07:00
|
|
|
unsigned int mptcp_stale_loss_cnt(const struct net *net)
|
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->stale_loss_cnt;
|
|
|
|
}
|
|
|
|
|
2023-10-23 13:44:34 -07:00
|
|
|
unsigned int mptcp_close_timeout(const struct sock *sk)
|
|
|
|
{
|
|
|
|
if (sock_flag(sk, SOCK_DEAD))
|
|
|
|
return TCP_TIMEWAIT_LEN;
|
|
|
|
return mptcp_get_pernet(sock_net(sk))->close_timeout;
|
|
|
|
}
|
|
|
|
|
2022-04-27 15:50:01 -07:00
|
|
|
int mptcp_get_pm_type(const struct net *net)
|
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->pm_type;
|
|
|
|
}
|
|
|
|
|
2025-03-13 11:20:57 +01:00
|
|
|
const char *mptcp_get_path_manager(const struct net *net)
|
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->path_manager;
|
|
|
|
}
|
|
|
|
|
2023-08-21 15:25:15 -07:00
|
|
|
const char *mptcp_get_scheduler(const struct net *net)
|
|
|
|
{
|
|
|
|
return mptcp_get_pernet(net)->scheduler;
|
|
|
|
}
|
|
|
|
|
2021-05-27 16:54:29 -07:00
|
|
|
static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet)
|
|
|
|
{
|
|
|
|
pernet->mptcp_enabled = 1;
|
|
|
|
pernet->add_addr_timeout = TCP_RTO_MAX;
|
2024-09-09 22:09:23 +02:00
|
|
|
pernet->blackhole_timeout = 3600;
|
2025-01-17 18:40:31 +01:00
|
|
|
pernet->syn_retrans_before_tcp_fallback = 2;
|
2024-09-09 22:09:23 +02:00
|
|
|
atomic_set(&pernet->active_disable_times, 0);
|
2023-10-23 13:44:34 -07:00
|
|
|
pernet->close_timeout = TCP_TIMEWAIT_LEN;
|
2021-06-17 16:46:19 -07:00
|
|
|
pernet->checksum_enabled = 0;
|
2021-06-22 12:25:18 -07:00
|
|
|
pernet->allow_join_initial_addr_port = 1;
|
2021-08-13 15:15:45 -07:00
|
|
|
pernet->stale_loss_cnt = 4;
|
2022-04-27 15:50:01 -07:00
|
|
|
pernet->pm_type = MPTCP_PM_TYPE_KERNEL;
|
2024-05-13 18:13:29 -07:00
|
|
|
strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler));
|
2025-03-13 11:20:57 +01:00
|
|
|
strscpy(pernet->path_manager, "kernel", sizeof(pernet->path_manager));
|
2021-05-27 16:54:29 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_SYSCTL
|
mptcp: sysctl: sched: avoid using current->nsproxy
Using the 'net' structure via 'current' is not recommended for different
reasons.
First, if the goal is to use it to read or write per-netns data, this is
inconsistent with how the "generic" sysctl entries are doing: directly
by only using pointers set to the table entry, e.g. table->data. Linked
to that, the per-netns data should always be obtained from the table
linked to the netns it had been created for, which may not coincide with
the reader's or writer's netns.
Another reason is that access to current->nsproxy->netns can oops if
attempted when current->nsproxy had been dropped when the current task
is exiting. This is what syzbot found, when using acct(2):
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000005: 0000 [#1] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]
CPU: 1 UID: 0 PID: 5924 Comm: syz-executor Not tainted 6.13.0-rc5-syzkaller-00004-gccb98ccef0e5 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
proc_sys_call_handler+0x403/0x5d0 fs/proc/proc_sysctl.c:601
__kernel_write_iter+0x318/0xa80 fs/read_write.c:612
__kernel_write+0xf6/0x140 fs/read_write.c:632
do_acct_process+0xcb0/0x14a0 kernel/acct.c:539
acct_pin_kill+0x2d/0x100 kernel/acct.c:192
pin_kill+0x194/0x7c0 fs/fs_pin.c:44
mnt_pin_kill+0x61/0x1e0 fs/fs_pin.c:81
cleanup_mnt+0x3ac/0x450 fs/namespace.c:1366
task_work_run+0x14e/0x250 kernel/task_work.c:239
exit_task_work include/linux/task_work.h:43 [inline]
do_exit+0xad8/0x2d70 kernel/exit.c:938
do_group_exit+0xd3/0x2a0 kernel/exit.c:1087
get_signal+0x2576/0x2610 kernel/signal.c:3017
arch_do_signal_or_restart+0x90/0x7e0 arch/x86/kernel/signal.c:337
exit_to_user_mode_loop kernel/entry/common.c:111 [inline]
exit_to_user_mode_prepare include/linux/entry-common.h:329 [inline]
__syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline]
syscall_exit_to_user_mode+0x150/0x2a0 kernel/entry/common.c:218
do_syscall_64+0xda/0x250 arch/x86/entry/common.c:89
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7fee3cb87a6a
Code: Unable to access opcode bytes at 0x7fee3cb87a40.
RSP: 002b:00007fffcccac688 EFLAGS: 00000202 ORIG_RAX: 0000000000000037
RAX: 0000000000000000 RBX: 00007fffcccac710 RCX: 00007fee3cb87a6a
RDX: 0000000000000041 RSI: 0000000000000000 RDI: 0000000000000003
RBP: 0000000000000003 R08: 00007fffcccac6ac R09: 00007fffcccacac7
R10: 00007fffcccac710 R11: 0000000000000202 R12: 00007fee3cd49500
R13: 00007fffcccac6ac R14: 0000000000000000 R15: 00007fee3cd4b000
</TASK>
Modules linked in:
---[ end trace 0000000000000000 ]---
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
----------------
Code disassembly (best guess), 1 bytes skipped:
0: 42 80 3c 38 00 cmpb $0x0,(%rax,%r15,1)
5: 0f 85 fe 02 00 00 jne 0x309
b: 4d 8b a4 24 08 09 00 mov 0x908(%r12),%r12
12: 00
13: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax
1a: fc ff df
1d: 49 8d 7c 24 28 lea 0x28(%r12),%rdi
22: 48 89 fa mov %rdi,%rdx
25: 48 c1 ea 03 shr $0x3,%rdx
* 29: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction
2d: 0f 85 cc 02 00 00 jne 0x2ff
33: 4d 8b 7c 24 28 mov 0x28(%r12),%r15
38: 48 rex.W
39: 8d .byte 0x8d
3a: 84 24 c8 test %ah,(%rax,%rcx,8)
Here with 'net.mptcp.scheduler', the 'net' structure is not really
needed, because the table->data already has a pointer to the current
scheduler, the only thing needed from the per-netns data.
Simply use 'data', instead of getting (most of the time) the same thing,
but from a longer and indirect way.
Fixes: 6963c508fd7a ("mptcp: only allow set existing scheduler for net.mptcp.scheduler")
Cc: stable@vger.kernel.org
Reported-by: syzbot+e364f774c6f57f2c86d1@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/67769ecb.050a0220.3a8527.003f.GAE@google.com
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250108-net-sysctl-current-nsproxy-v1-2-5df34b2083e8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-01-08 16:34:30 +01:00
|
|
|
static int mptcp_set_scheduler(char *scheduler, const char *name)
|
2024-05-06 17:35:28 +02:00
|
|
|
{
|
|
|
|
struct mptcp_sched_ops *sched;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
sched = mptcp_sched_find(name);
|
|
|
|
if (sched)
|
mptcp: sysctl: sched: avoid using current->nsproxy
Using the 'net' structure via 'current' is not recommended for different
reasons.
First, if the goal is to use it to read or write per-netns data, this is
inconsistent with how the "generic" sysctl entries are doing: directly
by only using pointers set to the table entry, e.g. table->data. Linked
to that, the per-netns data should always be obtained from the table
linked to the netns it had been created for, which may not coincide with
the reader's or writer's netns.
Another reason is that access to current->nsproxy->netns can oops if
attempted when current->nsproxy had been dropped when the current task
is exiting. This is what syzbot found, when using acct(2):
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000005: 0000 [#1] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]
CPU: 1 UID: 0 PID: 5924 Comm: syz-executor Not tainted 6.13.0-rc5-syzkaller-00004-gccb98ccef0e5 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
proc_sys_call_handler+0x403/0x5d0 fs/proc/proc_sysctl.c:601
__kernel_write_iter+0x318/0xa80 fs/read_write.c:612
__kernel_write+0xf6/0x140 fs/read_write.c:632
do_acct_process+0xcb0/0x14a0 kernel/acct.c:539
acct_pin_kill+0x2d/0x100 kernel/acct.c:192
pin_kill+0x194/0x7c0 fs/fs_pin.c:44
mnt_pin_kill+0x61/0x1e0 fs/fs_pin.c:81
cleanup_mnt+0x3ac/0x450 fs/namespace.c:1366
task_work_run+0x14e/0x250 kernel/task_work.c:239
exit_task_work include/linux/task_work.h:43 [inline]
do_exit+0xad8/0x2d70 kernel/exit.c:938
do_group_exit+0xd3/0x2a0 kernel/exit.c:1087
get_signal+0x2576/0x2610 kernel/signal.c:3017
arch_do_signal_or_restart+0x90/0x7e0 arch/x86/kernel/signal.c:337
exit_to_user_mode_loop kernel/entry/common.c:111 [inline]
exit_to_user_mode_prepare include/linux/entry-common.h:329 [inline]
__syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline]
syscall_exit_to_user_mode+0x150/0x2a0 kernel/entry/common.c:218
do_syscall_64+0xda/0x250 arch/x86/entry/common.c:89
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7fee3cb87a6a
Code: Unable to access opcode bytes at 0x7fee3cb87a40.
RSP: 002b:00007fffcccac688 EFLAGS: 00000202 ORIG_RAX: 0000000000000037
RAX: 0000000000000000 RBX: 00007fffcccac710 RCX: 00007fee3cb87a6a
RDX: 0000000000000041 RSI: 0000000000000000 RDI: 0000000000000003
RBP: 0000000000000003 R08: 00007fffcccac6ac R09: 00007fffcccacac7
R10: 00007fffcccac710 R11: 0000000000000202 R12: 00007fee3cd49500
R13: 00007fffcccac6ac R14: 0000000000000000 R15: 00007fee3cd4b000
</TASK>
Modules linked in:
---[ end trace 0000000000000000 ]---
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
----------------
Code disassembly (best guess), 1 bytes skipped:
0: 42 80 3c 38 00 cmpb $0x0,(%rax,%r15,1)
5: 0f 85 fe 02 00 00 jne 0x309
b: 4d 8b a4 24 08 09 00 mov 0x908(%r12),%r12
12: 00
13: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax
1a: fc ff df
1d: 49 8d 7c 24 28 lea 0x28(%r12),%rdi
22: 48 89 fa mov %rdi,%rdx
25: 48 c1 ea 03 shr $0x3,%rdx
* 29: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction
2d: 0f 85 cc 02 00 00 jne 0x2ff
33: 4d 8b 7c 24 28 mov 0x28(%r12),%r15
38: 48 rex.W
39: 8d .byte 0x8d
3a: 84 24 c8 test %ah,(%rax,%rcx,8)
Here with 'net.mptcp.scheduler', the 'net' structure is not really
needed, because the table->data already has a pointer to the current
scheduler, the only thing needed from the per-netns data.
Simply use 'data', instead of getting (most of the time) the same thing,
but from a longer and indirect way.
Fixes: 6963c508fd7a ("mptcp: only allow set existing scheduler for net.mptcp.scheduler")
Cc: stable@vger.kernel.org
Reported-by: syzbot+e364f774c6f57f2c86d1@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/67769ecb.050a0220.3a8527.003f.GAE@google.com
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250108-net-sysctl-current-nsproxy-v1-2-5df34b2083e8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-01-08 16:34:30 +01:00
|
|
|
strscpy(scheduler, name, MPTCP_SCHED_NAME_MAX);
|
2024-05-06 17:35:28 +02:00
|
|
|
else
|
|
|
|
ret = -ENOENT;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
sysctl: treewide: constify the ctl_table argument of proc_handlers
const qualify the struct ctl_table argument in the proc_handler function
signatures. This is a prerequisite to moving the static ctl_table
structs into .rodata data which will ensure that proc_handler function
pointers cannot be modified.
This patch has been generated by the following coccinelle script:
```
virtual patch
@r1@
identifier ctl, write, buffer, lenp, ppos;
identifier func !~ "appldata_(timer|interval)_handler|sched_(rt|rr)_handler|rds_tcp_skbuf_handler|proc_sctp_do_(hmac_alg|rto_min|rto_max|udp_port|alpha_beta|auth|probe_interval)";
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos);
@r2@
identifier func, ctl, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos)
{ ... }
@r3@
identifier func;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int , void *, size_t *, loff_t *);
@r4@
identifier func, ctl;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int , void *, size_t *, loff_t *);
@r5@
identifier func, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int write, void *buffer, size_t *lenp, loff_t *ppos);
```
* Code formatting was adjusted in xfs_sysctl.c to comply with code
conventions. The xfs_stats_clear_proc_handler,
xfs_panic_mask_proc_handler and xfs_deprecated_dointvec_minmax where
adjusted.
* The ctl_table argument in proc_watchdog_common was const qualified.
This is called from a proc_handler itself and is calling back into
another proc_handler, making it necessary to change it as part of the
proc_handler migration.
Co-developed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Co-developed-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: Joel Granados <j.granados@samsung.com>
2024-07-24 20:59:29 +02:00
|
|
|
static int proc_scheduler(const struct ctl_table *ctl, int write,
|
2024-05-06 17:35:28 +02:00
|
|
|
void *buffer, size_t *lenp, loff_t *ppos)
|
|
|
|
{
|
mptcp: sysctl: sched: avoid using current->nsproxy
Using the 'net' structure via 'current' is not recommended for different
reasons.
First, if the goal is to use it to read or write per-netns data, this is
inconsistent with how the "generic" sysctl entries are doing: directly
by only using pointers set to the table entry, e.g. table->data. Linked
to that, the per-netns data should always be obtained from the table
linked to the netns it had been created for, which may not coincide with
the reader's or writer's netns.
Another reason is that access to current->nsproxy->netns can oops if
attempted when current->nsproxy had been dropped when the current task
is exiting. This is what syzbot found, when using acct(2):
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000005: 0000 [#1] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]
CPU: 1 UID: 0 PID: 5924 Comm: syz-executor Not tainted 6.13.0-rc5-syzkaller-00004-gccb98ccef0e5 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
proc_sys_call_handler+0x403/0x5d0 fs/proc/proc_sysctl.c:601
__kernel_write_iter+0x318/0xa80 fs/read_write.c:612
__kernel_write+0xf6/0x140 fs/read_write.c:632
do_acct_process+0xcb0/0x14a0 kernel/acct.c:539
acct_pin_kill+0x2d/0x100 kernel/acct.c:192
pin_kill+0x194/0x7c0 fs/fs_pin.c:44
mnt_pin_kill+0x61/0x1e0 fs/fs_pin.c:81
cleanup_mnt+0x3ac/0x450 fs/namespace.c:1366
task_work_run+0x14e/0x250 kernel/task_work.c:239
exit_task_work include/linux/task_work.h:43 [inline]
do_exit+0xad8/0x2d70 kernel/exit.c:938
do_group_exit+0xd3/0x2a0 kernel/exit.c:1087
get_signal+0x2576/0x2610 kernel/signal.c:3017
arch_do_signal_or_restart+0x90/0x7e0 arch/x86/kernel/signal.c:337
exit_to_user_mode_loop kernel/entry/common.c:111 [inline]
exit_to_user_mode_prepare include/linux/entry-common.h:329 [inline]
__syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline]
syscall_exit_to_user_mode+0x150/0x2a0 kernel/entry/common.c:218
do_syscall_64+0xda/0x250 arch/x86/entry/common.c:89
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7fee3cb87a6a
Code: Unable to access opcode bytes at 0x7fee3cb87a40.
RSP: 002b:00007fffcccac688 EFLAGS: 00000202 ORIG_RAX: 0000000000000037
RAX: 0000000000000000 RBX: 00007fffcccac710 RCX: 00007fee3cb87a6a
RDX: 0000000000000041 RSI: 0000000000000000 RDI: 0000000000000003
RBP: 0000000000000003 R08: 00007fffcccac6ac R09: 00007fffcccacac7
R10: 00007fffcccac710 R11: 0000000000000202 R12: 00007fee3cd49500
R13: 00007fffcccac6ac R14: 0000000000000000 R15: 00007fee3cd4b000
</TASK>
Modules linked in:
---[ end trace 0000000000000000 ]---
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
----------------
Code disassembly (best guess), 1 bytes skipped:
0: 42 80 3c 38 00 cmpb $0x0,(%rax,%r15,1)
5: 0f 85 fe 02 00 00 jne 0x309
b: 4d 8b a4 24 08 09 00 mov 0x908(%r12),%r12
12: 00
13: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax
1a: fc ff df
1d: 49 8d 7c 24 28 lea 0x28(%r12),%rdi
22: 48 89 fa mov %rdi,%rdx
25: 48 c1 ea 03 shr $0x3,%rdx
* 29: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction
2d: 0f 85 cc 02 00 00 jne 0x2ff
33: 4d 8b 7c 24 28 mov 0x28(%r12),%r15
38: 48 rex.W
39: 8d .byte 0x8d
3a: 84 24 c8 test %ah,(%rax,%rcx,8)
Here with 'net.mptcp.scheduler', the 'net' structure is not really
needed, because the table->data already has a pointer to the current
scheduler, the only thing needed from the per-netns data.
Simply use 'data', instead of getting (most of the time) the same thing,
but from a longer and indirect way.
Fixes: 6963c508fd7a ("mptcp: only allow set existing scheduler for net.mptcp.scheduler")
Cc: stable@vger.kernel.org
Reported-by: syzbot+e364f774c6f57f2c86d1@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/67769ecb.050a0220.3a8527.003f.GAE@google.com
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250108-net-sysctl-current-nsproxy-v1-2-5df34b2083e8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-01-08 16:34:30 +01:00
|
|
|
char (*scheduler)[MPTCP_SCHED_NAME_MAX] = ctl->data;
|
2024-05-06 17:35:28 +02:00
|
|
|
char val[MPTCP_SCHED_NAME_MAX];
|
|
|
|
struct ctl_table tbl = {
|
|
|
|
.data = val,
|
|
|
|
.maxlen = MPTCP_SCHED_NAME_MAX,
|
|
|
|
};
|
|
|
|
int ret;
|
|
|
|
|
mptcp: sysctl: sched: avoid using current->nsproxy
Using the 'net' structure via 'current' is not recommended for different
reasons.
First, if the goal is to use it to read or write per-netns data, this is
inconsistent with how the "generic" sysctl entries are doing: directly
by only using pointers set to the table entry, e.g. table->data. Linked
to that, the per-netns data should always be obtained from the table
linked to the netns it had been created for, which may not coincide with
the reader's or writer's netns.
Another reason is that access to current->nsproxy->netns can oops if
attempted when current->nsproxy had been dropped when the current task
is exiting. This is what syzbot found, when using acct(2):
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000005: 0000 [#1] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]
CPU: 1 UID: 0 PID: 5924 Comm: syz-executor Not tainted 6.13.0-rc5-syzkaller-00004-gccb98ccef0e5 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
proc_sys_call_handler+0x403/0x5d0 fs/proc/proc_sysctl.c:601
__kernel_write_iter+0x318/0xa80 fs/read_write.c:612
__kernel_write+0xf6/0x140 fs/read_write.c:632
do_acct_process+0xcb0/0x14a0 kernel/acct.c:539
acct_pin_kill+0x2d/0x100 kernel/acct.c:192
pin_kill+0x194/0x7c0 fs/fs_pin.c:44
mnt_pin_kill+0x61/0x1e0 fs/fs_pin.c:81
cleanup_mnt+0x3ac/0x450 fs/namespace.c:1366
task_work_run+0x14e/0x250 kernel/task_work.c:239
exit_task_work include/linux/task_work.h:43 [inline]
do_exit+0xad8/0x2d70 kernel/exit.c:938
do_group_exit+0xd3/0x2a0 kernel/exit.c:1087
get_signal+0x2576/0x2610 kernel/signal.c:3017
arch_do_signal_or_restart+0x90/0x7e0 arch/x86/kernel/signal.c:337
exit_to_user_mode_loop kernel/entry/common.c:111 [inline]
exit_to_user_mode_prepare include/linux/entry-common.h:329 [inline]
__syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline]
syscall_exit_to_user_mode+0x150/0x2a0 kernel/entry/common.c:218
do_syscall_64+0xda/0x250 arch/x86/entry/common.c:89
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7fee3cb87a6a
Code: Unable to access opcode bytes at 0x7fee3cb87a40.
RSP: 002b:00007fffcccac688 EFLAGS: 00000202 ORIG_RAX: 0000000000000037
RAX: 0000000000000000 RBX: 00007fffcccac710 RCX: 00007fee3cb87a6a
RDX: 0000000000000041 RSI: 0000000000000000 RDI: 0000000000000003
RBP: 0000000000000003 R08: 00007fffcccac6ac R09: 00007fffcccacac7
R10: 00007fffcccac710 R11: 0000000000000202 R12: 00007fee3cd49500
R13: 00007fffcccac6ac R14: 0000000000000000 R15: 00007fee3cd4b000
</TASK>
Modules linked in:
---[ end trace 0000000000000000 ]---
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
----------------
Code disassembly (best guess), 1 bytes skipped:
0: 42 80 3c 38 00 cmpb $0x0,(%rax,%r15,1)
5: 0f 85 fe 02 00 00 jne 0x309
b: 4d 8b a4 24 08 09 00 mov 0x908(%r12),%r12
12: 00
13: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax
1a: fc ff df
1d: 49 8d 7c 24 28 lea 0x28(%r12),%rdi
22: 48 89 fa mov %rdi,%rdx
25: 48 c1 ea 03 shr $0x3,%rdx
* 29: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction
2d: 0f 85 cc 02 00 00 jne 0x2ff
33: 4d 8b 7c 24 28 mov 0x28(%r12),%r15
38: 48 rex.W
39: 8d .byte 0x8d
3a: 84 24 c8 test %ah,(%rax,%rcx,8)
Here with 'net.mptcp.scheduler', the 'net' structure is not really
needed, because the table->data already has a pointer to the current
scheduler, the only thing needed from the per-netns data.
Simply use 'data', instead of getting (most of the time) the same thing,
but from a longer and indirect way.
Fixes: 6963c508fd7a ("mptcp: only allow set existing scheduler for net.mptcp.scheduler")
Cc: stable@vger.kernel.org
Reported-by: syzbot+e364f774c6f57f2c86d1@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/67769ecb.050a0220.3a8527.003f.GAE@google.com
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250108-net-sysctl-current-nsproxy-v1-2-5df34b2083e8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-01-08 16:34:30 +01:00
|
|
|
strscpy(val, *scheduler, MPTCP_SCHED_NAME_MAX);
|
2024-05-06 17:35:28 +02:00
|
|
|
|
|
|
|
ret = proc_dostring(&tbl, write, buffer, lenp, ppos);
|
|
|
|
if (write && ret == 0)
|
mptcp: sysctl: sched: avoid using current->nsproxy
Using the 'net' structure via 'current' is not recommended for different
reasons.
First, if the goal is to use it to read or write per-netns data, this is
inconsistent with how the "generic" sysctl entries are doing: directly
by only using pointers set to the table entry, e.g. table->data. Linked
to that, the per-netns data should always be obtained from the table
linked to the netns it had been created for, which may not coincide with
the reader's or writer's netns.
Another reason is that access to current->nsproxy->netns can oops if
attempted when current->nsproxy had been dropped when the current task
is exiting. This is what syzbot found, when using acct(2):
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000005: 0000 [#1] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]
CPU: 1 UID: 0 PID: 5924 Comm: syz-executor Not tainted 6.13.0-rc5-syzkaller-00004-gccb98ccef0e5 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
proc_sys_call_handler+0x403/0x5d0 fs/proc/proc_sysctl.c:601
__kernel_write_iter+0x318/0xa80 fs/read_write.c:612
__kernel_write+0xf6/0x140 fs/read_write.c:632
do_acct_process+0xcb0/0x14a0 kernel/acct.c:539
acct_pin_kill+0x2d/0x100 kernel/acct.c:192
pin_kill+0x194/0x7c0 fs/fs_pin.c:44
mnt_pin_kill+0x61/0x1e0 fs/fs_pin.c:81
cleanup_mnt+0x3ac/0x450 fs/namespace.c:1366
task_work_run+0x14e/0x250 kernel/task_work.c:239
exit_task_work include/linux/task_work.h:43 [inline]
do_exit+0xad8/0x2d70 kernel/exit.c:938
do_group_exit+0xd3/0x2a0 kernel/exit.c:1087
get_signal+0x2576/0x2610 kernel/signal.c:3017
arch_do_signal_or_restart+0x90/0x7e0 arch/x86/kernel/signal.c:337
exit_to_user_mode_loop kernel/entry/common.c:111 [inline]
exit_to_user_mode_prepare include/linux/entry-common.h:329 [inline]
__syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline]
syscall_exit_to_user_mode+0x150/0x2a0 kernel/entry/common.c:218
do_syscall_64+0xda/0x250 arch/x86/entry/common.c:89
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7fee3cb87a6a
Code: Unable to access opcode bytes at 0x7fee3cb87a40.
RSP: 002b:00007fffcccac688 EFLAGS: 00000202 ORIG_RAX: 0000000000000037
RAX: 0000000000000000 RBX: 00007fffcccac710 RCX: 00007fee3cb87a6a
RDX: 0000000000000041 RSI: 0000000000000000 RDI: 0000000000000003
RBP: 0000000000000003 R08: 00007fffcccac6ac R09: 00007fffcccacac7
R10: 00007fffcccac710 R11: 0000000000000202 R12: 00007fee3cd49500
R13: 00007fffcccac6ac R14: 0000000000000000 R15: 00007fee3cd4b000
</TASK>
Modules linked in:
---[ end trace 0000000000000000 ]---
RIP: 0010:proc_scheduler+0xc6/0x3c0 net/mptcp/ctrl.c:125
Code: 03 42 80 3c 38 00 0f 85 fe 02 00 00 4d 8b a4 24 08 09 00 00 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 28 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 cc 02 00 00 4d 8b 7c 24 28 48 8d 84 24 c8 00 00
RSP: 0018:ffffc900034774e8 EFLAGS: 00010206
RAX: dffffc0000000000 RBX: 1ffff9200068ee9e RCX: ffffc90003477620
RDX: 0000000000000005 RSI: ffffffff8b08f91e RDI: 0000000000000028
RBP: 0000000000000001 R08: ffffc90003477710 R09: 0000000000000040
R10: 0000000000000040 R11: 00000000726f7475 R12: 0000000000000000
R13: ffffc90003477620 R14: ffffc90003477710 R15: dffffc0000000000
FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fee3cd452d8 CR3: 000000007d116000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
----------------
Code disassembly (best guess), 1 bytes skipped:
0: 42 80 3c 38 00 cmpb $0x0,(%rax,%r15,1)
5: 0f 85 fe 02 00 00 jne 0x309
b: 4d 8b a4 24 08 09 00 mov 0x908(%r12),%r12
12: 00
13: 48 b8 00 00 00 00 00 movabs $0xdffffc0000000000,%rax
1a: fc ff df
1d: 49 8d 7c 24 28 lea 0x28(%r12),%rdi
22: 48 89 fa mov %rdi,%rdx
25: 48 c1 ea 03 shr $0x3,%rdx
* 29: 80 3c 02 00 cmpb $0x0,(%rdx,%rax,1) <-- trapping instruction
2d: 0f 85 cc 02 00 00 jne 0x2ff
33: 4d 8b 7c 24 28 mov 0x28(%r12),%r15
38: 48 rex.W
39: 8d .byte 0x8d
3a: 84 24 c8 test %ah,(%rax,%rcx,8)
Here with 'net.mptcp.scheduler', the 'net' structure is not really
needed, because the table->data already has a pointer to the current
scheduler, the only thing needed from the per-netns data.
Simply use 'data', instead of getting (most of the time) the same thing,
but from a longer and indirect way.
Fixes: 6963c508fd7a ("mptcp: only allow set existing scheduler for net.mptcp.scheduler")
Cc: stable@vger.kernel.org
Reported-by: syzbot+e364f774c6f57f2c86d1@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/67769ecb.050a0220.3a8527.003f.GAE@google.com
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250108-net-sysctl-current-nsproxy-v1-2-5df34b2083e8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-01-08 16:34:30 +01:00
|
|
|
ret = mptcp_set_scheduler(*scheduler, val);
|
2024-05-06 17:35:28 +02:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
sysctl: treewide: constify the ctl_table argument of proc_handlers
const qualify the struct ctl_table argument in the proc_handler function
signatures. This is a prerequisite to moving the static ctl_table
structs into .rodata data which will ensure that proc_handler function
pointers cannot be modified.
This patch has been generated by the following coccinelle script:
```
virtual patch
@r1@
identifier ctl, write, buffer, lenp, ppos;
identifier func !~ "appldata_(timer|interval)_handler|sched_(rt|rr)_handler|rds_tcp_skbuf_handler|proc_sctp_do_(hmac_alg|rto_min|rto_max|udp_port|alpha_beta|auth|probe_interval)";
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos);
@r2@
identifier func, ctl, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int write, void *buffer, size_t *lenp, loff_t *ppos)
{ ... }
@r3@
identifier func;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int , void *, size_t *, loff_t *);
@r4@
identifier func, ctl;
@@
int func(
- struct ctl_table *ctl
+ const struct ctl_table *ctl
,int , void *, size_t *, loff_t *);
@r5@
identifier func, write, buffer, lenp, ppos;
@@
int func(
- struct ctl_table *
+ const struct ctl_table *
,int write, void *buffer, size_t *lenp, loff_t *ppos);
```
* Code formatting was adjusted in xfs_sysctl.c to comply with code
conventions. The xfs_stats_clear_proc_handler,
xfs_panic_mask_proc_handler and xfs_deprecated_dointvec_minmax where
adjusted.
* The ctl_table argument in proc_watchdog_common was const qualified.
This is called from a proc_handler itself and is calling back into
another proc_handler, making it necessary to change it as part of the
proc_handler migration.
Co-developed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Co-developed-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: Joel Granados <j.granados@samsung.com>
2024-07-24 20:59:29 +02:00
|
|
|
static int proc_available_schedulers(const struct ctl_table *ctl,
|
2024-05-13 18:13:28 -07:00
|
|
|
int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ctl_table tbl = { .maxlen = MPTCP_SCHED_BUF_MAX, };
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
tbl.data = kmalloc(tbl.maxlen, GFP_USER);
|
|
|
|
if (!tbl.data)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
mptcp_get_available_schedulers(tbl.data, MPTCP_SCHED_BUF_MAX);
|
|
|
|
ret = proc_dostring(&tbl, write, buffer, lenp, ppos);
|
|
|
|
kfree(tbl.data);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2024-09-09 22:09:23 +02:00
|
|
|
static int proc_blackhole_detect_timeout(const struct ctl_table *table,
|
|
|
|
int write, void *buffer, size_t *lenp,
|
|
|
|
loff_t *ppos)
|
|
|
|
{
|
2025-01-08 16:34:31 +01:00
|
|
|
struct mptcp_pernet *pernet = container_of(table->data,
|
|
|
|
struct mptcp_pernet,
|
|
|
|
blackhole_timeout);
|
2024-09-09 22:09:23 +02:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
|
|
|
|
if (write && ret == 0)
|
|
|
|
atomic_set(&pernet->active_disable_times, 0);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2025-03-13 11:20:57 +01:00
|
|
|
static int mptcp_set_path_manager(char *path_manager, const char *name)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_ops *pm_ops;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
pm_ops = mptcp_pm_find(name);
|
|
|
|
if (pm_ops)
|
|
|
|
strscpy(path_manager, name, MPTCP_PM_NAME_MAX);
|
|
|
|
else
|
|
|
|
ret = -ENOENT;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int proc_path_manager(const struct ctl_table *ctl, int write,
|
|
|
|
void *buffer, size_t *lenp, loff_t *ppos)
|
|
|
|
{
|
2025-03-13 11:20:58 +01:00
|
|
|
struct mptcp_pernet *pernet = container_of(ctl->data,
|
|
|
|
struct mptcp_pernet,
|
|
|
|
path_manager);
|
2025-03-13 11:20:57 +01:00
|
|
|
char (*path_manager)[MPTCP_PM_NAME_MAX] = ctl->data;
|
|
|
|
char pm_name[MPTCP_PM_NAME_MAX];
|
|
|
|
const struct ctl_table tbl = {
|
|
|
|
.data = pm_name,
|
|
|
|
.maxlen = MPTCP_PM_NAME_MAX,
|
|
|
|
};
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
strscpy(pm_name, *path_manager, MPTCP_PM_NAME_MAX);
|
|
|
|
|
|
|
|
ret = proc_dostring(&tbl, write, buffer, lenp, ppos);
|
2025-03-13 11:20:58 +01:00
|
|
|
if (write && ret == 0) {
|
2025-03-13 11:20:57 +01:00
|
|
|
ret = mptcp_set_path_manager(*path_manager, pm_name);
|
2025-03-13 11:20:58 +01:00
|
|
|
if (ret == 0) {
|
|
|
|
u8 pm_type = __MPTCP_PM_TYPE_NR;
|
|
|
|
|
|
|
|
if (strncmp(pm_name, "kernel", MPTCP_PM_NAME_MAX) == 0)
|
|
|
|
pm_type = MPTCP_PM_TYPE_KERNEL;
|
|
|
|
else if (strncmp(pm_name, "userspace", MPTCP_PM_NAME_MAX) == 0)
|
|
|
|
pm_type = MPTCP_PM_TYPE_USERSPACE;
|
|
|
|
pernet->pm_type = pm_type;
|
|
|
|
}
|
|
|
|
}
|
2025-03-13 11:20:57 +01:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2025-03-13 11:20:59 +01:00
|
|
|
static int proc_pm_type(const struct ctl_table *ctl, int write,
|
|
|
|
void *buffer, size_t *lenp, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct mptcp_pernet *pernet = container_of(ctl->data,
|
|
|
|
struct mptcp_pernet,
|
|
|
|
pm_type);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = proc_dou8vec_minmax(ctl, write, buffer, lenp, ppos);
|
|
|
|
if (write && ret == 0) {
|
|
|
|
u8 pm_type = READ_ONCE(*(u8 *)ctl->data);
|
|
|
|
char *pm_name = "";
|
|
|
|
|
|
|
|
if (pm_type == MPTCP_PM_TYPE_KERNEL)
|
|
|
|
pm_name = "kernel";
|
|
|
|
else if (pm_type == MPTCP_PM_TYPE_USERSPACE)
|
|
|
|
pm_name = "userspace";
|
|
|
|
mptcp_set_path_manager(pernet->path_manager, pm_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2025-03-13 11:21:00 +01:00
|
|
|
static int proc_available_path_managers(const struct ctl_table *ctl,
|
|
|
|
int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ctl_table tbl = { .maxlen = MPTCP_PM_BUF_MAX, };
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
tbl.data = kmalloc(tbl.maxlen, GFP_USER);
|
|
|
|
if (!tbl.data)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
mptcp_pm_get_available(tbl.data, MPTCP_PM_BUF_MAX);
|
|
|
|
ret = proc_dostring(&tbl, write, buffer, lenp, ppos);
|
|
|
|
kfree(tbl.data);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2020-01-21 16:56:28 -08:00
|
|
|
static struct ctl_table mptcp_sysctl_table[] = {
|
|
|
|
{
|
|
|
|
.procname = "enabled",
|
2021-05-27 16:54:30 -07:00
|
|
|
.maxlen = sizeof(u8),
|
2020-01-21 16:56:28 -08:00
|
|
|
.mode = 0644,
|
|
|
|
/* users with CAP_NET_ADMIN or root (not and) can change this
|
|
|
|
* value, same as other sysctl or the 'net' tree.
|
|
|
|
*/
|
2021-05-27 16:54:30 -07:00
|
|
|
.proc_handler = proc_dou8vec_minmax,
|
|
|
|
.extra1 = SYSCTL_ZERO,
|
|
|
|
.extra2 = SYSCTL_ONE
|
2020-01-21 16:56:28 -08:00
|
|
|
},
|
2020-11-03 11:05:07 -08:00
|
|
|
{
|
|
|
|
.procname = "add_addr_timeout",
|
|
|
|
.maxlen = sizeof(unsigned int),
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_dointvec_jiffies,
|
|
|
|
},
|
2021-06-17 16:46:19 -07:00
|
|
|
{
|
|
|
|
.procname = "checksum_enabled",
|
|
|
|
.maxlen = sizeof(u8),
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_dou8vec_minmax,
|
|
|
|
.extra1 = SYSCTL_ZERO,
|
|
|
|
.extra2 = SYSCTL_ONE
|
|
|
|
},
|
2021-06-22 12:25:18 -07:00
|
|
|
{
|
|
|
|
.procname = "allow_join_initial_addr_port",
|
|
|
|
.maxlen = sizeof(u8),
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_dou8vec_minmax,
|
|
|
|
.extra1 = SYSCTL_ZERO,
|
|
|
|
.extra2 = SYSCTL_ONE
|
|
|
|
},
|
2021-08-13 15:15:45 -07:00
|
|
|
{
|
|
|
|
.procname = "stale_loss_cnt",
|
|
|
|
.maxlen = sizeof(unsigned int),
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_douintvec_minmax,
|
|
|
|
},
|
2022-04-27 15:50:01 -07:00
|
|
|
{
|
|
|
|
.procname = "pm_type",
|
|
|
|
.maxlen = sizeof(u8),
|
|
|
|
.mode = 0644,
|
2025-03-13 11:20:59 +01:00
|
|
|
.proc_handler = proc_pm_type,
|
2022-04-27 15:50:01 -07:00
|
|
|
.extra1 = SYSCTL_ZERO,
|
|
|
|
.extra2 = &mptcp_pm_type_max
|
|
|
|
},
|
2023-08-21 15:25:15 -07:00
|
|
|
{
|
|
|
|
.procname = "scheduler",
|
|
|
|
.maxlen = MPTCP_SCHED_NAME_MAX,
|
|
|
|
.mode = 0644,
|
2024-05-06 17:35:28 +02:00
|
|
|
.proc_handler = proc_scheduler,
|
2023-08-21 15:25:15 -07:00
|
|
|
},
|
2024-05-13 18:13:28 -07:00
|
|
|
{
|
|
|
|
.procname = "available_schedulers",
|
|
|
|
.maxlen = MPTCP_SCHED_BUF_MAX,
|
2025-01-08 16:34:29 +01:00
|
|
|
.mode = 0444,
|
2024-05-13 18:13:28 -07:00
|
|
|
.proc_handler = proc_available_schedulers,
|
|
|
|
},
|
2023-10-23 13:44:34 -07:00
|
|
|
{
|
|
|
|
.procname = "close_timeout",
|
|
|
|
.maxlen = sizeof(unsigned int),
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_dointvec_jiffies,
|
|
|
|
},
|
2024-09-09 22:09:23 +02:00
|
|
|
{
|
|
|
|
.procname = "blackhole_timeout",
|
|
|
|
.maxlen = sizeof(unsigned int),
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_blackhole_detect_timeout,
|
|
|
|
.extra1 = SYSCTL_ZERO,
|
|
|
|
},
|
2025-01-17 18:40:31 +01:00
|
|
|
{
|
|
|
|
.procname = "syn_retrans_before_tcp_fallback",
|
|
|
|
.maxlen = sizeof(u8),
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_dou8vec_minmax,
|
|
|
|
},
|
2025-03-13 11:20:57 +01:00
|
|
|
{
|
|
|
|
.procname = "path_manager",
|
|
|
|
.maxlen = MPTCP_PM_NAME_MAX,
|
|
|
|
.mode = 0644,
|
|
|
|
.proc_handler = proc_path_manager,
|
|
|
|
},
|
2025-03-13 11:21:00 +01:00
|
|
|
{
|
|
|
|
.procname = "available_path_managers",
|
|
|
|
.maxlen = MPTCP_PM_BUF_MAX,
|
|
|
|
.mode = 0444,
|
|
|
|
.proc_handler = proc_available_path_managers,
|
|
|
|
},
|
2020-01-21 16:56:28 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet)
|
|
|
|
{
|
|
|
|
struct ctl_table_header *hdr;
|
|
|
|
struct ctl_table *table;
|
|
|
|
|
|
|
|
table = mptcp_sysctl_table;
|
|
|
|
if (!net_eq(net, &init_net)) {
|
|
|
|
table = kmemdup(table, sizeof(mptcp_sysctl_table), GFP_KERNEL);
|
|
|
|
if (!table)
|
|
|
|
goto err_alloc;
|
|
|
|
}
|
|
|
|
|
|
|
|
table[0].data = &pernet->mptcp_enabled;
|
2020-11-03 11:05:07 -08:00
|
|
|
table[1].data = &pernet->add_addr_timeout;
|
2021-06-17 16:46:19 -07:00
|
|
|
table[2].data = &pernet->checksum_enabled;
|
2021-06-22 12:25:18 -07:00
|
|
|
table[3].data = &pernet->allow_join_initial_addr_port;
|
2021-08-13 15:15:45 -07:00
|
|
|
table[4].data = &pernet->stale_loss_cnt;
|
2022-04-27 15:50:01 -07:00
|
|
|
table[5].data = &pernet->pm_type;
|
2023-08-21 15:25:15 -07:00
|
|
|
table[6].data = &pernet->scheduler;
|
2024-05-13 18:13:28 -07:00
|
|
|
/* table[7] is for available_schedulers which is read-only info */
|
|
|
|
table[8].data = &pernet->close_timeout;
|
2024-09-09 22:09:23 +02:00
|
|
|
table[9].data = &pernet->blackhole_timeout;
|
2025-01-17 18:40:31 +01:00
|
|
|
table[10].data = &pernet->syn_retrans_before_tcp_fallback;
|
2025-03-13 11:20:57 +01:00
|
|
|
table[11].data = &pernet->path_manager;
|
2025-03-13 11:21:00 +01:00
|
|
|
/* table[12] is for available_path_managers which is read-only info */
|
2020-01-21 16:56:28 -08:00
|
|
|
|
2023-08-09 12:50:03 +02:00
|
|
|
hdr = register_net_sysctl_sz(net, MPTCP_SYSCTL_PATH, table,
|
|
|
|
ARRAY_SIZE(mptcp_sysctl_table));
|
2020-01-21 16:56:28 -08:00
|
|
|
if (!hdr)
|
|
|
|
goto err_reg;
|
|
|
|
|
|
|
|
pernet->ctl_table_hdr = hdr;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_reg:
|
|
|
|
if (!net_eq(net, &init_net))
|
|
|
|
kfree(table);
|
|
|
|
err_alloc:
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_pernet_del_table(struct mptcp_pernet *pernet)
|
|
|
|
{
|
2024-04-18 11:40:08 +02:00
|
|
|
const struct ctl_table *table = pernet->ctl_table_hdr->ctl_table_arg;
|
2020-01-21 16:56:28 -08:00
|
|
|
|
|
|
|
unregister_net_sysctl_table(pernet->ctl_table_hdr);
|
|
|
|
|
|
|
|
kfree(table);
|
|
|
|
}
|
|
|
|
|
2021-05-27 16:54:29 -07:00
|
|
|
#else
|
|
|
|
|
|
|
|
static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_pernet_del_table(struct mptcp_pernet *pernet) {}
|
|
|
|
|
|
|
|
#endif /* CONFIG_SYSCTL */
|
|
|
|
|
2024-09-09 22:09:23 +02:00
|
|
|
/* The following code block is to deal with middle box issues with MPTCP,
|
|
|
|
* similar to what is done with TFO.
|
|
|
|
* The proposed solution is to disable active MPTCP globally when SYN+MPC are
|
|
|
|
* dropped, while SYN without MPC aren't. In this case, active side MPTCP is
|
|
|
|
* disabled globally for 1hr at first. Then if it happens again, it is disabled
|
|
|
|
* for 2h, then 4h, 8h, ...
|
|
|
|
* The timeout is reset back to 1hr when a successful active MPTCP connection is
|
|
|
|
* fully established.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Disable active MPTCP and record current jiffies and active_disable_times */
|
|
|
|
void mptcp_active_disable(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct net *net = sock_net(sk);
|
|
|
|
struct mptcp_pernet *pernet;
|
|
|
|
|
|
|
|
pernet = mptcp_get_pernet(net);
|
|
|
|
|
|
|
|
if (!READ_ONCE(pernet->blackhole_timeout))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Paired with READ_ONCE() in mptcp_active_should_disable() */
|
|
|
|
WRITE_ONCE(pernet->active_disable_stamp, jiffies);
|
|
|
|
|
|
|
|
/* Paired with smp_rmb() in mptcp_active_should_disable().
|
|
|
|
* We want pernet->active_disable_stamp to be updated first.
|
|
|
|
*/
|
|
|
|
smp_mb__before_atomic();
|
|
|
|
atomic_inc(&pernet->active_disable_times);
|
|
|
|
|
|
|
|
MPTCP_INC_STATS(net, MPTCP_MIB_BLACKHOLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Calculate timeout for MPTCP active disable
|
|
|
|
* Return true if we are still in the active MPTCP disable period
|
|
|
|
* Return false if timeout already expired and we should use active MPTCP
|
|
|
|
*/
|
|
|
|
bool mptcp_active_should_disable(struct sock *ssk)
|
|
|
|
{
|
|
|
|
struct net *net = sock_net(ssk);
|
|
|
|
unsigned int blackhole_timeout;
|
|
|
|
struct mptcp_pernet *pernet;
|
|
|
|
unsigned long timeout;
|
|
|
|
int disable_times;
|
|
|
|
int multiplier;
|
|
|
|
|
|
|
|
pernet = mptcp_get_pernet(net);
|
|
|
|
blackhole_timeout = READ_ONCE(pernet->blackhole_timeout);
|
|
|
|
|
|
|
|
if (!blackhole_timeout)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
disable_times = atomic_read(&pernet->active_disable_times);
|
|
|
|
if (!disable_times)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* Paired with smp_mb__before_atomic() in mptcp_active_disable() */
|
|
|
|
smp_rmb();
|
|
|
|
|
|
|
|
/* Limit timeout to max: 2^6 * initial timeout */
|
|
|
|
multiplier = 1 << min(disable_times - 1, 6);
|
|
|
|
|
|
|
|
/* Paired with the WRITE_ONCE() in mptcp_active_disable(). */
|
|
|
|
timeout = READ_ONCE(pernet->active_disable_stamp) +
|
|
|
|
multiplier * blackhole_timeout * HZ;
|
|
|
|
|
|
|
|
return time_before(jiffies, timeout);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Enable active MPTCP and reset active_disable_times if needed */
|
|
|
|
void mptcp_active_enable(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_pernet *pernet = mptcp_get_pernet(sock_net(sk));
|
|
|
|
|
|
|
|
if (atomic_read(&pernet->active_disable_times)) {
|
|
|
|
struct dst_entry *dst = sk_dst_get(sk);
|
|
|
|
|
|
|
|
if (dst && dst->dev && (dst->dev->flags & IFF_LOOPBACK))
|
|
|
|
atomic_set(&pernet->active_disable_times, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-09-09 22:09:22 +02:00
|
|
|
/* Check the number of retransmissions, and fallback to TCP if needed */
|
|
|
|
void mptcp_active_detect_blackhole(struct sock *ssk, bool expired)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
2025-02-21 16:44:03 +01:00
|
|
|
u8 timeouts, to_max;
|
|
|
|
struct net *net;
|
2024-09-09 22:09:22 +02:00
|
|
|
|
2025-02-21 16:44:03 +01:00
|
|
|
/* Only check MPTCP SYN ... */
|
|
|
|
if (likely(!sk_is_mptcp(ssk) || ssk->sk_state != TCP_SYN_SENT))
|
2024-09-09 22:09:22 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
subflow = mptcp_subflow_ctx(ssk);
|
|
|
|
|
2025-02-21 16:44:03 +01:00
|
|
|
/* ... + MP_CAPABLE */
|
|
|
|
if (!subflow->request_mptcp) {
|
|
|
|
/* Mark as blackhole iif the 1st non-MPTCP SYN is accepted */
|
|
|
|
subflow->mpc_drop = 0;
|
|
|
|
return;
|
|
|
|
}
|
2025-01-17 18:40:31 +01:00
|
|
|
|
2025-02-21 16:44:03 +01:00
|
|
|
net = sock_net(ssk);
|
|
|
|
timeouts = inet_csk(ssk)->icsk_retransmits;
|
|
|
|
to_max = mptcp_get_pernet(net)->syn_retrans_before_tcp_fallback;
|
2025-01-17 18:40:31 +01:00
|
|
|
|
2025-02-21 16:44:03 +01:00
|
|
|
if (timeouts == to_max || (timeouts < to_max && expired)) {
|
|
|
|
MPTCP_INC_STATS(net, MPTCP_MIB_MPCAPABLEACTIVEDROP);
|
|
|
|
subflow->mpc_drop = 1;
|
|
|
|
mptcp_subflow_early_fallback(mptcp_sk(subflow->conn), subflow);
|
2024-09-09 22:09:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-21 16:56:28 -08:00
|
|
|
static int __net_init mptcp_net_init(struct net *net)
|
|
|
|
{
|
|
|
|
struct mptcp_pernet *pernet = mptcp_get_pernet(net);
|
|
|
|
|
|
|
|
mptcp_pernet_set_defaults(pernet);
|
|
|
|
|
|
|
|
return mptcp_pernet_new_table(net, pernet);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Note: the callback will only be called per extra netns */
|
|
|
|
static void __net_exit mptcp_net_exit(struct net *net)
|
|
|
|
{
|
|
|
|
struct mptcp_pernet *pernet = mptcp_get_pernet(net);
|
|
|
|
|
|
|
|
mptcp_pernet_del_table(pernet);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations mptcp_pernet_ops = {
|
|
|
|
.init = mptcp_net_init,
|
|
|
|
.exit = mptcp_net_exit,
|
|
|
|
.id = &mptcp_pernet_id,
|
|
|
|
.size = sizeof(struct mptcp_pernet),
|
|
|
|
};
|
|
|
|
|
|
|
|
void __init mptcp_init(void)
|
|
|
|
{
|
2020-07-30 21:25:56 +02:00
|
|
|
mptcp_join_cookie_init();
|
2020-01-21 16:56:28 -08:00
|
|
|
mptcp_proto_init();
|
|
|
|
|
|
|
|
if (register_pernet_subsys(&mptcp_pernet_ops) < 0)
|
|
|
|
panic("Failed to register MPTCP pernet subsystem.\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
int __init mptcpv6_init(void)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = mptcp_proto_v6_init();
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif
|