Skip to content
  • Linus Torvalds's avatar
    5fa6a683
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5fa6a683
    Linus Torvalds authored
    Pull networking fixes from David Miller:
     "It looks like a sizeble collection but this is nearly 3 weeks of bug
      fixing while you were away.
    
       1) Fix crashes over IPSEC tunnels with NAT, the latter can reroute
          the packet through a non-IPSEC protected path and the code has to
          be able to handle SKBs attached to routes lacking an attached xfrm
          state.  From Steffen Klassert.
    
       2) Fix OOPSs in ipv4 and ipv6 ipsec layers for unsupported
          sub-protocols, also from Steffen Klassert.
    
       3) Set local_df on fragmented netfilter skbs otherwise we won't be
          able to forward successfully, from Florian Westphal.
    
       4) cdc_mbim ipv6 neighbour code does __vlan_find_dev_deep without
          holding RCU lock, from Bjorn Mork.
    
       5) local_df test in ip_may_fragment is inverted, from Florian
          Westphal.
    
       6) jme driver doesn't check for DMA mapping failures, from Neil
          Horman.
    
       7) qlogic driver doesn't calculate number of TX queues properly, from
          Shahed Shaikh.
    
       8) fib_info_cnt can drift irreversibly positive if we fail to
          allocate the fi->fib_metrics array, from Sergey Popovich.
    
       9) Fix use after free in ip6_route_me_harder(), also from Sergey
          Popovich.
    
      10) When SYSCTL is disabled, we don't handle local_port_range and
          ping_group_range defaults properly at all, from Cong Wang.
    
      11) Unaccelerated VLAN tagged frames improperly handled by cdc_mbim
          driver, fix from Bjorn Mork.
    
      12) cassini driver needs nested lock annotations for TX locking, from
          Emil Goode.
    
      13) On init error ipv6 VTI driver can unregister pernet ops twice,
          oops.  Fix from Mahtias Krause.
    
      14) If macvlan device is down, don't propagate IFF_ALLMULTI changes,
          from Peter Christensen.
    
      15) Missing NULL pointer check while parsing netlink config options in
          ip6_tnl_validate().  From Susant Sahani.
    
      16) Fix handling of neighbour entries during ipv6 router reachability
          probing, from Duan Jiong.
    
      17) x86 and s390 JIT address randomization has some address
          calculation bugs leading to crashes, from Alexei Starovoitov and
          Heiko Carstens.
    
      18) Clear up those uglies with nop patching and net_get_random_once(),
          from Hannes Frederic Sowa.
    
      19) Option length miscalculated in ip6_append_data(), fix also from
          Hannes Frederic Sowa.
    
      20) A while ago we fixed a race during device unregistry when a
          namespace went down, turns out there is a second place that needs
          similar protection.  From Cong Wang.
    
      21) In the new Altera TSE driver multicast filtering isn't working,
          disable it and just use promisc mode until the cause is found.
          From Vince Bridgers.
    
      22) When we disable router enabling in ipv6 we have to flush the
          cached routes explicitly, from Duan Jiong.
    
      23) NBMA tunnels should not cache routes on the tunnel object because
          the key is variable, from Timo Teräs.
    
      24) With stacked devices GRO information in skb->cb[] can be not setup
          properly, make sure it is in all code paths.  From Eric Dumazet.
    
      25) Really fix stacked vlan locking, multiple levels of nesting with
          intervening non-vlan devices are possible.  From Vlad Yasevich.
    
      26) Fallback ipip tunnel device's mtu is not setup properly, from
          Steffen Klassert.
    
      27) The packet scheduler's tcindex filter can crash because we
          structure copy objects with list_head's inside, oops.  From Cong
          Wang.
    
      28) Fix CHECKSUM_COMPLETE handling for ipv6 GRE tunnels, from Eric
          Dumazet.
    
      29) In some configurations 'itag' in __mkroute_input() can end up
          being used uninitialized because of how fib_validate_source()
          works.  Fix it by explitly initializing itag to zero like all the
          other fib_validate_source() callers do, from Li RongQing"
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
      batman: fix a bogus warning from batadv_is_on_batman_iface()
      ipv4: initialise the itag variable in __mkroute_input
      bonding: Send ALB learning packets using the right source
      bonding: Don't assume 802.1Q when sending alb learning packets.
      net: doc: Update references to skb->rxhash
      stmmac: Remove unbalanced clk_disable call
      ipv6: gro: fix CHECKSUM_COMPLETE support
      net_sched: fix an oops in tcindex filter
      can: peak_pci: prevent use after free at netdev removal
      ip_tunnel: Initialize the fallback device properly
      vlan: Fix build error wth vlan_get_encap_level()
      can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option
      MAINTAINERS: Pravin Shelar is Open vSwitch maintainer.
      bnx2x: Convert return 0 to return rc
      bonding: Fix alb mode to only use first level vlans.
      bonding: Fix stacked device detection in arp monitoring
      macvlan: Fix lockdep warnings with stacked macvlan devices
      vlan: Fix lockdep warning with stacked vlan devices.
      net: Allow for more then a single subclass for netif_addr_lock
      net: Find the nesting level of a given device by type.
      ...
    5fa6a683
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
    Linus Torvalds authored
    Pull networking fixes from David Miller:
     "It looks like a sizeble collection but this is nearly 3 weeks of bug
      fixing while you were away.
    
       1) Fix crashes over IPSEC tunnels with NAT, the latter can reroute
          the packet through a non-IPSEC protected path and the code has to
          be able to handle SKBs attached to routes lacking an attached xfrm
          state.  From Steffen Klassert.
    
       2) Fix OOPSs in ipv4 and ipv6 ipsec layers for unsupported
          sub-protocols, also from Steffen Klassert.
    
       3) Set local_df on fragmented netfilter skbs otherwise we won't be
          able to forward successfully, from Florian Westphal.
    
       4) cdc_mbim ipv6 neighbour code does __vlan_find_dev_deep without
          holding RCU lock, from Bjorn Mork.
    
       5) local_df test in ip_may_fragment is inverted, from Florian
          Westphal.
    
       6) jme driver doesn't check for DMA mapping failures, from Neil
          Horman.
    
       7) qlogic driver doesn't calculate number of TX queues properly, from
          Shahed Shaikh.
    
       8) fib_info_cnt can drift irreversibly positive if we fail to
          allocate the fi->fib_metrics array, from Sergey Popovich.
    
       9) Fix use after free in ip6_route_me_harder(), also from Sergey
          Popovich.
    
      10) When SYSCTL is disabled, we don't handle local_port_range and
          ping_group_range defaults properly at all, from Cong Wang.
    
      11) Unaccelerated VLAN tagged frames improperly handled by cdc_mbim
          driver, fix from Bjorn Mork.
    
      12) cassini driver needs nested lock annotations for TX locking, from
          Emil Goode.
    
      13) On init error ipv6 VTI driver can unregister pernet ops twice,
          oops.  Fix from Mahtias Krause.
    
      14) If macvlan device is down, don't propagate IFF_ALLMULTI changes,
          from Peter Christensen.
    
      15) Missing NULL pointer check while parsing netlink config options in
          ip6_tnl_validate().  From Susant Sahani.
    
      16) Fix handling of neighbour entries during ipv6 router reachability
          probing, from Duan Jiong.
    
      17) x86 and s390 JIT address randomization has some address
          calculation bugs leading to crashes, from Alexei Starovoitov and
          Heiko Carstens.
    
      18) Clear up those uglies with nop patching and net_get_random_once(),
          from Hannes Frederic Sowa.
    
      19) Option length miscalculated in ip6_append_data(), fix also from
          Hannes Frederic Sowa.
    
      20) A while ago we fixed a race during device unregistry when a
          namespace went down, turns out there is a second place that needs
          similar protection.  From Cong Wang.
    
      21) In the new Altera TSE driver multicast filtering isn't working,
          disable it and just use promisc mode until the cause is found.
          From Vince Bridgers.
    
      22) When we disable router enabling in ipv6 we have to flush the
          cached routes explicitly, from Duan Jiong.
    
      23) NBMA tunnels should not cache routes on the tunnel object because
          the key is variable, from Timo Teräs.
    
      24) With stacked devices GRO information in skb->cb[] can be not setup
          properly, make sure it is in all code paths.  From Eric Dumazet.
    
      25) Really fix stacked vlan locking, multiple levels of nesting with
          intervening non-vlan devices are possible.  From Vlad Yasevich.
    
      26) Fallback ipip tunnel device's mtu is not setup properly, from
          Steffen Klassert.
    
      27) The packet scheduler's tcindex filter can crash because we
          structure copy objects with list_head's inside, oops.  From Cong
          Wang.
    
      28) Fix CHECKSUM_COMPLETE handling for ipv6 GRE tunnels, from Eric
          Dumazet.
    
      29) In some configurations 'itag' in __mkroute_input() can end up
          being used uninitialized because of how fib_validate_source()
          works.  Fix it by explitly initializing itag to zero like all the
          other fib_validate_source() callers do, from Li RongQing"
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
      batman: fix a bogus warning from batadv_is_on_batman_iface()
      ipv4: initialise the itag variable in __mkroute_input
      bonding: Send ALB learning packets using the right source
      bonding: Don't assume 802.1Q when sending alb learning packets.
      net: doc: Update references to skb->rxhash
      stmmac: Remove unbalanced clk_disable call
      ipv6: gro: fix CHECKSUM_COMPLETE support
      net_sched: fix an oops in tcindex filter
      can: peak_pci: prevent use after free at netdev removal
      ip_tunnel: Initialize the fallback device properly
      vlan: Fix build error wth vlan_get_encap_level()
      can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option
      MAINTAINERS: Pravin Shelar is Open vSwitch maintainer.
      bnx2x: Convert return 0 to return rc
      bonding: Fix alb mode to only use first level vlans.
      bonding: Fix stacked device detection in arp monitoring
      macvlan: Fix lockdep warnings with stacked macvlan devices
      vlan: Fix lockdep warning with stacked vlan devices.
      net: Allow for more then a single subclass for netif_addr_lock
      net: Find the nesting level of a given device by type.
      ...
Loading