diff options
| author |   Daniel Borkmann <daniel@iogearbox.net> | 2019-07-15 23:15:53 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2019-07-15 23:15:53 +0200 |
| commit | 6da193569cbe2127faa7a934a3c18fffe32c6041 (patch) | |
| tree | 19a9b4bec904d9838fbfdc8fa585632e0805da87 /include/linux | |
| parent | samples/bpf: build with -D__TARGET_ARCH_$(SRCARCH) (diff) | |
| parent | bpf: sync bpf.h to tools/ (diff) | |
Merge branch 'bpf-fix-wide-loads-sockaddr'
Stanislav Fomichev says:
====================
When fixing selftests by adding support for wide stores, Yonghong
reported that he had seen some examples where clang generates
single u64 loads for two adjacent u32s as well:
http://lore.kernel.org/netdev/a66c937f-94c0-eaf8-5b37-8587d66c0c62@fb.com
Fix this to support aligned u64 reads for some bpf_sock_addr fields
as well.
====================
Acked-by: Andrii Narkyiko <andriin@fb.com>
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/filter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 6d944369ca87..ff65d22cf336 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -747,7 +747,7 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default) return size <= size_default && (size & (size - 1)) == 0; } -#define bpf_ctx_wide_store_ok(off, size, type, field) \ +#define bpf_ctx_wide_access_ok(off, size, type, field) \ (size == sizeof(__u64) && \ off >= offsetof(type, field) && \ off + sizeof(__u64) <= offsetofend(type, field) && \ |