• D
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf · 271b955e
    David S. Miller 提交于
    Daniel Borkmann says:
    
    ====================
    pull-request: bpf 2018-07-01
    
    The following pull-request contains BPF updates for your *net* tree.
    
    The main changes are:
    
    1) A bpf_fib_lookup() helper fix to change the API before freeze to
       return an encoding of the FIB lookup result and return the nexthop
       device index in the params struct (instead of device index as return
       code that we had before), from David.
    
    2) Various BPF JIT fixes to address syzkaller fallout, that is, do not
       reject progs when set_memory_*() fails since it could still be RO.
       Also arm32 JIT was not using bpf_jit_binary_lock_ro() API which was
       an issue, and a memory leak in s390 JIT found during review, from
       Daniel.
    
    3) Multiple fixes for sockmap/hash to address most of the syzkaller
       triggered bugs. Usage with IPv6 was crashing, a GPF in bpf_tcp_close(),
       a missing sock_map_release() routine to hook up to callbacks, and a
       fix for an omitted bucket lock in sock_close(), from John.
    
    4) Two bpftool fixes to remove duplicated error message on program load,
       and another one to close the libbpf object after program load. One
       additional fix for nfp driver's BPF offload to avoid stopping offload
       completely if replace of program failed, from Jakub.
    
    5) Couple of BPF selftest fixes that bail out in some of the test
       scripts if the user does not have the right privileges, from Jeffrin.
    
    6) Fixes in test_bpf for s390 when CONFIG_BPF_JIT_ALWAYS_ON is set
       where we need to set the flag that some of the test cases are expected
       to fail, from Kleber.
    
    7) Fix to detangle BPF_LIRC_MODE2 dependency from CONFIG_CGROUP_BPF
       since it has no relation to it and lirc2 users often have configs
       without cgroups enabled and thus would not be able to use it, from Sean.
    
    8) Fix a selftest failure in sockmap by removing a useless setrlimit()
       call that would set a too low limit where at the same time we are
       already including bpf_rlimit.h that does the job, from Yonghong.
    
    9) Fix BPF selftest config with missing missing NET_SCHED, from Anders.
    ====================
    Signed-off-by: NDavid S. Miller <davem@davemloft.net>
    271b955e
main.c 12.1 KB