Commit 08ad43d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Paolo Abeni:
 "Including fixes from rxrpc, netfilter and xfrm.

  Current release - regressions:

   - dccp/tcp: fix bhash2 issues related to WARN_ON() in
     inet_csk_get_port()

   - l2tp: don't sleep and disable BH under writer-side sk_callback_lock

   - eth: ice: fix handling of burst tx timestamps

  Current release - new code bugs:

   - xfrm: squelch kernel warning in case XFRM encap type is not
     available

   - eth: mlx5e: fix possible race condition in macsec extended packet
     number update routine

  Previous releases - regressions:

   - neigh: decrement the family specific qlen

   - netfilter: fix ipset regression

   - rxrpc: fix race between conn bundle lookup and bundle removal
     [ZDI-CAN-15975]

   - eth: iavf: do not restart tx queues after reset task failure

   - eth: nfp: add port from netdev validation for EEPROM access

   - eth: mtk_eth_soc: fix potential memory leak in mtk_rx_alloc()

  Previous releases - always broken:

   - tipc: set con sock in tipc_conn_alloc

   - nfc:
      - fix potential memory leaks
      - fix incorrect sizing calculations in EVT_TRANSACTION

   - eth: octeontx2-af: fix pci device refcount leak

   - eth: bonding: fix ICMPv6 header handling when receiving IPv6
     messages

   - eth: prestera: add missing unregister_netdev() in
     prestera_port_create()

   - eth: tsnep: fix rotten packets

  Misc:

   - usb: qmi_wwan: add support for LARA-L6"

* tag 'net-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (95 commits)
  net: thunderx: Fix the ACPI memory leak
  octeontx2-af: Fix reference count issue in rvu_sdp_init()
  net: altera_tse: release phylink resources in tse_shutdown()
  virtio_net: Fix probe failed when modprobe virtio_net
  net: wwan: t7xx: Fix the ACPI memory leak
  octeontx2-pf: Add check for devm_kcalloc
  net: enetc: preserve TX ring priority across reconfiguration
  net: marvell: prestera: add missing unregister_netdev() in prestera_port_create()
  nfc: st-nci: fix incorrect sizing calculations in EVT_TRANSACTION
  nfc: st-nci: fix memory leaks in EVT_TRANSACTION
  nfc: st-nci: fix incorrect validating logic in EVT_TRANSACTION
  Documentation: networking: Update generic_netlink_howto URL
  net/cdc_ncm: Fix multicast RX support for CDC NCM devices with ZLP
  net: usb: qmi_wwan: add u-blox 0x1342 composition
  l2tp: Don't sleep and disable BH under writer-side sk_callback_lock
  net: dm9051: Fix missing dev_kfree_skb() in dm9051_loop_rx()
  arcnet: fix potential memory leak in com20020_probe()
  ipv4: Fix error return code in fib_table_insert()
  net: ethernet: mtk_eth_soc: fix memory leak in error path
  net: ethernet: mtk_eth_soc: fix resource leak in error path
  ...
parents cd89db60 661e5ebb

Documentation/networking/generic_netlink.rst

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ Generic Netlink 


A wiki document on how to use Generic Netlink can be found here:



 * http://www.linuxfoundation.org/collaborate/workgroups/networking/generic_netlink_howto
 
 * https://wiki.linuxfoundation.org/networking/generic_netlink_howto

drivers/net/arcnet/com20020_cs.c

+9 −2
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static int com20020_probe(struct pcmcia_device *p_dev) 
	struct com20020_dev *info;

	struct net_device *dev;

	struct arcnet_local *lp;

	int ret = -ENOMEM;



	dev_dbg(&p_dev->dev, "com20020_attach()\n");
@@ -142,12 +143,18 @@ static int com20020_probe(struct pcmcia_device *p_dev) 
	info->dev = dev;

	p_dev->priv = info;



	return com20020_config(p_dev);

	ret = com20020_config(p_dev);

	if (ret)

		goto fail_config;



	return 0;



fail_config:

	free_arcdev(dev);

fail_alloc_dev:

	kfree(info);

fail_alloc_info:

	return -ENOMEM;

	return ret;

} /* com20020_attach */



static void com20020_detach(struct pcmcia_device *link)

drivers/net/bonding/bond_main.c

+12 −5
Original line number Diff line number Diff line
@@ -3231,16 +3231,23 @@ static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond, 
		       struct slave *slave)

{

	struct slave *curr_active_slave, *curr_arp_slave;

	struct icmp6hdr *hdr = icmp6_hdr(skb);

	struct in6_addr *saddr, *daddr;

	struct {

		struct ipv6hdr ip6;

		struct icmp6hdr icmp6;

	} *combined, _combined;



	if (skb->pkt_type == PACKET_OTHERHOST ||

	    skb->pkt_type == PACKET_LOOPBACK ||

	    hdr->icmp6_type != NDISC_NEIGHBOUR_ADVERTISEMENT)

	    skb->pkt_type == PACKET_LOOPBACK)

		goto out;



	combined = skb_header_pointer(skb, 0, sizeof(_combined), &_combined);

	if (!combined || combined->ip6.nexthdr != NEXTHDR_ICMP ||

	    combined->icmp6.icmp6_type != NDISC_NEIGHBOUR_ADVERTISEMENT)

		goto out;



	saddr = &ipv6_hdr(skb)->saddr;

	daddr = &ipv6_hdr(skb)->daddr;

	saddr = &combined->ip6.saddr;

	daddr = &combined->ip6.saddr;



	slave_dbg(bond->dev, slave->dev, "%s: %s/%d av %d sv %d sip %pI6c tip %pI6c\n",

		  __func__, slave->dev->name, bond_slave_state(slave),

drivers/net/dsa/sja1105/sja1105_mdio.c

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,9 @@ static int sja1105_base_tx_mdio_read(struct mii_bus *bus, int phy, int reg) 
	u32 tmp;

	int rc;



	if (reg & MII_ADDR_C45)

		return -EOPNOTSUPP;



	rc = sja1105_xfer_u32(priv, SPI_READ, regs->mdio_100base_tx + reg,

			      &tmp, NULL);

	if (rc < 0)
@@ -272,6 +275,9 @@ static int sja1105_base_tx_mdio_write(struct mii_bus *bus, int phy, int reg, 
	const struct sja1105_regs *regs = priv->info->regs;

	u32 tmp = val;



	if (reg & MII_ADDR_C45)

		return -EOPNOTSUPP;



	return sja1105_xfer_u32(priv, SPI_WRITE, regs->mdio_100base_tx + reg,

				&tmp, NULL);

}

drivers/net/ethernet/altera/altera_tse_main.c

+1 −0
Original line number Diff line number Diff line
@@ -990,6 +990,7 @@ static int tse_shutdown(struct net_device *dev) 
	int ret;



	phylink_stop(priv->phylink);

	phylink_disconnect_phy(priv->phylink);

	netif_stop_queue(dev);

	napi_disable(&priv->napi);