History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Daniel Borkmann says: ==================== pull-request: bpf-next 2019-09-16 The following pull-request contains BPF updates for your *net-next* tree. The main changes are: 1) Now that initial BPF backend for gcc has been merged upstream, enable BPF kselftest suite for bpf-gcc. Also fix a BE issue with access to bpf_sysctl.file_pos, from Ilya. 2) Follow-up fix for link-vmlinux.sh to remove bash-specific extensions related to recent work on exposing BTF info through sysfs, from Andrii. 3) AF_XDP zero copy fixes for i40e and ixgbe driver which caused umem headroom to be added twice, from Ciara. 4) Refactoring work to convert sock opt tests into test_progs framework in BPF kselftests, from Stanislav. 5) Fix a general protection fault in dev_map_hash_update_elem(), from Toke. 6) Cleanup to use BPF_PROG_RUN() macro in KCM, from Sami. ====================

David S. Miller committed 7 years ago

Commit 28f2c362 parents 5f109d4 d895a0f21 files · +260 −322Browse files

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

Unified · Split

include/linux/filter.h+4−4
@@ -749,14 +749,14 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default) · 748 unmodified lines
749}749}
750 750
751static inline u8751static inline u8
752bpf_ctx_narrow_load_shift(u32 off, u32 size, u32 size_default)752bpf_ctx_narrow_access_offset(u32 off, u32 size, u32 size_default)
753{753{
754 u8 load_off = off & (size_default - 1);754 u8 access_off = off & (size_default - 1);
755 755
756#ifdef __LITTLE_ENDIAN756#ifdef __LITTLE_ENDIAN
757 return load_off * 8;757 return access_off;
758#else758#else
759 return (size_default - (load_off + size)) * 8;759 return size_default - (access_off + size);
760#endif760#endif
761}761}
762 762

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