From: Raman Shukhau <ramasha@meta.com>
To: <bpf@vger.kernel.org>, <ast@kernel.org>, <andrii@kernel.org>,
<daniel@iogearbox.net>
Cc: Raman Shukhau <ramasha@meta.com>
Subject: [PATCH v2 bpf-next 2/3] net: Improvement for bpf_sysctl_set_new_value
Date: Mon, 20 May 2024 02:14:23 -0700 [thread overview]
Message-ID: <20240520091424.2427762-3-ramasha@meta.com> (raw)
In-Reply-To: <20240520091424.2427762-1-ramasha@meta.com>
When bpf_sysctl_set_new_value is called in cgroup/sysctl handler, updated
"new_len" is provided back to proc_sys_call_handler. But
proc_sys_call_handler expects this value NOT to include \0 symbol, e.g.
if user do:
open("/proc/sys/net/ipv4/ip_local_reserved_ports", ...)
write(fd, "11111", sizeof("22222"))
or
echo -n "11111" > /proc/sys/net/ipv4/ip_local_reserved_ports
or
sysctl -w net.ipv4.ip_local_reserved_ports=11111
proc_sys_call_handler receives count equal to `5`. if BPF handler code
doesn't account for that, new value will be rejected by
proc_sys_call_handler with EINVAL error.
To make behavior consistent for bpf_sysctl_set_new_value, this change
adjust `new_len` with `-1`, if `\0` passed as last character.
Alternatively, using `sizeof("11111") - 1` in BPF handler should work,
but it might not be obvious and spark confusion.
Signed-off-by: Raman Shukhau <ramasha@meta.com>
---
kernel/bpf/cgroup.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index bfc36e7ca6f6..23736aed1b53 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -1742,7 +1742,10 @@ int __cgroup_bpf_run_filter_sysctl(struct ctl_table_header *head,
if (ret == 0 && ctx.new_updated) {
kfree(*buf);
*buf = ctx.new_val;
- *pcount = ctx.new_len;
+ if (!(*buf)[ctx.new_len])
+ *pcount = ctx.new_len - 1;
+ else
+ *pcount = ctx.new_len;
} else {
kfree(ctx.new_val);
}
--
2.43.0
next prev parent reply other threads:[~2024-05-20 9:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-20 9:14 [PATCH v2 bpf-next 0/3] Fix and improvement for bpf_sysctl_set_new_value Raman Shukhau
2024-05-20 9:14 ` [PATCH v2 bpf-next 1/3] net: Fix " Raman Shukhau
2024-05-20 9:14 ` Raman Shukhau [this message]
2024-05-20 9:14 ` [PATCH v2 bpf-next 3/3] net: new cgrp_sysctl test suite Raman Shukhau
2024-05-20 14:59 ` [PATCH v2 bpf-next 0/3] Fix and improvement for bpf_sysctl_set_new_value Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240520091424.2427762-3-ramasha@meta.com \
--to=ramasha@meta.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox