diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-16 03:28:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-16 03:28:44 +0200 |
| commit | c7d5ec26ea4adf450d9ab2b794e7735761a93af1 (patch) | |
| tree | a2c0e405c6cd4c90dcd3eda665e1488a98564341 /include/uapi | |
| parent | tcp: do not recycle cloned skbs (diff) | |
| parent | bpf, tcp: correctly handle DONT_WAIT flags and timeo == 0 (diff) | |
| download | linux-c7d5ec26ea4adf450d9ab2b794e7735761a93af1.tar.xz linux-c7d5ec26ea4adf450d9ab2b794e7735761a93af1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2019-05-16
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix a use after free in __dev_map_entry_free(), from Eric.
2) Several sockmap related bug fixes: a splat in strparser if
it was never initialized, remove duplicate ingress msg list
purging which can race, fix msg->sg.size accounting upon
skb to msg conversion, and last but not least fix a timeout
bug in tcp_bpf_wait_data(), from John.
3) Fix LRU map to avoid messing with eviction heuristics upon
syscall lookup, e.g. map walks from user space side will
then lead to eviction of just recently created entries on
updates as it would mark all map entries, from Daniel.
4) Don't bail out when libbpf feature probing fails. Also
various smaller fixes to flow_dissector test, from Stanislav.
5) Fix missing brackets for BTF_INT_OFFSET() in UAPI, from Gary.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/btf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h index 9310652ca4f9..63ae4a39e58b 100644 --- a/include/uapi/linux/btf.h +++ b/include/uapi/linux/btf.h @@ -83,7 +83,7 @@ struct btf_type { * is the 32 bits arrangement: */ #define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24) -#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16) +#define BTF_INT_OFFSET(VAL) (((VAL) & 0x00ff0000) >> 16) #define BTF_INT_BITS(VAL) ((VAL) & 0x000000ff) /* Attributes stored in the BTF_INT_ENCODING */ |