diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-06-07 20:06:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-07 20:06:25 -0400 |
| commit | ff2672874be0ee426b0555cc7c5e918414fa88a5 (patch) | |
| tree | 99a74834acb050f04fda9c2968b8da1c2c3e7a70 /include/uapi | |
| parent | bpfilter: fix OUTPUT_FORMAT (diff) | |
| parent | bpf, xdp: fix crash in xdp_umem_unaccount_pages (diff) | |
| download | linux-dev-ff2672874be0ee426b0555cc7c5e918414fa88a5.tar.xz linux-dev-ff2672874be0ee426b0555cc7c5e918414fa88a5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-06-08
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix in the BPF verifier to reject modified ctx pointers on helper
functions, from Daniel.
2) Fix in BPF kselftests for get_cgroup_id_user() helper to only
record the cgroup id for a provided pid in order to reduce test
failures from processes interferring with the test, from Yonghong.
3) Fix a crash in AF_XDP's mem accounting when the process owning
the sock has CAP_IPC_LOCK capabilities set, from Daniel.
4) Fix an issue for AF_XDP on 32 bit machines where XDP_UMEM_PGOFF_*_RING
defines need ULL suffixes and use loff_t type as they are otherwise
truncated, from Geert.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/if_xdp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/if_xdp.h b/include/uapi/linux/if_xdp.h index 1fa0e977ea8d..caed8b1614ff 100644 --- a/include/uapi/linux/if_xdp.h +++ b/include/uapi/linux/if_xdp.h @@ -63,8 +63,8 @@ struct xdp_statistics { /* Pgoff for mmaping the rings */ #define XDP_PGOFF_RX_RING 0 #define XDP_PGOFF_TX_RING 0x80000000 -#define XDP_UMEM_PGOFF_FILL_RING 0x100000000 -#define XDP_UMEM_PGOFF_COMPLETION_RING 0x180000000 +#define XDP_UMEM_PGOFF_FILL_RING 0x100000000ULL +#define XDP_UMEM_PGOFF_COMPLETION_RING 0x180000000ULL /* Rx/Tx descriptor */ struct xdp_desc { |