mbox series

[GIT] Networking

Message ID 20181221.124225.1063250530021518943.davem@davemloft.net
State Accepted, archived
Delegated to: David Miller
Headers show
Series [GIT] Networking | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git

Message

David Miller Dec. 21, 2018, 8:42 p.m. UTC
Some more bug fixes have trickled in, we have:

1) Local MAC entries properly in mscc driver, from Allan W. Nielsen.

2) Eric Dumazet found some more of the typical "pskb_may_pull() -->
   oops forgot to reload the header pointer" bugs in ipv6 tunnel
   handling.

3) Bad SKB socket pointer in ipv6 fragmentation handling, from Herbert
   Xu.

4) Overflow fix in sk_msg_clone(), from Vakul Garg.

5) Validate address lengths in AF_PACKET, from Willem de Bruijn.

Please pull, thanks a lot!

The following changes since commit 1d51b4b1d3f2db0d6d144175e31a84e472fbd99a:

  Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k (2018-12-20 07:35:16 -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 d667044f49513d55fcfefe4fa8f8d96091782901:

  qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup (2018-12-21 10:58:45 -0800)

----------------------------------------------------------------
Allan W. Nielsen (1):
      mscc: Configured MAC entries should be locked.

Daniele Palmas (1):
      qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup

Eric Dumazet (2):
      tcp: fix a race in inet_diag_dump_icsk()
      ipv6: tunnels: fix two use-after-free

Ganesh Goudar (1):
      MAINTAINERS: update cxgb4 and cxgb3 maintainer

Herbert Xu (1):
      ipv6: frags: Fix bogus skb->sk in reassembled packets

Jörgen Storvist (1):
      qmi_wwan: Add support for Fibocom NL678 series

Kangjie Lu (1):
      net: netxen: fix a missing check and an uninitialized use

Vakul Garg (2):
      Prevent overflow of sk_msg in sk_msg_clone()
      tls: Do not call sk_memcopy_from_iter with zero length

Willem de Bruijn (1):
      packet: validate address length

 MAINTAINERS                                          |  4 ++--
 drivers/net/ethernet/mscc/ocelot.c                   |  2 +-
 drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c |  3 ++-
 drivers/net/usb/qmi_wwan.c                           | 16 +++++++++-------
 net/core/skmsg.c                                     |  3 +++
 net/ipv4/inet_diag.c                                 |  4 +++-
 net/ipv6/ip6_tunnel.c                                |  1 +
 net/ipv6/ip6_vti.c                                   |  1 +
 net/ipv6/reassembly.c                                |  1 +
 net/packet/af_packet.c                               |  4 ++++
 net/tls/tls_sw.c                                     | 10 ++++++----
 11 files changed, 33 insertions(+), 16 deletions(-)

Comments

pr-tracker-bot@kernel.org Dec. 21, 2018, 10:30 p.m. UTC | #1
The pull request you sent on Fri, 21 Dec 2018 12:42:25 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/87935eee57705e9b6df506c5df8b92d6a0b77a51

Thank you!