History

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. ====================

David S. Miller committed 7 years ago

Commit c7d5ec22 parents 858f501 5fa2ca713 files · +321 −35Browse files

Showing the changes to include/uapi/linux (1 of 13 files). Show all

Unified · Split

include/uapi/linux/btf.h+1−1
@@ -83,7 +83,7 @@ struct btf_type { · 82 unmodified lines
8383 * is the 32 bits arrangement:
8484 */
8585 #define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
86−#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
86+#define BTF_INT_OFFSET(VAL) (((VAL) & 0x00ff0000) >> 16)
8787 #define BTF_INT_BITS(VAL) ((VAL) & 0x000000ff)
8888
8989 /* Attributes stored in the BTF_INT_ENCODING */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t