diff options
| author | Yafang Shao | 2019-01-23 05:37:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-03-13 22:02:34 +0100 |
| commit | a8795ba8995a164f32c154114d1f6a0ee9bd4f8b (patch) | |
| tree | 06179e92ab1d634a9c14344d735dbd18e1564803 | |
| parent | bpftool: fix percpu maps updating (diff) | |
| download | kernel-qcow2-linux-a8795ba8995a164f32c154114d1f6a0ee9bd4f8b.tar.gz kernel-qcow2-linux-a8795ba8995a164f32c154114d1f6a0ee9bd4f8b.tar.xz kernel-qcow2-linux-a8795ba8995a164f32c154114d1f6a0ee9bd4f8b.zip | |
bpf: sock recvbuff must be limited by rmem_max in bpf_setsockopt()
[ Upstream commit c9e4576743eeda8d24dedc164d65b78877f9a98c ]
When sock recvbuff is set by bpf_setsockopt(), the value must by
limited by rmem_max. It is the same with sendbuff.
Fixes: 8c4b4c7e9ff0 ("bpf: Add setsockopt helper function to bpf")
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Lawrence Brakmo <brakmo@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/core/filter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index fb0080e84bd4..bed9061102f4 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3909,10 +3909,12 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, /* Only some socketops are supported */ switch (optname) { case SO_RCVBUF: + val = min_t(u32, val, sysctl_rmem_max); sk->sk_userlocks |= SOCK_RCVBUF_LOCK; sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF); break; case SO_SNDBUF: + val = min_t(u32, val, sysctl_wmem_max); sk->sk_userlocks |= SOCK_SNDBUF_LOCK; sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF); break; |