| Message ID | 1548218239-31223-1-git-send-email-laoar.shao@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [v2,bpf] bpf: sock recvbuff must be limited by rmem_max in bpf_setsockopt() | expand |
On 01/23/2019 05:37 AM, Yafang Shao wrote: > 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") > Acked-by: Martin KaFai Lau <kafai@fb.com> > Acked-by: Lawrence Brakmo <brakmo@fb.com> > Signed-off-by: Yafang Shao <laoar.shao@gmail.com> Applied, thanks!
diff --git a/net/core/filter.c b/net/core/filter.c index 7559d68..7a54dc1 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4112,10 +4112,12 @@ static unsigned long bpf_xdp_copy(void *dst_buff, const void *src_buff, /* 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;
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") Acked-by: Martin KaFai Lau <kafai@fb.com> Acked-by: Lawrence Brakmo <brakmo@fb.com> Signed-off-by: Yafang Shao <laoar.shao@gmail.com> --- net/core/filter.c | 2 ++ 1 file changed, 2 insertions(+)