bpf: cgroup: Fix optlen WARN_ON_ONCE toctou
Subsystems (3)
PATCH 1/2 bpf: cgroup: Fix optlen WARN_ON_ONCE toctou
A toctou issue in __cgroup_bpf_run_filter_getsockopt can trigger a WARN_ON_ONCE in a check of copy_from_user.*optlen is checked to be non-negative in the individual getsockopt functions beforehand. Changing *optlen in a race to a negative value will result in a copy_from_user(ctx.optval, optval, ctx.optlen) with ctx.optlen being a negative integer.
--- kernel/bpf/cgroup.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/bpf/cgroup.c +5 -0
@@ -1442,6 +1442,11 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, goto out; } +if (ctx.optlen <0 ) { + ret = -EFAULT ; + goto out; + } +if (copy_from_user (ctx.optval, optval,min (ctx.optlen, max_optlen)) !=0 ) { ret = -EFAULT ;
Signature · 1 line
2.29.2
PATCH 2/2 bpf: cgroup: Fix problematic bounds check
Since ctx.optlen is signed, a larger value than max_value could be passed, as it is later on used as unsigned, which causes a WARN_ON_ONCE in the copy_to_user.
--- kernel/bpf/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/cgroup.c +1 -1
@@ -1464,7 +1464,7 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, goto out; } -if (ctx.optlen > max_optlen) { +if (ctx.optlen > max_optlen || ctx.optlen <0 ) { ret = -EFAULT ; goto out; }
Signature · 1 line
2.29.2
Re: [PATCH 2/2] bpf: cgroup: Fix problematic bounds check
Quoted 25 lines · Loris Reiff
Since ctx.optlen is signed, a larger value than
max_valuecould be passed, as it is later on used as unsigned, which causes aWARN_ON_ONCEin thecopy_to_user.Fixes 0d01da6afc54 ("bpf: implement getsockopt and setsockopt hooks")Signed-off-by Loris Reiff <[email protected]>--- kernel/bpf/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/bpf/cgroup.c +1
-2@@ -1464,7 +1464,7 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, goto out; } -if (ctx.optlen > max_optlen) { +if (ctx.optlen > max_optlen || ctx.optlen <0 ) { ret = -EFAULT ; goto out; } --
Quoted 1 line
2.29.2
Thanks! I assume this is only an issue if the BPF program is written incorrectly.
Re: [PATCH 2/2] bpf: cgroup: Fix problematic bounds check
Excerpts from Stanislav Fomichev's message of January 22, 2021 18:04:
Quoted 2 lines
Thanks! I assume this is only an issue if the BPF program is written incorrectly.
Yes exactly.
Quoted 31 lines · Loris Reiff
A toctou issue in
__cgroup_bpf_run_filter_getsockoptcan trigger aWARN_ON_ONCEin a check ofcopy_from_user.*optlenis checked to be non-negative in the individual getsockopt functions beforehand. Changing*optlenin a race to a negative value will result in acopy_from_user(ctx.optval, optval, ctx.optlen)withctx.optlenbeing a negative integer.Fixes 0d01da6afc54 ("bpf: implement getsockopt and setsockopt hooks")Signed-off-by Loris Reiff <[email protected]>--- kernel/bpf/cgroup.c | 5 +++++ 1 file changed, 5 insertions(+)kernel/bpf/cgroup.c +5
-1@@ -1442,6 +1442,11 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, goto out; } +if (ctx.optlen <0 ) { + ret = -EFAULT ; + goto out; + } +if (copy_from_user (ctx.optval, optval,min (ctx.optlen, max_optlen)) !=0 ) { ret = -EFAULT ; --
Quoted 1 line
2.29.2
Good point, user's optlen can be concurrently changed after the kernel updated it.
This series was applied to bpf/bpf.git (refs/heads/master):
Hello:
This series was applied to bpf/bpf.git (refs/heads/master):
Quoted 8 lines · On Fri, 22 Jan 2021 17:42:31 +0100 you wrote:
A toctou issue in
__cgroup_bpf_run_filter_getsockoptcan trigger aWARN_ON_ONCEin a check ofcopy_from_user.*optlenis checked to be non-negative in the individual getsockopt functions beforehand. Changing*optlenin a race to a negative value will result in acopy_from_user(ctx.optval, optval, ctx.optlen)withctx.optlenbeing a negative integer.[...]
Here is the summary with links:
- [1/2] bpf: cgroup: Fix optlen WARN_ON_ONCE toctou
https://git.kernel.org/bpf/bpf/c/bb8b81e396f7 - [2/2] bpf: cgroup: Fix problematic bounds check https://git.kernel.org/bpf/bpf/c/f4a2da755a7e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html