Commit ac3a0c84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:

 1) Encap offset calculation is incorrect in esp6, from Sabrina Dubroca.

 2) Better parameter validation in pfkey_dump(), from Mark Salyzyn.

 3) Fix several clang issues on powerpc in selftests, from Tanner Love.

 4) cmsghdr_from_user_compat_to_kern() uses the wrong length, from Al
    Viro.

 5) Out of bounds access in mlx5e driver, from Raed Salem.

 6) Fix transfer buffer memleak in lan78xx, from Johan Havold.

 7) RCU fixups in rhashtable, from Herbert Xu.

 8) Fix ipv6 nexthop refcnt leak, from Xiyu Yang.

 9) vxlan FDB dump must be done under RCU, from Ido Schimmel.

10) Fix use after free in mlxsw, from Ido Schimmel.

11) Fix map leak in HASH_OF_MAPS bpf code, from Andrii Nakryiko.

12) Fix bug in mac80211 Tx ack status reporting, from Vasanthakumar
    Thiagarajan.

13) Fix memory leaks in IPV6_ADDRFORM code, from Cong Wang.

14) Fix bpf program reference count leaks in mlx5 during
    mlx5e_alloc_rq(), from Xin Xiong.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (86 commits)
  vxlan: fix memleak of fdb
  rds: Prevent kernel-infoleak in rds_notify_queue_get()
  net/sched: The error lable position is corrected in ct_init_module
  net/mlx5e: fix bpf_prog reference count leaks in mlx5e_alloc_rq
  net/mlx5e: E-Switch, Specify flow_source for rule with no in_port
  net/mlx5e: E-Switch, Add misc bit when misc fields changed for mirroring
  net/mlx5e: CT: Support restore ipv6 tunnel
  net: gemini: Fix missing clk_disable_unprepare() in error path of gemini_ethernet_port_probe()
  ionic: unlock queue mutex in error path
  atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent
  net: ethernet: mtk_eth_soc: fix MTU warnings
  net: nixge: fix potential memory leak in nixge_probe()
  devlink: ignore -EOPNOTSUPP errors on dumpit
  rxrpc: Fix race between recvmsg and sendmsg on immediate call failure
  MAINTAINERS: Replace Thor Thayer as Altera Triple Speed Ethernet maintainer
  selftests/bpf: fix netdevsim trap_flow_action_cookie read
  ipv6: fix memory leaks on IPV6_ADDRFORM path
  net/bpfilter: Initialize pos in __bpfilter_process_sockopt
  igb: reinit_locked() should be called with rtnl_lock
  e1000e: continue to init PHY even when failed to disable ULP
  ...
parents 0ae3495b fda2ec62

Documentation/networking/bareudp.rst

+2 −3
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ There are various L3 encapsulation standards using UDP being discussed to 
leverage the UDP based load balancing capability of different networks.

MPLSoUDP (__ https://tools.ietf.org/html/rfc7510) is one among them.



The Bareudp tunnel module provides a generic L3 encapsulation tunnelling

support for tunnelling different L3 protocols like MPLS, IP, NSH etc. inside

a UDP tunnel.

The Bareudp tunnel module provides a generic L3 encapsulation support for

tunnelling different L3 protocols like MPLS, IP, NSH etc. inside a UDP tunnel.



Special Handling

----------------

Documentation/networking/devlink/devlink-trap.rst

+4 −0
Original line number Diff line number Diff line
@@ -486,6 +486,10 @@ narrow. The description of these groups must be added to the following table: 
     - Contains packet traps for packets that should be locally delivered after

       routing, but do not match more specific packet traps (e.g.,

       ``ipv4_bgp``)

   * - ``external_delivery``

     - Contains packet traps for packets that should be routed through an

       external interface (e.g., management interface) that does not belong to

       the same device (e.g., switch ASIC) as the ingress interface

   * - ``ipv6``

     - Contains packet traps for various IPv6 control packets (e.g., Router

       Advertisements)

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ F: include/dt-bindings/reset/altr,rst-mgr-a10sr.h 
F:	include/linux/mfd/altera-a10sr.h















ALTERA TRIPLE SPEED ETHERNET DRIVER













M:	Thor Thayer <thor.thayer@linux.intel.com>













M:	Joyce Ooi <joyce.ooi@intel.com>















L:	netdev@vger.kernel.org















S:	Maintained















F:	drivers/net/ethernet/altera/

































drivers/atm/atmtcp.c



+8
−2






























Original line number
Diff line number
Diff line








@@ -433,9 +433,15 @@ static int atmtcp_remove_persistent(int itf)













		return -EMEDIUMTYPE;















	}















	dev_data = PRIV(dev);













	if (!dev_data->persist) return 0;













	if (!dev_data->persist) {













		atm_dev_put(dev);













		return 0;













	}















	dev_data->persist = 0;













	if (PRIV(dev)->vcc) return 0;













	if (PRIV(dev)->vcc) {













		atm_dev_put(dev);













		return 0;













	}















	kfree(dev_data);















	atm_dev_put(dev);















	atm_dev_deregister(dev);

































drivers/net/bareudp.c



+22
−7






























Original line number
Diff line number
Diff line








@@ -407,20 +407,35 @@ free_dst:













	return err;















}





























static bool bareudp_proto_valid(struct bareudp_dev *bareudp, __be16 proto)













{













	if (bareudp->ethertype == proto)













		return true;



























	if (!bareudp->multi_proto_mode)













		return false;



























	if (bareudp->ethertype == htons(ETH_P_MPLS_UC) &&













	    proto == htons(ETH_P_MPLS_MC))













		return true;



























	if (bareudp->ethertype == htons(ETH_P_IP) &&













	    proto == htons(ETH_P_IPV6))













		return true;



























	return false;













}





























static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev)















{















	struct bareudp_dev *bareudp = netdev_priv(dev);















	struct ip_tunnel_info *info = NULL;















	int err;





























	if (skb->protocol != bareudp->ethertype) {













		if (!bareudp->multi_proto_mode ||













		    (skb->protocol !=  htons(ETH_P_MPLS_MC) &&













		     skb->protocol !=  htons(ETH_P_IPV6))) {













	if (!bareudp_proto_valid(bareudp, skb->protocol)) {















		err = -EINVAL;















		goto tx_error;















	}













	}































	info = skb_tunnel_info(skb);















	if (unlikely(!info || !(info->mode & IP_TUNNEL_INFO_TX))) {









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE