aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-09-02 15:53:38 -0700
committerDavid S. Miller <davem@davemloft.net>2018-09-02 15:53:38 -0700
commita80afe89d81af6b64bf2d9b3afef70dcf75df12b (patch)
treeb2c917465cd88aeff2aefcb30406dd271f5d2f0c /drivers/net/ethernet
parentnet/ipv6: Only update MTU metric if it set (diff)
parentbpf: avoid misuse of psock when TCP_ULP_BPF collides with another ULP (diff)
downloadlinux-dev-a80afe89d81af6b64bf2d9b3afef70dcf75df12b.tar.xz
linux-dev-a80afe89d81af6b64bf2d9b3afef70dcf75df12b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says: ==================== pull-request: bpf 2018-09-02 The following pull-request contains BPF updates for your *net* tree. The main changes are: 1) Fix one remaining buggy offset override in sockmap's bpf_msg_pull_data() when linearizing multiple scatterlist elements, from Tushar. 2) Fix BPF sockmap's misuse of ULP when a collision with another ULP is found on map update where it would release existing ULP. syzbot found and triggered this couple of times now, fix from John. 3) Add missing xskmap type to bpftool so it will properly show the type on map dump, from Prashant. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions