From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: [GIT] Networking Date: Sun, 10 Jun 2018 17:42:35 -0700 (PDT) Message-ID: <20180610.174235.953455611231708401.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: 8BIT Cc: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: torvalds@linux-foundation.org Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 1) For several bpfilter/UMH bugs, in particular make the UMH build not depend upon X86 specific Kconfig symbols. From Alexei Starovoitov. 2) Fix handling of modified context pointer in bpf verifier, from Daniel Borkmann. 3) Kill regression in ifdown/ifup sequences for hv_netvsc driver, from Dexuan Cui. 4) When the bonding primary member name changes, we have to re-evaluate the bond->force_primary setting, from Xiangning Yu. 5) Eliminate possible padding beyone end of SKB in cdc_ncm driver, from Bjørn Mork. 6) RX queue length reported for UDP sockets in procfs and socket diag are inaccurate, from Paolo Abeni. 7) Fix br_fdb_find_port() locking, from Petr Machata. 8) Limit sk_rcvlowat values properly in TCP, from Soheil Hassas Yeganeh. Please pull, thanks a lot! The following changes since commit 3036bc45364f98515a2c446d7fac2c34dcfbeff4: Merge tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (2018-06-07 12:34:37 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git for you to fetch changes up to 867f816badc01e6da655028810d468c9f935b37c: tcp: limit sk_rcvlowat by the maximum receive buffer (2018-06-10 14:12:50 -0700) ---------------------------------------------------------------- Alexei Starovoitov (3): umh: fix race condition bpfilter: fix OUTPUT_FORMAT bpfilter: fix race in pipe access Alvaro Gamez Machado (1): net: phy: dp83822: use BMCR_ANENABLE instead of BMSR_ANEGCAPABLE for DP83620 Bjørn Mork (1): cdc_ncm: avoid padding beyond end of skb Colin Ian King (1): net: aquantia: fix unsigned numvecs comparison with less than zero Cong Wang (1): socket: close race condition between sock_close() and sockfs_setattr() Corentin Labbe (1): net: stmmac: fix build failure due to missing COMMON_CLK dependency Daniel Borkmann (2): bpf: reject passing modified ctx to helper functions bpf, xdp: fix crash in xdp_umem_unaccount_pages David S. Miller (1): Merge git://git.kernel.org/.../bpf/bpf Davide Caratti (1): net/sched: act_simple: fix parsing of TCA_DEF_DATA Dexuan Cui (1): hv_netvsc: Fix a network regression after ifdown/ifup Geert Uytterhoeven (2): net: mscc: ocelot: Fix uninitialized error in ocelot_netdevice_event() xsk: Fix umem fill/completion queue mmap on 32-bit Pablo Neira Ayuso (1): netfilter: nf_tables: add NFT_LOGLEVEL_* enumeration and use it Paolo Abeni (1): udp: fix rx queue len reported by diag and proc interface Petr Machata (1): net: bridge: Fix locking in br_fdb_find_port() Soheil Hassas Yeganeh (1): tcp: limit sk_rcvlowat by the maximum receive buffer Sultan Alsawaf (1): ip_tunnel: Fix name string concatenate in __ip_tunnel_create() Willem de Bruijn (1): net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan Xiangning Yu (1): bonding: re-evaluate force_primary when the primary slave name changes Yonghong Song (1): tools/bpf: fix selftest get_cgroup_id_user YueHaibing (1): net: fddi: fix a possible null-ptr-deref arch/um/drivers/vector_transports.c | 3 ++- drivers/net/bonding/bond_options.c | 1 + drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 11 +++++------ drivers/net/ethernet/mscc/ocelot.c | 2 +- drivers/net/ethernet/stmicro/stmmac/Kconfig | 10 +++++----- drivers/net/fddi/skfp/skfddi.c | 55 ++++++++++++++++++++++++++++--------------------------- drivers/net/hyperv/netvsc_drv.c | 4 +++- drivers/net/phy/dp83848.c | 35 +++++++++++++++++++++++++++++------ drivers/net/tap.c | 5 ++++- drivers/net/tun.c | 3 ++- drivers/net/usb/cdc_ncm.c | 4 ++-- drivers/net/virtio_net.c | 3 ++- include/linux/virtio_net.h | 11 ++++------- include/net/transp_v6.h | 11 +++++++++-- include/net/udp.h | 5 +++++ include/uapi/linux/if_xdp.h | 4 ++-- include/uapi/linux/netfilter/nf_tables.h | 28 +++++++++++++++++++++++++--- kernel/bpf/verifier.c | 48 +++++++++++++++++++++++++++++++----------------- kernel/umh.c | 3 +-- net/bpfilter/Makefile | 2 +- net/bpfilter/bpfilter_kern.c | 10 +++++++--- net/bridge/br_fdb.c | 4 +++- net/ipv4/ip_tunnel.c | 4 ++-- net/ipv4/tcp.c | 12 +++++++----- net/ipv4/udp.c | 2 +- net/ipv4/udp_diag.c | 2 +- net/ipv6/datagram.c | 6 +++--- net/ipv6/udp.c | 3 ++- net/netfilter/nft_log.c | 10 +++++----- net/packet/af_packet.c | 4 ++-- net/sched/act_simple.c | 15 ++++++--------- net/socket.c | 18 +++++++++++++++--- net/xdp/xdp_umem.c | 6 ++++-- net/xdp/xsk.c | 2 +- tools/testing/selftests/bpf/get_cgroup_id_kern.c | 14 +++++++++++++- tools/testing/selftests/bpf/get_cgroup_id_user.c | 12 ++++++++++-- tools/testing/selftests/bpf/test_verifier.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 37 files changed, 301 insertions(+), 129 deletions(-)