Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8795ba8 authored by Yafang Shao's avatar Yafang Shao Committed by Greg Kroah-Hartman
Browse files

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: 8c4b4c7e ("bpf: Add setsockopt helper function to bpf")
Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarLawrence Brakmo <brakmo@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7e2b2e24

net/core/filter.c

+2 −0
Original line number Diff line number Diff line
@@ -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;