Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull networking fixes from David Miller:

 1) Fix dumping of nft_quota entries, from Pablo Neira Ayuso.

 2) Fix out of bounds access in nf_tables discovered by KASAN, from
    Florian Westphal.

 3) Fix IRQ enabling in dp83867 driver, from Grygorii Strashko.

 4) Fix unicast filtering in be2net driver, from Ivan Vecera.

 5) tg3_get_stats64() can race with driver close and ethtool
    reconfigurations, fix from Michael Chan.

 6) Fix error handling when pass limit is reached in bpf code gen on
    x86. From Daniel Borkmann.

 7) Don't clobber switch ops and use proper MDIO nested reads and writes
    in bcm_sf2 driver, from Florian Fainelli.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
  net: dsa: bcm_sf2: Utilize nested MDIO read/write
  net: dsa: bcm_sf2: Do not clobber b53_switch_ops
  net: stmmac: fix maxmtu assignment to be within valid range
  bpf: change back to orig prog on too many passes
  tg3: Fix race condition in tg3_get_stats64().
  be2net: fix unicast list filling
  be2net: fix accesses to unicast list
  netlabel: add CALIPSO to the list of built-in protocols
  vti6: fix device register to report IFLA_INFO_KIND
  net: phy: dp83867: fix irq generation
  amd-xgbe: Fix IRQ processing when running in single IRQ mode
  sh_eth: R8A7740 supports packet shecksumming
  sh_eth: fix EESIPR values for SH77{34|63}
  r8169: fix the typo in the comment
  nl80211: fix sched scan netlink socket owner destruction
  bridge: netfilter: Fix dropping packets that moving through bridge interface
  netfilter: ipt_CLUSTERIP: check duplicate config when initializing
  netfilter: nft_payload: mangle ckecksum if NFT_PAYLOAD_L4CSUM_PSEUDOHDR is set
  netfilter: nf_tables: fix oob access
  netfilter: nft_queue: use raw_smp_processor_id()
  ...
parents a121103c 03430fa1

arch/x86/net/bpf_jit_comp.c

+2 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
		set_memory_ro((unsigned long)header, header->pages);

		prog->bpf_func = (void *)image;

		prog->jited = 1;

	} else {

		prog = orig_prog;

	}



out_addrs:

drivers/net/dsa/bcm_sf2.c

+9 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int bcm_sf2_sw_mdio_read(struct mii_bus *bus, int addr, int regnum) 
	if (addr == BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask & BIT(addr))

		return bcm_sf2_sw_indir_rw(priv, 1, addr, regnum, 0);

	else

		return mdiobus_read(priv->master_mii_bus, addr, regnum);

		return mdiobus_read_nested(priv->master_mii_bus, addr, regnum);

}



static int bcm_sf2_sw_mdio_write(struct mii_bus *bus, int addr, int regnum,
@@ -407,7 +407,7 @@ static int bcm_sf2_sw_mdio_write(struct mii_bus *bus, int addr, int regnum, 
	if (addr == BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask & BIT(addr))

		bcm_sf2_sw_indir_rw(priv, 0, addr, regnum, val);

	else

		mdiobus_write(priv->master_mii_bus, addr, regnum, val);

		mdiobus_write_nested(priv->master_mii_bus, addr, regnum, val);



	return 0;

}
@@ -982,6 +982,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev) 
	const char *reg_names[BCM_SF2_REGS_NUM] = BCM_SF2_REGS_NAME;

	struct device_node *dn = pdev->dev.of_node;

	struct b53_platform_data *pdata;

	struct dsa_switch_ops *ops;

	struct bcm_sf2_priv *priv;

	struct b53_device *dev;

	struct dsa_switch *ds;
@@ -995,6 +996,10 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	ops = devm_kzalloc(&pdev->dev, sizeof(*ops), GFP_KERNEL);

	if (!ops)

		return -ENOMEM;



	dev = b53_switch_alloc(&pdev->dev, &bcm_sf2_io_ops, priv);

	if (!dev)

		return -ENOMEM;
