Skip to content

Commit 6963c50

Browse files
gdetalkuba-moo
authored andcommitted
mptcp: only allow set existing scheduler for net.mptcp.scheduler
The current behavior is to accept any strings as inputs, this results in an inconsistent result where an unexisting scheduler can be set: # sysctl -w net.mptcp.scheduler=notdefault net.mptcp.scheduler = notdefault This patch changes this behavior by checking for existing scheduler before accepting the input. Fixes: e3b2870 ("mptcp: add a new sysctl scheduler") Cc: [email protected] Signed-off-by: Gregory Detal <[email protected]> Reviewed-by: Matthieu Baerts (NGI0) <[email protected]> Tested-by: Geliang Tang <[email protected]> Reviewed-by: Mat Martineau <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://lore.kernel.org/r/20240506-upstream-net-20240506-mptcp-sched-exist-v1-1-2ed1529e521e@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 19e35f2 commit 6963c50

File tree

1 file changed

+38
-1
lines changed

1 file changed

+38
-1
lines changed

Diff for: net/mptcp/ctrl.c

+38-1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,43 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet)
9696
}
9797

9898
#ifdef CONFIG_SYSCTL
99+
static int mptcp_set_scheduler(const struct net *net, const char *name)
100+
{
101+
struct mptcp_pernet *pernet = mptcp_get_pernet(net);
102+
struct mptcp_sched_ops *sched;
103+
int ret = 0;
104+
105+
rcu_read_lock();
106+
sched = mptcp_sched_find(name);
107+
if (sched)
108+
strscpy(pernet->scheduler, name, MPTCP_SCHED_NAME_MAX);
109+
else
110+
ret = -ENOENT;
111+
rcu_read_unlock();
112+
113+
return ret;
114+
}
115+
116+
static int proc_scheduler(struct ctl_table *ctl, int write,
117+
void *buffer, size_t *lenp, loff_t *ppos)
118+
{
119+
const struct net *net = current->nsproxy->net_ns;
120+
char val[MPTCP_SCHED_NAME_MAX];
121+
struct ctl_table tbl = {
122+
.data = val,
123+
.maxlen = MPTCP_SCHED_NAME_MAX,
124+
};
125+
int ret;
126+
127+
strscpy(val, mptcp_get_scheduler(net), MPTCP_SCHED_NAME_MAX);
128+
129+
ret = proc_dostring(&tbl, write, buffer, lenp, ppos);
130+
if (write && ret == 0)
131+
ret = mptcp_set_scheduler(net, val);
132+
133+
return ret;
134+
}
135+
99136
static struct ctl_table mptcp_sysctl_table[] = {
100137
{
101138
.procname = "enabled",
@@ -148,7 +185,7 @@ static struct ctl_table mptcp_sysctl_table[] = {
148185
.procname = "scheduler",
149186
.maxlen = MPTCP_SCHED_NAME_MAX,
150187
.mode = 0644,
151-
.proc_handler = proc_dostring,
188+
.proc_handler = proc_scheduler,
152189
},
153190
{
154191
.procname = "close_timeout",

0 commit comments

Comments
 (0)