From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933367AbeAXXXq (ORCPT ); Wed, 24 Jan 2018 18:23:46 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:51988 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932929AbeAXXXp (ORCPT ); Wed, 24 Jan 2018 18:23:45 -0500 Date: Wed, 24 Jan 2018 18:23:43 -0500 (EST) Message-Id: <20180124.182343.1406227276429644498.davem@davemloft.net> To: torvalds@linux-foundation.org CC: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT] Networking From: David Miller X-Mailer: Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1) Avoid negative netdev refcount in error flow of xfrm state add, from Aviad Yehezkel. 2) Fix tcpdump decoding of IPSEC decap'd frames by filling in the ethernet header protocol field in xfrm{4,6}_mode_tunnel_input(). From Yossi Kuperman. 3) Fix a syzbot triggered skb_under_panic in pppoe having to do with failing to allocate an appropriate amount of headroom. From Guillaume Nault. 4) Fix memory leak in vmxnet3 driver, from Neil Horman. 5) Cure out-of-bounds packet memory access in em_nbyte EMATCH module, from Wolfgang Bumiller. 6) Restrict what kinds of sockets can be bound to the KCM multiplexer and also disallow when another layer has attached to the socket and made use of sk_user_data. From Tom Herbert. 7) Fix use before init of IOTLB in vhost code, from Jason Wang. 8) Correct STACR register write bit definition in IBM emac driver, from Ivan Mikhaylov. Please pull, thanks a lot. The following changes since commit a84a8ab94ed5cb65a1355fe9e8d1d55283375808: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2018-01-23 08:52:55 -0800) 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 624ca9c33c8a853a4a589836e310d776620f4ab9: net/ibm/emac: wrong bit is used for STA control register write (2018-01-24 18:10:57 -0500) ---------------------------------------------------------------- Aviad Yehezkel (1): xfrm: fix error flow in case of add state fails Ben Hutchings (1): ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABEL David S. Miller (3): Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge branch 'kcm-fix-two-syzcaller-issues' Merge branch 'qed-rdma-bug-fixes' Guillaume Nault (1): pppoe: take ->needed_headroom of lower device into account on xmit Gustavo A. R. Silva (1): xfrm: fix boolean assignment in xfrm_get_type_offload Ivan Mikhaylov (2): net/ibm/emac: add 8192 rx/tx fifo size net/ibm/emac: wrong bit is used for STA control register write Jakub Kicinski (1): i40e: flower: check if TC offload is enabled on a netdev Jason Wang (2): vhost: use mutex_lock_nested() in vhost_dev_lock_vqs() vhost: do not try to access device IOTLB when not initialized Michal Kalderon (2): qed: Remove reserveration of dpi for kernel qed: Free reserved MR tid Neil Horman (1): vmxnet3: repair memory leak Tom Herbert (2): kcm: Only allow TCP sockets to be attached to a KCM mux kcm: Check if sk_user_data already set in kcm_attach Wolfgang Bumiller (2): net: sched: em_nbyte: don't add the data offset twice net: sched: fix TCF_LAYER_LINK case in tcf_get_base_ptr Yossi Kuperman (2): xfrm: Add SA to hardware at the end of xfrm_state_construct() xfrm: Fix eth_hdr(skb)->h_proto to reflect inner IP version Yuval Mintz (1): mlxsw: spectrum_router: Don't log an error on missing neighbor drivers/net/ethernet/ibm/emac/core.c | 6 ++++++ drivers/net/ethernet/ibm/emac/emac.h | 4 +++- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++ drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 10 ++-------- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 31 +++++++++++++++++-------------- drivers/net/ppp/pppoe.c | 11 ++++++----- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/vhost/vhost.c | 6 +++++- include/net/ipv6.h | 1 + include/net/pkt_cls.h | 2 +- net/ipv4/xfrm4_mode_tunnel.c | 1 + net/ipv6/ip6_output.c | 2 +- net/ipv6/ipv6_sockglue.c | 2 +- net/ipv6/xfrm6_mode_tunnel.c | 1 + net/kcm/kcmsock.c | 25 +++++++++++++++++++++---- net/sched/em_nbyte.c | 2 +- net/xfrm/xfrm_device.c | 1 + net/xfrm/xfrm_state.c | 12 ++++++++---- net/xfrm/xfrm_user.c | 18 +++++++++++------- 19 files changed, 90 insertions(+), 49 deletions(-)