From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: [GIT] Networking Date: Sat, 11 Nov 2017 23:14:34 +0900 (KST) Message-ID: <20171111.231434.1907654953220387318.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) Use after free in vlan, from Cong Wang. 2) Handle NAPI poll with a zero budget properly in mlx5 driver, from Saeed Mahameed. 3) If DMA mapping fails in mlx5 driver, NULL out page, from Inbar Karmy. 4) Handle overrun in RX FIFO of sun4i CAN driver, from Gerhard Bertelsmann. 5) Missing return in mdb and vlan prepare phase of DSA layer, from Vivien Didelot. Please pull, thanks a lot! The following changes since commit 3fefc31843cfe2b5f072efe11ed9ccaf6a7a5092: Merge tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2017-11-09 11:16:28 -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 92d28828179675176cd90293699b394b6d22ce68: Merge tag 'linux-can-fixes-for-4.14-20171110' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can (2017-11-11 21:52:01 +0900) ---------------------------------------------------------------- Cong Wang (1): vlan: fix a use-after-free in vlan_device_event() David S. Miller (2): Merge tag 'mlx5-fixes-2017-11-08' of git://git.kernel.org/.../saeed/linux Merge tag 'linux-can-fixes-for-4.14-20171110' of git://git.kernel.org/.../mkl/linux-can Eric Dumazet (1): tcp: gso: avoid refcount_t warning from tcp_gso_segment() Eugenia Emantayev (1): net/mlx5e: Increase Striding RQ minimum size limit to 4 multi-packet WQEs Gerhard Bertelsmann (1): can: sun4i: handle overrun in RX FIFO Huy Nguyen (2): net/mlx5: Loop over temp list to release delay events net/mlx5: Cancel health poll before sending panic teardown command Håkon Bugge (1): rds: ib: Fix NULL pointer dereference in debug code Inbar Karmy (1): net/mlx5e: Set page to null in case dma mapping fails Marek Vasut (1): can: ifi: Fix transmitter delay calculation Richard Schütz (1): can: c_can: don't indicate triple sampling support for D_CAN Saeed Mahameed (1): net/mlx5e: Fix napi poll with zero budget Stephane Grosjean (1): can: peak: Add support for new PCIe/M2 CAN FD interfaces Vivien Didelot (2): net: dsa: return after mdb prepare phase net: dsa: return after vlan prepare phase Yuchung Cheng (1): tcp: fix tcp_fastretrans_alert warning drivers/net/can/c_can/c_can_pci.c | 1 - drivers/net/can/c_can/c_can_platform.c | 1 - drivers/net/can/ifi_canfd/ifi_canfd.c | 6 +++--- drivers/net/can/peak_canfd/peak_pciefd_main.c | 14 ++++++++++++-- drivers/net/can/sun4i_can.c | 12 ++++++++++-- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 12 +++++------- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 10 ++++++---- drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 +++++++ net/8021q/vlan.c | 6 +++--- net/dsa/switch.c | 4 ++++ net/ipv4/tcp_input.c | 3 +-- net/ipv4/tcp_offload.c | 12 ++++++++++-- net/rds/ib_recv.c | 10 +++++----- 15 files changed, 68 insertions(+), 34 deletions(-)