]> git.baikalelectronics.ru Git - kernel.git/commit
bpf: Don't EFAULT for getsockopt with optval=NULL
authorStanislav Fomichev <sdf@google.com>
Tue, 18 Apr 2023 22:53:38 +0000 (15:53 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:35:44 +0000 (11:35 +0200)
commit686a8fefe7abb447f9201443dd73ac79696adad3
treecfeb01df1c2bc5284d5fa322e7e9d3de193ace76
parent7c7005deb197787e73227d400ab6afbec19403d5
bpf: Don't EFAULT for getsockopt with optval=NULL

[ Upstream commit 00e74ae0863827d944e36e56a4ce1e77e50edb91 ]

Some socket options do getsockopt with optval=NULL to estimate the size
of the final buffer (which is returned via optlen). This breaks BPF
getsockopt assumptions about permitted optval buffer size. Let's enforce
these assumptions only when non-NULL optval is provided.

Fixes: 8dd56bd54e56 ("bpf: implement getsockopt and setsockopt hooks")
Reported-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/ZD7Js4fj5YyI2oLd@google.com/T/#mb68daf700f87a9244a15d01d00c3f0e5b08f49f7
Link: https://lore.kernel.org/bpf/20230418225343.553806-2-sdf@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/bpf/cgroup.c