diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-01-11 12:51:49 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-11 12:51:49 -0800 |
| commit | e8b108b050e84b6d7497d2cd29fe7623d0a33ed6 (patch) | |
| tree | 3312df1c78318fd34accb112866e869cedf84635 /net/core | |
| parent | net: ethernet: mediatek: fix warning in phy_start_aneg (diff) | |
| parent | Merge branch 'bpf-fix-bitfield-printing' (diff) | |
| download | linux-dev-e8b108b050e84b6d7497d2cd29fe7623d0a33ed6.tar.xz linux-dev-e8b108b050e84b6d7497d2cd29fe7623d0a33ed6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2019-01-11
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix TCP-BPF support for correctly setting the initial window
via TCP_BPF_IW on an active TFO sender, from Yuchung.
2) Fix a panic in BPF's stack_map_get_build_id()'s ELF parsing on
32 bit archs caused by page_address() returning NULL, from Song.
3) Fix BTF pretty print in kernel and bpftool when bitfield member
offset is greater than 256. Also add test cases, from Yonghong.
4) Fix improper argument handling in xdp1 sample, from Ioana.
5) Install missing tcp_server.py and tcp_client.py files from
BPF selftests, from Anders.
6) Add test_libbpf to gitignore in libbpf and BPF selftests,
from Stanislav.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 447dd1bad31f..2b3b436ef545 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4203,7 +4203,7 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, /* Only some options are supported */ switch (optname) { case TCP_BPF_IW: - if (val <= 0 || tp->data_segs_out > 0) + if (val <= 0 || tp->data_segs_out > tp->syn_data) ret = -EINVAL; else tp->snd_cwnd = val; |