From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: [GIT] Networking Date: Thu, 28 Dec 2017 21:05:41 -0500 (EST) Message-ID: <20171228.210541.606771625395703069.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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) IPv6 gre tunnels end up with different default features enabled depending upon whether netlink or ioctls are used to bring them up. Fix from Alexey Kodanev. 2) Fix read past end of user control message in RDS< from Avinash Repaka. 3) Missing RCU barrier in mini qdisc code, from Cong Wang. 4) Missing policy put when reusing per-cpu route entries, from Florian Westphal. 5) Handle nested PCI errors properly in bnx2x driver, from Guilherme G. Piccoli. 6) Run nested transport mode IPSEC packets via tasklet, from Herbert Xu. 7) Fix handling poll() for stream sockets in tipc, from Parthasarathy Bhuvaragan. 8) Fix two stack-out-of-bounds issues in IPSEC, from Steffen Klassert. 9) Another zerocopy ubuf handling fix, from Willem de Bruijn. Please pull, thanks a lot! The following changes since commit ead68f216110170ec729e2c4dec0aad6d38259d7: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2017-12-21 15:57:30 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net for you to fetch changes up to d5902f6d1fbdb27e6a33c418063466d94be9dfa2: Merge branch 'strparser-Fix-lockdep-issue' (2017-12-28 14:28:23 -0500) ---------------------------------------------------------------- Alexey Kodanev (1): ip6_gre: fix device features for ioctl setup Antony Antony (1): xfrm: fix xfrm_do_migrate() with AEAD e.g(AES-GCM) Avinash Repaka (1): RDS: Check cmsg_len before dereferencing CMSG_DATA Aviv Heller (1): xfrm: Fix xfrm_input() to verify state is valid when (encap_type < 0) Cong Wang (2): xfrm: check id proto in validate_tmpl() net_sched: fix a missing rcu barrier in mini_qdisc_pair_swap() Daniel Borkmann (1): Merge branch 'bpf-bpftool-various-fixes' David S. Miller (4): Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge branch 'tg3-fixes' Merge git://git.kernel.org/.../bpf/bpf Merge branch 'strparser-Fix-lockdep-issue' Florian Westphal (1): xfrm: put policies when reusing pcpu xdst entry Fugang Duan (1): net: fec: unmap the xmit buffer that are not transferred by DMA Grygorii Strashko (1): net: phy: micrel: ksz9031: reconfigure autoneg after phy autoneg workaround Guilherme G. Piccoli (1): bnx2x: Improve reliability in case of nested PCI errors Herbert Xu (1): xfrm: Reinject transport-mode packets through tasklet Jakub Kicinski (2): tools: bpftool: maps: close json array on error paths of show tools: bpftool: protect against races with disappearing objects Jiri Pirko (1): net: sched: fix possible null pointer deref in tcf_block_put Jon Maloy (2): tipc: base group replicast ack counter on number of actual receivers tipc: fix memory leak of group member when peer node is lost Mat Martineau (1): tcp: Avoid preprocessor directives in tracepoint macro args Michal Kubecek (1): xfrm: fix XFRMA_OUTPUT_MARK policy entry Parthasarathy Bhuvaragan (1): tipc: fix hanging poll() for stream sockets Quentin Monnet (1): selftests/bpf: fix Makefile for passing LLC to the command line Russell King (2): phylink: ensure the PHY interface mode is appropriately set phylink: ensure AN is enabled Siva Reddy Kallam (3): tg3: Update copyright tg3: Add workaround to restrict 5762 MRRS to 2048 tg3: Enable PHY reset in MTU change path for 5720 Steffen Klassert (2): xfrm: Fix stack-out-of-bounds read on socket policy lookup. xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies. Tom Herbert (2): sock: Add sock_owned_by_user_nocheck strparser: Call sock_owned_by_user_nocheck Tommi Rantala (2): tipc: error path leak fixes in tipc_enable_bearer() tipc: fix tipc_mon_delete() oops in tipc_enable_bearer() error path Tonghao Zhang (1): sctp: Replace use of sockets_allocated with specified macro. Willem de Bruijn (1): skbuff: in skb_copy_ubufs unclone before releasing zerocopy drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 14 +++++++++- drivers/net/ethernet/broadcom/tg3.c | 19 +++++++++++-- drivers/net/ethernet/broadcom/tg3.h | 7 ++++- drivers/net/ethernet/freescale/fec_main.c | 6 ++++ drivers/net/phy/micrel.c | 1 + drivers/net/phy/phylink.c | 2 ++ include/net/sock.h | 5 ++++ include/net/xfrm.h | 3 ++ include/trace/events/tcp.h | 97 +++++++++++++++++++++++++---------------------------------------- net/core/skbuff.c | 6 ++-- net/ipv4/xfrm4_input.c | 12 +++++++- net/ipv6/ip6_gre.c | 57 +++++++++++++++++++++----------------- net/ipv6/xfrm6_input.c | 10 ++++++- net/rds/send.c | 3 ++ net/sched/cls_api.c | 2 ++ net/sched/sch_generic.c | 4 ++- net/sctp/socket.c | 4 +-- net/strparser/strparser.c | 2 +- net/tipc/bearer.c | 5 +++- net/tipc/group.c | 31 ++++++++++++++------- net/tipc/monitor.c | 6 +++- net/tipc/socket.c | 2 +- net/xfrm/xfrm_input.c | 69 +++++++++++++++++++++++++++++++++++++++++++++- net/xfrm/xfrm_policy.c | 9 +++++- net/xfrm/xfrm_state.c | 1 + net/xfrm/xfrm_user.c | 26 +++++++++++++++++- tools/bpf/bpftool/map.c | 8 ++++-- tools/bpf/bpftool/prog.c | 2 ++ tools/testing/selftests/bpf/Makefile | 2 +- 30 files changed, 298 insertions(+), 121 deletions(-)