@@ -1014,6 +1019,8 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev) 
	ds = dev->ds;



	/* Override the parts that are non-standard wrt. normal b53 devices */

	memcpy(ops, ds->ops, sizeof(*ops));

	ds->ops = ops;

	ds->ops->get_tag_protocol = bcm_sf2_sw_get_tag_protocol;

	ds->ops->setup = bcm_sf2_sw_setup;

	ds->ops->get_phy_flags = bcm_sf2_sw_get_phy_flags;

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+1 −1
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ static irqreturn_t xgbe_isr(int irq, void *data) 
		}

	}



isr_done:

	/* If there is not a separate AN irq, handle it here */

	if (pdata->dev_irq == pdata->an_irq)

		pdata->phy_if.an_isr(irq, pdata);
@@ -551,7 +552,6 @@ static irqreturn_t xgbe_isr(int irq, void *data) 
	if (pdata->vdata->i2c_support && (pdata->dev_irq == pdata->i2c_irq))

		pdata->i2c_if.i2c_isr(irq, pdata);



isr_done:

	return IRQ_HANDLED;

}

drivers/net/ethernet/broadcom/tg3.c

+3 −0
Original line number Diff line number Diff line
@@ -8720,11 +8720,14 @@ static void tg3_free_consistent(struct tg3 *tp) 
	tg3_mem_rx_release(tp);

	tg3_mem_tx_release(tp);



	/* Protect tg3_get_stats64() from reading freed tp->hw_stats. */

	tg3_full_lock(tp, 0);

	if (tp->hw_stats) {

		dma_free_coherent(&tp->pdev->dev, sizeof(struct tg3_hw_stats),

				  tp->hw_stats, tp->stats_mapping);

		tp->hw_stats = NULL;

	}

	tg3_full_unlock(tp);

}



/*

drivers/net/ethernet/emulex/benet/be_main.c

+4 −8
Original line number Diff line number Diff line
@@ -275,8 +275,7 @@ static int be_dev_mac_add(struct be_adapter *adapter, u8 *mac) 


	/* Check if mac has already been added as part of uc-list */

	for (i = 0; i < adapter->uc_macs; i++) {

		if (ether_addr_equal((u8 *)&adapter->uc_list[i * ETH_ALEN],

				     mac)) {

		if (ether_addr_equal(adapter->uc_list[i].mac, mac)) {

			/* mac already added, skip addition */

			adapter->pmac_id[0] = adapter->pmac_id[i + 1];

			return 0;
@@ -1655,14 +1654,12 @@ static void be_clear_mc_list(struct be_adapter *adapter) 


static int be_uc_mac_add(struct be_adapter *adapter, int uc_idx)

{

	if (ether_addr_equal((u8 *)&adapter->uc_list[uc_idx * ETH_ALEN],

			     adapter->dev_mac)) {

	if (ether_addr_equal(adapter->uc_list[uc_idx].mac, adapter->dev_mac)) {

		adapter->pmac_id[uc_idx + 1] = adapter->pmac_id[0];

		return 0;

	}



	return be_cmd_pmac_add(adapter,

			       (u8 *)&adapter->uc_list[uc_idx * ETH_ALEN],

	return be_cmd_pmac_add(adapter, adapter->uc_list[uc_idx].mac,

			       adapter->if_handle,

			       &adapter->pmac_id[uc_idx + 1], 0);

}
@@ -1698,9 +1695,8 @@ static void be_set_uc_list(struct be_adapter *adapter) 
	}



	if (adapter->update_uc_list) {

		i = 1; /* First slot is claimed by the Primary MAC */



		/* cache the uc-list in adapter array */

		i = 0;

		netdev_for_each_uc_addr(ha, netdev) {

			ether_addr_copy(adapter->uc_list[i].mac, ha->addr);

			i++;