Commit 9819a30c 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) Fix ieeeu02154 atusb driver use-after-free, from Johan Hovold.

 2) Need to validate TCA_CBQ_WRROPT netlink attributes, from Eric
    Dumazet.

 3) txq null deref in mac80211, from Miaoqing Pan.

 4) ionic driver needs to select NET_DEVLINK, from Arnd Bergmann.

 5) Need to disable bh during nft_connlimit GC, from Pablo Neira Ayuso.

 6) Avoid division by zero in taprio scheduler, from Vladimir Oltean.

 7) Various xgmac fixes in stmmac driver from Jose Abreu.

 8) Avoid 64-bit division in mlx5 leading to link errors on 32-bit from
    Michal Kubecek.

 9) Fix bad VLAN check in rtl8366 DSA driver, from Linus Walleij.

10) Fix sleep while atomic in sja1105, from Vladimir Oltean.

11) Suspend/resume deadlock in stmmac, from Thierry Reding.

12) Various UDP GSO fixes from Josh Hunt.

13) Fix slab out of bounds access in tcp_zerocopy_receive(), from Eric
    Dumazet.

14) Fix OOPS in __ipv6_ifa_notify(), from David Ahern.

15) Memory leak in NFC's llcp_sock_bind, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (72 commits)
  selftests/net: add nettest to .gitignore
  net: qlogic: Fix memory leak in ql_alloc_large_buffers
  nfc: fix memory leak in llcp_sock_bind()
  sch_dsmark: fix potential NULL deref in dsmark_init()
  net: phy: at803x: use operating parameters from PHY-specific status
  net: phy: extract pause mode
  net: phy: extract link partner advertisement reading
  net: phy: fix write to mii-ctrl1000 register
  ipv6: Handle missing host route in __ipv6_ifa_notify
  net: phy: allow for reset line to be tied to a sleepy GPIO controller
  net: ipv4: avoid mixed n_redirects and rate_tokens usage
  r8152: Set macpassthru in reset_resume callback
  cxgb4:Fix out-of-bounds MSI-X info array access
  Revert "ipv6: Handle race in addrconf_dad_work"
  net: make sock_prot_memory_pressure() return "const char *"
  rxrpc: Fix rxrpc_recvmsg tracepoint
  qmi_wwan: add support for Cinterion CLS8 devices
  tcp: fix slab-out-of-bounds in tcp_zerocopy_receive()
  lib: textsearch: fix escapes in example code
  udp: only do GSO if # of segs > 1
  ...
parents 6fe137cb ef129d34

Documentation/networking/device_drivers/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Contents: 
   intel/ice

   google/gve

   mellanox/mlx5

   netronome/nfp

   pensando/ionic



.. only::  subproject and html

Documentation/networking/j1939.rst

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ supported flags are: 
* MSG_DONTWAIT, i.e. non-blocking operation.



recvmsg(2)

^^^^^^^^^

^^^^^^^^^^



In most cases recvmsg(2) is needed if you want to extract more information than

recvfrom(2) can provide. For example package priority and timestamp. The

drivers/net/dsa/qca8k.c

+2 −2
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ qca8k_setup(struct dsa_switch *ds) 
		    BIT(0) << QCA8K_GLOBAL_FW_CTRL1_UC_DP_S);



	/* Setup connection between CPU port & user ports */

	for (i = 0; i < DSA_MAX_PORTS; i++) {

	for (i = 0; i < QCA8K_NUM_PORTS; i++) {

		/* CPU port gets connected to all user ports of the switch */

		if (dsa_is_cpu_port(ds, i)) {

			qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT),
@@ -1077,7 +1077,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev) 
	if (id != QCA8K_ID_QCA8337)

		return -ENODEV;



	priv->ds = dsa_switch_alloc(&mdiodev->dev, DSA_MAX_PORTS);

	priv->ds = dsa_switch_alloc(&mdiodev->dev, QCA8K_NUM_PORTS);

	if (!priv->ds)

		return -ENOMEM;

drivers/net/dsa/rtl8366.c

+7 −4
Original line number Diff line number Diff line
@@ -339,9 +339,11 @@ int rtl8366_vlan_prepare(struct dsa_switch *ds, int port, 
			 const struct switchdev_obj_port_vlan *vlan)

{

	struct realtek_smi *smi = ds->priv;

	u16 vid;

	int ret;



	if (!smi->ops->is_vlan_valid(smi, port))

	for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++)

		if (!smi->ops->is_vlan_valid(smi, vid))

			return -EINVAL;



	dev_info(smi->dev, "prepare VLANs %04x..%04x\n",
@@ -370,7 +372,8 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, 
	u16 vid;

	int ret;



	if (!smi->ops->is_vlan_valid(smi, port))

	for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++)

		if (!smi->ops->is_vlan_valid(smi, vid))

			return;



	dev_info(smi->dev, "add VLAN on port %d, %s, %s\n",

drivers/net/dsa/rtl8366rb.c

+10 −6
Original line number Diff line number Diff line
@@ -507,7 +507,8 @@ static int rtl8366rb_setup_cascaded_irq(struct realtek_smi *smi) 
	irq = of_irq_get(intc, 0);

	if (irq <= 0) {

		dev_err(smi->dev, "failed to get parent IRQ\n");

		return irq ? irq : -EINVAL;

		ret = irq ? irq : -EINVAL;

		goto out_put_node;

	}



	/* This clears the IRQ status register */
@@ -515,7 +516,7 @@ static int rtl8366rb_setup_cascaded_irq(struct realtek_smi *smi) 
			  &val);

	if (ret) {

		dev_err(smi->dev, "can't read interrupt status\n");

		return ret;

		goto out_put_node;

	}



	/* Fetch IRQ edge information from the descriptor */
@@ -537,7 +538,7 @@ static int rtl8366rb_setup_cascaded_irq(struct realtek_smi *smi) 
				 val);

	if (ret) {

		dev_err(smi->dev, "could not configure IRQ polarity\n");

		return ret;

		goto out_put_node;

	}



	ret = devm_request_threaded_irq(smi->dev, irq, NULL,
@@ -545,7 +546,7 @@ static int rtl8366rb_setup_cascaded_irq(struct realtek_smi *smi) 
					"RTL8366RB", smi);

	if (ret) {

		dev_err(smi->dev, "unable to request irq: %d\n", ret);

		return ret;

		goto out_put_node;

	}

	smi->irqdomain = irq_domain_add_linear(intc,

					       RTL8366RB_NUM_INTERRUPT,
@@ -553,12 +554,15 @@ static int rtl8366rb_setup_cascaded_irq(struct realtek_smi *smi) 
					       smi);

	if (!smi->irqdomain) {

		dev_err(smi->dev, "failed to create IRQ domain\n");

		return -EINVAL;

		ret = -EINVAL;

		goto out_put_node;

	}

	for (i = 0; i < smi->num_ports; i++)

		irq_set_parent(irq_create_mapping(smi->irqdomain, i), irq);



	return 0;

out_put_node:

	of_node_put(intc);

	return ret;

}



static int rtl8366rb_set_addr(struct realtek_smi *smi)

CRA Git | Maintained and supported by SUSTech CRA and CCSE